 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.153 2021/03/28 09:51:16 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.154 2021/03/28 09:57:31 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.153 2021/03/28 09:51:16 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.154 2021/03/28 09:57:31 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -604,42 +604,42 @@ current_initerr(void)
 sym_t **
 current_initsym(void)
+{
 	return &current_init()->initsym;
+}
 #define initsym		(*current_initsym())
 void
 begin_initialization(sym_t *sym)
+{
-	struct initialization *curr_init;
+	struct initialization *in;
 	debug_step("begin initialization of '%s'", type_name(sym->s_type));
-	curr_init = initialization_new(sym);
+	in = initialization_new(sym);
-	curr_init->next = init;
+	in->next = init;
-	init = curr_init;
+	init = in;
+}
 void
 end_initialization(void)
+{
-	struct initialization *curr_init;
+	struct initialization *in;
-	curr_init = init;
+	in = init;
 	init = init->next;
-	initialization_free(curr_init);
+	initialization_free(in);
 	debug_step("end initialization");
+}
 void
 designation_add_name(sbuf_t *sb)
+{
 	designation_add(&current_init()->designation,
 	    designator_new(sb->sb_name));
+}
 /* TODO: Move the function body up here, to avoid the forward declaration. */
 @@ -875,31 +875,27 @@ extend_if_array_of_unknown_size(struct i
 	debug_step("extended type is '%s'", type_name(level->bl_type));
+}
 /* TODO: document me */
 /* TODO: think of a better name than 'push' */
 static void
 initstack_push_array(struct initialization *in)
+{
 	struct brace_level *level = in->brace_level;
 	if (level->bl_enclosing->bl_seen_named_member) {
 		level->bl_brace = true;
-		debug_step("ARRAY%s%s",
+		debug_step("ARRAY, seen named member, needs closing brace");
 		    level->bl_brace ? ", needs closing brace" : "",
 		    /* TODO: this is redundant, always true */
 		    level->bl_enclosing->bl_seen_named_member
 			? ", seen named member" : "");
+	}
 	if (is_incomplete(level->bl_type) &&
 	    level->bl_enclosing->bl_enclosing != NULL) {
 		/* initialization of an incomplete type */
 		error(175);
 		initialization_set_error(in);
 		return;
+	}
 	level->bl_subtype = level->bl_type->t_subt;
 	level->bl_array_of_unknown_size = is_incomplete(level->bl_type);
 	level->bl_remaining = level->bl_type->t_dim;