 @@ -1,14 +1,14 @@
-/*	$NetBSD: d_c99_init.c,v 1.18 2021/03/28 18:48:32 rillig Exp $	*/
+/*	$NetBSD: d_c99_init.c,v 1.19 2021/03/28 19:53:58 rillig Exp $	*/
 # 3 "d_c99_init.c"
 /*
  * Test C99 initializers.
+ *
  * See C99 6.7.8 "Initialization".
 */
 void use(const void *);
 typedef struct any {
 	const void *value;
 @@ -233,13 +233,34 @@ struct ends_with_unnamed_bit_field {
 };
 char prefixed_message[] = {
 	'E', ':', ' ',
 	/* expect+1: illegal combination of integer (char) and pointer */
 	"message\n",
 };
 char message_with_suffix[] = {
 	"message",
 	/* expect+1: too many array initializers */
 	'\n',
 };
 struct ten {
 	int i0;
 	int i1;
 	int i2;
 	int i3;
 	int i4;
 	int i5;
 	int i6;
 	int i7;
 	int i8;
 	int i9;
 };
 struct ten ten = {
 	.i3 = 3,
 ,
 	// FIXME: assertion "level->bl_type->t_tspec == ARRAY" failed in brace_level_extend_if_array_of_unknown_size
 	// 5,
 	// 6,
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.172 2021/03/28 19:30:08 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.173 2021/03/28 19:53:58 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.172 2021/03/28 19:30:08 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.173 2021/03/28 19:53:58 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -579,47 +579,47 @@ brace_level_look_up_member(const struct
 	for (m = tp->t_str->sou_first_member; m != NULL; m = m->s_next) {
 		if (m->s_bitfield && m->s_name == unnamed)
 			continue;
 		if (strcmp(m->s_name, name) == 0)
 			return m;
+	}
 	return NULL;
+}
 /* TODO: merge duplicate code */
 static sym_t *
-brace_level_look_up_member_named(struct brace_level *level, const char *name,
+brace_level_look_up_first_member_named(struct brace_level *level,
-				 int *count)
+				       const char *name, int *count)
+{
 	sym_t *m;
 	for (m = level->bl_type->t_str->sou_first_member;
 	     m != NULL; m = m->s_next) {
 		if (m->s_bitfield && m->s_name == unnamed)
 			continue;
 		if (strcmp(m->s_name, name) != 0)
 			continue;
 		(*count)++;
 		break;
+	}
 	return m;
+}
 /* TODO: merge duplicate code */
 static sym_t *
-brace_level_look_up_member_unnamed(struct brace_level *level, int *count)
+brace_level_look_up_first_member_unnamed(struct brace_level *level, int *count)
+{
 	sym_t *m;
 	for (m = level->bl_type->t_str->sou_first_member;
 	     m != NULL; m = m->s_next) {
 		if (m->s_bitfield && m->s_name == unnamed)
 			continue;
 		/* XXX: What is this code for? */
 		if (++(*count) == 1) {
 			level->bl_next_member = m;
 			level->bl_subtype = m->s_type;
+		}
+	}
 @@ -820,30 +820,30 @@ initialization_push_struct_or_union(stru
 		/* initialization of an incomplete type */
 		error(175);
 		initialization_set_error(in);
 		return false;
+	}
 	cnt = 0;
 	designation_debug(&in->designation);
 	debug_step("lookup for '%s'%s",
 	    type_name(level->bl_type),
 	    level->bl_seen_named_member ? ", seen named member" : "");
 	if (in->designation.head != NULL)
-		m = brace_level_look_up_member_named(level,
+		m = brace_level_look_up_first_member_named(level,
 		    in->designation.head->name, &cnt);
 	else
-		m = brace_level_look_up_member_unnamed(level, &cnt);
+		m = brace_level_look_up_first_member_unnamed(level, &cnt);
 	if (in->designation.head != NULL) {
 		if (m == NULL) {
 			debug_step("pop struct");
 			return true;
+		}
 		level->bl_next_member = m;
 		level->bl_subtype = m->s_type;
 		level->bl_seen_named_member = true;
 		debug_step("named member '%s'",
 		    in->designation.head->name);
 		designation_shift_level(&in->designation);
 		cnt = level->bl_type->t_tspec == STRUCT ? 2 : 1;