 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.54 2021/01/01 19:28:51 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.55 2021/01/01 20:02:56 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,30 +27,29 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.54 2021/01/01 19:28:51 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.55 2021/01/01 20:02:56 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Type of stack which is used for initialisation of aggregate types.
+ *
  * XXX: Since C99, a stack is an inappropriate data structure for modelling
  * an initialization, since the designators don't have to be listed in a
  * particular order and can designate parts of sub-objects.  The member names
  * of non-leaf structs may thus appear repeatedly, as demonstrated in
 @@ -64,26 +63,39 @@ __RCSID("$NetBSD: init.c,v 1.54 2021/01/
  * selected examples.
  */
 typedef	struct istk {
 	type_t	*i_type;		/* type of initialisation */
 	type_t	*i_subt;		/* type of next level */
 	u_int	i_brace : 1;		/* need } for pop */
 	u_int	i_nolimit : 1;		/* incomplete array type */
 	u_int	i_namedmem : 1;		/* has c9x named members */
 	sym_t	*i_mem;			/* next structure member */
 	int	i_remaining;		/* # of remaining elements */
 	struct	istk *i_next;		/* previous level */
 } istk_t;
 /*
  * The names for a nested C99 initialization designator, in a circular list.
+ *
  * Example:
  *	struct stat st = {
  *		.st_size = 123,
  *		.st_mtim.tv_sec = 45,
  *		.st_mtim.tv_nsec
  *	};
+ *
  *	During initialization, this list first contains ["st_size"], then
  *	["st_mtim", "tv_sec"], then ["st_mtim", "tv_nsec"].
  */
 typedef struct namlist {
 	const char *n_name;
 	struct namlist *n_prev;
 	struct namlist *n_next;
 } namlist_t;
 /*
  * initerr is set as soon as a fatal error occurred in an initialisation.
  * The effect is that the rest of the initialisation is ignored (parsed
  * by yacc, expression trees built, but no initialisation takes place).
  */
 int	initerr;
 @@ -134,26 +146,41 @@ pop_member(void)
 	DPRINTF(("%s: %s %p\n", __func__, namedmem->n_name, namedmem));
 	if (namedmem->n_next == namedmem) {
 		free(namedmem);
 		namedmem = NULL;
 	} else {
 		namlist_t *nam = namedmem;
 		namedmem = namedmem->n_next;
 		nam->n_prev->n_next = nam->n_next;
 		nam->n_next->n_prev = nam->n_prev;
 		free(nam);
+	}
+}
 static void
 named_member_dprint(void)
+{
 	namlist_t *name;
 	if (namedmem == NULL)
 		return;
 	name = namedmem;
 	DPRINTF(("named member:"));
 	do {
 		DPRINTF((" %s", name->n_name));
 		name = name->n_next;
 	} while (name != namedmem);
 	DPRINTF(("\n"));
+}
 /*
  * Initialize the initialisation stack by putting an entry for the variable
  * which is to be initialized on it.
  */
 void
 initstack_init(void)
+{
 	istk_t	*istk;
 	if (initerr)
 		return;
 @@ -536,26 +563,28 @@ mkinit(tnode_t *tn)
 	ptrdiff_t offs;
 	sym_t	*sym;
 	tspec_t	lt, rt;
 	tnode_t	*ln;
 	struct	mbl *tmem;
 	scl_t	sc;
 #ifdef DEBUG
 	char	buf[64], sbuf[64];
 #endif
 	DPRINTF(("%s: type=%s, value=%s\n", __func__,
 	    tyname(buf, sizeof(buf), tn->tn_type),
 	    print_tnode(sbuf, sizeof(sbuf), tn)));
 	named_member_dprint();
 	if (initerr || tn == NULL)
 		return;
 	sc = initsym->s_scl;
 	/*
 	 * Do not test for automatic aggregate initialisation. If the
 	 * initializer starts with a brace we have the warning already.
 	 * If not, an error will be printed that the initializer must
 	 * be enclosed by braces.
 	 */
 	/*