 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.144 2021/03/27 23:18:37 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.145 2021/03/28 07:59:09 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,27 +27,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.144 2021/03/27 23:18:37 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.145 2021/03/28 07:59:09 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -247,28 +247,86 @@ struct initialization {
 	/* The innermost brace level. */
 	struct brace_level *brace_level;
 	/*
 	 * The C99 designator, if any, for the current initialization
 	 * expression.
 	 */
 	struct designation designation;
 	struct initialization *next;
 };
 static struct initialization *init;
 #ifdef DEBUG
 static int debug_ind = 0;
 #endif
 #ifdef DEBUG
 static void __printflike(1, 2)
 debug_printf(const char *fmt, ...)
+{
 	va_list va;
 	va_start(va, fmt);
 	vfprintf(stdout, fmt, va);
 	va_end(va);
+}
 static void
 debug_indent(void)
+{
 	debug_printf("%*s", 2 * debug_ind, "");
+}
 static void
 debug_enter(const char *func)
+{
 	printf("%*s+ %s\n", 2 * debug_ind++, "", 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");
+}
 static void
 debug_leave(const char *func)
+{
 	printf("%*s- %s\n", 2 * --debug_ind, "", func);
+}
 #else
 #define debug_printf(fmt, ...)	do { } while (false)
 #define debug_indent()		do { } while (false)
 #define debug_enter(function)	do { } while (false)
 #define debug_step(fmt, ...)	do { } while (false)
 #define debug_leave(function)	do { } while (false)
 #endif
 /* XXX: unnecessary prototype since it is not recursive */
 static	bool	init_array_using_string(tnode_t *);
 static struct initialization *
 current_init(void)
+{
 	lint_assert(init != NULL);
 	return init;
+}
 bool *
 @@ -323,79 +381,32 @@ free_initialization(struct initializatio
 static void
 set_initerr(void)
+{
 	current_init()->initerr = true;
+}
 #define initerr		(*current_initerr())
 #define initsym		(*current_initsym())
 #define brace_level_rvalue	(current_brace_level())
 #define brace_level_lvalue	(*current_brace_level_lvalue())
 #ifndef DEBUG
 #define debug_printf(fmt, ...)	do { } while (false)
 #define debug_indent()		do { } while (false)
 #define debug_enter(a)		do { } while (false)
 #define debug_step(fmt, ...)	do { } while (false)
 #define debug_leave(a)		do { } while (false)
 #define debug_designation()	do { } while (false)
 #define debug_brace_level(level) do { } while (false)
 #define debug_initstack()	do { } while (false)
 #else
 static int debug_ind = 0;
 static void __printflike(1, 2)
 debug_printf(const char *fmt, ...)
 	va_list va;
 	va_start(va, fmt);
 	vfprintf(stdout, fmt, va);
 	va_end(va);
 static void
 debug_indent(void)
 	debug_printf("%*s", 2 * debug_ind, "");
 static void
 debug_enter(const char *func)
 	printf("%*s+ %s\n", 2 * debug_ind++, "", func);
 static void __printflike(1, 2)
 debug_step(const char *fmt, ...)
 	va_list va;
 	printf("%*s", 2 * debug_ind, "");
 	va_start(va, fmt);
 	vfprintf(stdout, fmt, va);
 	va_end(va);
 	printf("\n");
 static void
 debug_leave(const char *func)
 	printf("%*s- %s\n", 2 * --debug_ind, "", func);
 static void
 debug_designation(void)
+{
 	const struct designator *head = current_designation().head, *p;
 	if (head == NULL)
 		return;
 	debug_indent();
 	debug_printf("designation: ");
 	for (p = head; p != NULL; p = p->next)
 		debug_printf(".%s", p->name);
 	debug_printf("\n");
+}