 @@ -1,14 +1,14 @@
-/*	$NetBSD: d_c99_init.c,v 1.24 2021/03/30 14:25:28 rillig Exp $	*/
+/*	$NetBSD: d_c99_init.c,v 1.25 2021/03/30 15:05:05 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;
 @@ -250,29 +250,28 @@ struct ten {
 	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,
 };
 int c99_6_7_8_p26_example3[4][3] = {
 	{ 1, 3, 5 },
 	{ 2, 4, 6 },
 	{ 3, 5, 7 },
 };
 int c99_6_7_8_p27_example4[4][3] = {
 	{ 1 }, { 2 }, { 3 }, { 4 }
 };
 struct {
 @@ -320,58 +319,55 @@ ensure_array_type_is_not_modified_during
 	array_of_unknown_size a1 = { 1, 2, 3};
 	switch (4) {
 	case sizeof(array_of_unknown_size):
 	case 0:			/* expect: duplicate case in switch: 0 */
 	case 3:
 	case 4:
 	case 12:
 		break;
+	}
+}
 struct point unknown_member_name_beginning = {
 	/* TODO: remove me */
 	.r = 5,			/* expect: undefined struct/union member: r */
 	.x = 4,
 	.y = 3,
 };
 struct point unknown_member_name_middle = {
 	.x = 4,
 	.r = 5,			/* expect: undefined struct/union member: r */
 	.y = 3,
 };
 struct point unknown_member_name_end = {
 	.x = 4,
 	.y = 3,
 	.r = 5,			/* expect: undefined struct/union member: r */
 };
 union value {
 	int int_value;
 	void *pointer_value;
 };
 union value unknown_union_member_name_first = {
 	/* TODO: remove me */
 	.unknown_value = 4,	/* expect: undefined struct/union member */
 	.int_value = 3,
 };
 union value unknown_union_member_name_second = {
 	.int_value = 3,
 	/* TODO: remove me */
 	.unknown_value = 4,	/* expect: undefined struct/union member */
 };
 struct point designators_with_subscript = {
 	[0] = 3,		/* expect: only for arrays */
 	.member[0][0].member = 4, /* expect: undefined struct/union member */
 	.x.y.z = 5,	/* intentionally not caught, see designator_look_up */
 };
 struct {
 	int : 16;
 } struct_with_only_unnamed_members = {	/* expect: has no named members */
 ,		/* expect: too many struct/union initializers */

 @@ -1,21 +1,21 @@
 d_c99_init.c(23): error: too many initializers [174]
 d_c99_init.c(63): error: cannot initialize 'pointer to const void' from 'struct any' [185]
 d_c99_init.c(80): error: too many array initializers, expected 3 [173]
 d_c99_init.c(139): error: too many struct/union initializers [172]
 d_c99_init.c(145): error: syntax error 'named member must only be used with struct/union' [249]
 d_c99_init.c(232): error: too many struct/union initializers [172]
 d_c99_init.c(238): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
 d_c99_init.c(242): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
-d_c99_init.c(282): error: cannot initialize 'struct <unnamed>' from 'int' [185]
+d_c99_init.c(281): error: cannot initialize 'struct <unnamed>' from 'int' [185]
-d_c99_init.c(324): error: duplicate case in switch: 0 [199]
+d_c99_init.c(323): error: duplicate case in switch: 0 [199]
-d_c99_init.c(334): error: undefined struct/union member: r [101]
+d_c99_init.c(332): error: undefined struct/union member: r [101]
-d_c99_init.c(341): error: undefined struct/union member: r [101]
+d_c99_init.c(339): error: undefined struct/union member: r [101]
-d_c99_init.c(348): error: undefined struct/union member: r [101]
+d_c99_init.c(346): error: undefined struct/union member: r [101]
-d_c99_init.c(358): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(355): error: undefined struct/union member: unknown_value [101]
-d_c99_init.c(365): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(361): error: undefined struct/union member: unknown_value [101]
-d_c99_init.c(369): error: syntax error 'designator '[...]' is only for arrays' [249]
+d_c99_init.c(365): error: syntax error 'designator '[...]' is only for arrays' [249]
-d_c99_init.c(370): error: undefined struct/union member: member [101]
+d_c99_init.c(366): error: undefined struct/union member: member [101]
-d_c99_init.c(376): warning: structure has no named members [65]
+d_c99_init.c(372): warning: structure has no named members [65]
-d_c99_init.c(377): error: too many struct/union initializers [172]
+d_c99_init.c(373): error: too many struct/union initializers [172]
-d_c99_init.c(382): warning: union has no named members [65]
+d_c99_init.c(378): warning: union has no named members [65]
-d_c99_init.c(383): error: too many struct/union initializers [172]
+d_c99_init.c(379): error: too many struct/union initializers [172]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_247.c,v 1.7 2021/03/26 16:59:19 rillig Exp $	*/
+/*	$NetBSD: msg_247.c,v 1.8 2021/03/30 15:05:05 rillig Exp $	*/
 # 3 "msg_247.c"
 // Test for message: pointer cast from '%s' to '%s' may be troublesome [247]
 /* lint1-extra-flags: -c */
 /* example taken from Xlib.h */
 typedef struct {
 	int id;
 } *PDisplay;
 struct Other {
 	int id;
 @@ -30,27 +30,27 @@ example(struct Other *arg)
 	 */
 	display = (PDisplay)arg;	/* expect: 247 */
+}
 /*
  * C code with a long history that has existed in pre-C90 times already often
  * uses 'pointer to char' where modern code would use 'pointer to void'.
  * Since 'char' is the most general underlying type, there is nothing wrong
  * with casting to it.  An example for this type of code is X11.
+ *
  * Casting to 'pointer to char' may also be used by programmers who don't know
  * about endianness, but that's not something lint can do anything about.  The
  * code for these two use cases looks exactly the same, so lint errs on the
- * side of fewer false positive warnings here. (after fixing the FIXME below)
+ * side of fewer false positive warnings here.
  */
 char *
 cast_to_char_pointer(struct Other *arg)
+{
 	return (char *)arg;
+}
 /*
  * In traditional C there was 'unsigned char' as well, so the same reasoning
  * as for plain 'char' applies here.
  */
 unsigned char *
 cast_to_unsigned_char_pointer(struct Other *arg)