 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.171 2021/03/28 18:33:27 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.172 2021/03/28 19:30:08 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.171 2021/03/28 18:33:27 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.172 2021/03/28 19:30:08 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -579,54 +579,54 @@ 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_bloated(struct brace_level *level,
+brace_level_look_up_member_named(struct brace_level *level, const char *name,
-			   const struct designator *dr, int *count)
+				 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)
-		 * TODO: split into separate functions:
+			continue;
 		(*count)++;
-		 * look_up_array_next
+		break;
 		 * look_up_array_designator
 		 * look_up_struct_next
 		 * look_up_struct_designator
 		 */
 		if (dr != NULL) {
 			/* XXX: this log entry looks unnecessarily verbose */
 			debug_step("have member '%s', want member '%s'",
 			    m->s_name, dr->name);
 			if (strcmp(m->s_name, dr->name) == 0) {
 				(*count)++;
 				break;
 			} else
 				continue;
 	return m;
+}
 /* TODO: merge duplicate code */
 static sym_t *
 brace_level_look_up_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;
+		}
+	}
 	return m;
+}
 /* TODO: document me */
 /* TODO: think of a better name than 'push' */
 static bool
 @@ -802,49 +802,48 @@ initialization_init(struct initializatio
+}
 static void
 initialization_set_error(struct initialization *in)
+{
 	in->initerr = true;
+}
 /* TODO: document me */
 /* TODO: think of a better name than 'push' */
 static bool
 initialization_push_struct_or_union(struct initialization *in)
+{
 	/*
 	 * TODO: remove unnecessary 'const' for variables in functions that
 	 * fit on a single screen.  Keep it for larger functions.
 	 */
 	struct brace_level *level = in->brace_level;
 	int cnt;
 	sym_t *m;
 	if (is_incomplete(level->bl_type)) {
 		/* 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" : "");
-	m = brace_level_look_up_member_bloated(level,
+	if (in->designation.head != NULL)
-	    in->designation.head, &cnt);
+		m = brace_level_look_up_member_named(level,
 		    in->designation.head->name, &cnt);
 	else
 		m = brace_level_look_up_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;