 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.185 2021/04/01 14:20:30 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.186 2021/04/02 08:38:44 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * Copyright (c) 2021 Roland Illig
  * 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
 @@ -28,27 +28,27 @@
  * 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.185 2021/04/01 14:20:30 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.186 2021/04/02 08:38:44 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization of global or local objects, like in:
+ *
  *	int number = 12345;
  *	int number_with_braces = { 12345 };
 @@ -182,44 +182,47 @@ debug_enter(const char *func)
+}
 static void __printflike(1, 2)
 debug_step(const char *fmt, ...)
+{
 	va_list va;
 	debug_indent();
 	va_start(va, fmt);
 	vfprintf(stdout, fmt, va);
 	va_end(va);
 	printf("\n");
+}
 #define debug_step0		debug_step
 #define debug_step1		debug_step
 #define debug_step2		debug_step
 static void
 debug_leave(const char *func)
+{
 	printf("%*s- %s\n", 2 * --debug_indentation, "", func);
+}
 #define debug_enter()		(debug_enter)(__func__)
 #define debug_leave()		(debug_leave)(__func__)
 #else
 /* TODO: This is C99 */
 #define debug_printf(fmt, ...)	do { } while (false)
 #define debug_indent()		do { } while (false)
 #define debug_enter()		do { } while (false)
-#define debug_step(fmt, ...)	do { } while (false)
+#define debug_step0(msg)	do { } while (false)
 #define debug_step1(fmt, arg0)	do { } while (false)
 #define debug_step2(fmt, arg1, arg2) do { } while (false)
 #define debug_leave()		do { } while (false)
 #endif
 static void *
 unconst_cast(const void *p)
+{
 	void *r;
 	memcpy(&r, &p, sizeof r);
 	return r;
+}
 @@ -382,27 +385,27 @@ check_init_expr(const type_t *tp, sym_t
 	/* Create a temporary node for the left side. */
 	ln = tgetblk(sizeof *ln);
 	ln->tn_op = NAME;
 	ln->tn_type = tduptyp(tp);
 	ln->tn_type->t_const = false;
 	ln->tn_lvalue = true;
 	ln->tn_sym = sym;
 	tn = cconv(tn);
 	lt = ln->tn_type->t_tspec;
 	rt = tn->tn_type->t_tspec;
-	debug_step("typeok '%s', '%s'",
+	debug_step2("typeok '%s', '%s'",
 	    type_name(ln->tn_type), type_name(tn->tn_type));
 	if (!typeok(INIT, 0, ln, tn))
 		return;
 	/*
 	 * Preserve the tree memory. This is necessary because otherwise
 	 * expr() would free it.
 	 */
 	tmem = tsave();
 	expr(tn, true, false, true, false);
 	trestor(tmem);
 	check_bit_field_init(ln, lt, rt);
 @@ -864,27 +867,27 @@ initialization_add_designator(struct ini
  */
 static bool
 initialization_expr_using_assign(struct initialization *in, tnode_t *rn)
+{
 	tnode_t *ln, *tn;
 	if (!has_automatic_storage_duration(in->in_sym))
 		return false;
 	if (in->in_brace_level != NULL)
 		return false;
 	if (in->in_sym->s_type->t_tspec == ARRAY)
 		return false;
-	debug_step("handing over to ASSIGN");
+	debug_step0("handing over to ASSIGN");
 	ln = new_name_node(in->in_sym, 0);
 	ln->tn_type = tduptyp(ln->tn_type);
 	ln->tn_type->t_const = false;
 	tn = build(ASSIGN, ln, rn);
 	expr(tn, false, false, false, false);
 	return true;
+}
 /* Initialize a character array or wchar_t array with a string literal. */
 static bool
 @@ -966,27 +969,27 @@ initialization_expr(struct initializatio
 	 * Hack to accept initializations with omitted braces, see
 	 * c99_6_7_8_p28_example5 in test d_c99_init.c.  Since both GCC and
 	 * Clang already warn about this at level -Wall, there is no point
 	 * in repeating the same check in lint.  If needed, support for these
 	 * edge cases could be added, but that would increase the complexity.
 	 */
 	if (is_scalar(tn->tn_type->t_tspec) &&
 	    (tp->t_tspec == ARRAY || is_struct_or_union(tp->t_tspec)) &&
 	    bl != NULL) {
 		bl->bl_confused = true;
 		goto done;
+	}
-	debug_step("expecting '%s', expression has '%s'",
+	debug_step2("expecting '%s', expression has '%s'",
 	    type_name(tp), type_name(tn->tn_type));
 	check_init_expr(tp, in->in_sym, tn);
 advance:
 	if (bl != NULL)
 		brace_level_advance(bl);
 done:
 	if (bl != NULL)
 		designation_reset(&bl->bl_designation);
 	initialization_debug(in);
 	debug_leave();
+}
 @@ -1005,49 +1008,49 @@ current_init(void)
 sym_t **
 current_initsym(void)
+{
 	return &current_init()->in_sym;
+}
 void
 begin_initialization(sym_t *sym)
+{
 	struct initialization *in;
-	debug_step("begin initialization of '%s'", type_name(sym->s_type));
+	debug_step1("begin initialization of '%s'", type_name(sym->s_type));
 #ifdef DEBUG
 	debug_indentation++;
 #endif
 	in = initialization_new(sym);
 	in->in_enclosing = init;
 	init = in;
+}
 void
 end_initialization(void)
+{
 	struct initialization *in;
 	in = init;
 	init = in->in_enclosing;
 	initialization_free(in);
 #ifdef DEBUG
 	debug_indentation--;
 #endif
-	debug_step("end initialization");
+	debug_step0("end initialization");
+}
 void
 add_designator_member(sbuf_t *sb)
+{
 	initialization_add_designator(current_init(), sb->sb_name, 0);
+}
 void
 add_designator_subscript(range_t range)
+{