 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.183 2021/03/30 16:07:07 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.184 2021/03/30 20:23:30 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.183 2021/03/30 16:07:07 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.184 2021/03/30 20:23:30 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 };
 @@ -524,26 +524,29 @@ designation_look_up(const struct designa
+}
 static void
 designation_reset(struct designation *dn)
+{
 	struct designator *dr, *next;
 	for (dr = dn->dn_head; dr != NULL; dr = next) {
 		next = dr->dr_next;
 		designator_free(dr);
+	}
 	dn->dn_head = NULL;
 	dn->dn_tail = NULL;
+}
 static struct brace_level *
 brace_level_new(const type_t *tp, struct brace_level *enclosing)
+{
 	struct brace_level *bl;
 	bl = xcalloc(1, sizeof(*bl));
 	bl->bl_type = tp;
 	bl->bl_enclosing = enclosing;
 	if (is_struct_or_union(tp->t_tspec))
 		bl->bl_next_member = first_named_member(tp);
 @@ -577,41 +580,26 @@ brace_level_debug(const struct brace_lev
 	    bl->bl_next_member != NULL)
 		debug_printf(", next member '%s'",
 		    bl->bl_next_member->s_name);
 	if (bl->bl_type->t_tspec == ARRAY)
 		debug_printf(", next array subscript %zu",
 		    bl->bl_array_next_subscript);
 	debug_printf("\n");
+}
 #else
 #define brace_level_debug(level) do { } while (false)
 #endif
 static void
 brace_level_remove_designation(struct brace_level *bl)
 	struct designator *dr, *next;
 	for (dr = bl->bl_designation.dn_head; dr != NULL; dr = next) {
 		next = dr->dr_next;
 		designator_free(dr);
 	bl->bl_designation.dn_head = NULL;
 	bl->bl_designation.dn_tail = NULL;
 static const type_t *
 brace_level_sub_type_struct_or_union(const struct brace_level *bl)
+{
 	if (bl->bl_next_member == NULL) {
 		/* too many struct/union initializers */
 		error(172);
 		return NULL;
+	}
 	lint_assert(!is_unnamed(bl->bl_next_member));
 	return sym_type(bl->bl_next_member);
+}
 @@ -837,56 +825,49 @@ initialization_end_brace_level(struct in
+{
 	struct brace_level *bl;
 	if (in->in_err)
 		return;
 	debug_enter();
 	initialization_set_size_of_unknown_array(in);
 	bl = in->in_brace_level;
 	in->in_brace_level = bl->bl_enclosing;
 	brace_level_free(bl);
 	bl = in->in_brace_level;
-	if (in->in_brace_level != NULL) {
+	if (bl != NULL)
-		brace_level_advance(in->in_brace_level);
+		brace_level_advance(bl);
-		brace_level_remove_designation(in->in_brace_level);
+	if (bl != NULL)
 		designation_reset(&bl->bl_designation);
 	initialization_debug(in);
 	debug_leave();
+}
 static void
 initialization_add_designator(struct initialization *in,
 			      const char *name, size_t subscript)
+{
 	if (in->in_err)
 		return;
 	lint_assert(in->in_brace_level != NULL);
 	designation_add(&in->in_brace_level->bl_designation, name, subscript);
+}
 static void
 initialization_remove_designation(struct initialization *in)
 	if (in->in_brace_level != NULL)
 		brace_level_remove_designation(in->in_brace_level);
 /*
  * An object with automatic storage duration that has a single initializer
  * expression without braces and is not an array is initialized by delegating
  * to the ASSIGN operator.
  */
 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)
 @@ -941,78 +922,81 @@ initialization_init_array_using_string(s
 			    strg->st_len + 1);
+	}
 	return true;
+}
 /*
  * Initialize a single sub-object as part of the currently ongoing
  * initialization.
  */
 static void
 initialization_expr(struct initialization *in, tnode_t *tn)
+{
 	struct brace_level *bl;
 	const type_t *tp;
 	if (in->in_err)
 		return;
-	if (in->in_brace_level != NULL &&
+	bl = in->in_brace_level;
-	    in->in_brace_level->bl_omitted_braces)
+	if (bl != NULL && bl->bl_omitted_braces)
 		return;
 	debug_enter();
 	if (tn == NULL)
 		goto advance;
 	if (initialization_expr_using_assign(in, tn))
 		goto done;
 	if (initialization_init_array_using_string(in, tn))
 		goto advance;
-	if (in->in_brace_level != NULL)
+	if (bl != NULL)
-		brace_level_apply_designation(in->in_brace_level);
+		brace_level_apply_designation(bl);
 	tp = initialization_sub_type(in);
 	if (tp == NULL)
 		goto done;
-	if (in->in_brace_level == NULL && !is_scalar(tp->t_tspec)) {
+	if (bl == NULL && !is_scalar(tp->t_tspec)) {
 		/* {}-enclosed initializer required */
 		error(181);
 		goto done;
+	}
 	/*
 	 * 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 letting lint check this again.
 	 */
 	if (is_scalar(tn->tn_type->t_tspec) &&
 	    tp->t_tspec == ARRAY &&
-	    in->in_brace_level != NULL) {
+	    bl != NULL) {
-		in->in_brace_level->bl_omitted_braces = true;
+		bl->bl_omitted_braces = true;
 		goto done;
+	}
 	debug_step("expecting '%s', expression has '%s'",
 	    type_name(tp), type_name(tn->tn_type));
 	check_init_expr(tp, in->in_sym, tn);
 advance:
-	if (in->in_brace_level != NULL)
+	if (bl != NULL)
-		brace_level_advance(in->in_brace_level);
+		brace_level_advance(bl);
 done:
-	initialization_remove_designation(in);
+	if (bl != NULL)
 		designation_reset(&bl->bl_designation);
 	initialization_debug(in);
 	debug_leave();
+}
 static struct initialization *init;
 static struct initialization *
 current_init(void)
+{
 	lint_assert(init != NULL);