Module Name: src
Committed By: rillig
Date: Fri Jul 21 06:02:07 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: init_braces.c msg_024.c msg_181.c
msg_319.c
src/usr.bin/xlint/lint1: err.c init.c
Log Message:
lint: reword message about non-constant initializer
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/init_braces.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_024.c \
src/tests/usr.bin/xlint/lint1/msg_319.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_181.c
cvs rdiff -u -r1.212 -r1.213 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.248 -r1.249 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/init_braces.c
diff -u src/tests/usr.bin/xlint/lint1/init_braces.c:1.8 src/tests/usr.bin/xlint/lint1/init_braces.c:1.9
--- src/tests/usr.bin/xlint/lint1/init_braces.c:1.8 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/init_braces.c Fri Jul 21 06:02:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: init_braces.c,v 1.8 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: init_braces.c,v 1.9 2023/07/21 06:02:07 rillig Exp $ */
# 3 "init_braces.c"
/*
@@ -16,7 +16,7 @@ init_int(void)
{
/* gcc-expect+4: error: invalid initializer */
/* clang-expect+3: error: array initializer must be an initializer list */
- /* expect+2: error: {}-enclosed initializer required [181] */
+ /* expect+2: error: {}-enclosed or constant initializer of type 'array[unknown_size] of int' required [181] */
/* expect+1: error: empty array declaration for 'num0' [190] */
int num0[] = 0;
int num1[] = { 1 };
Index: src/tests/usr.bin/xlint/lint1/msg_024.c
diff -u src/tests/usr.bin/xlint/lint1/msg_024.c:1.5 src/tests/usr.bin/xlint/lint1/msg_024.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_024.c:1.5 Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/msg_024.c Fri Jul 21 06:02:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_024.c,v 1.5 2023/03/28 14:44:34 rillig Exp $ */
+/* $NetBSD: msg_024.c,v 1.6 2023/07/21 06:02:07 rillig Exp $ */
# 3 "msg_024.c"
// Test for message: cannot initialize function '%s' [24]
@@ -14,5 +14,5 @@ definition(void)
/* expect+3: error: cannot initialize function 'fn' [24] */
/* The following message is strange but does not occur in practice. */
-/* expect+1: error: {}-enclosed initializer required [181] */
+/* expect+1: error: {}-enclosed or constant initializer of type 'function(void) returning void' required [181] */
function fn = definition;
Index: src/tests/usr.bin/xlint/lint1/msg_319.c
diff -u src/tests/usr.bin/xlint/lint1/msg_319.c:1.5 src/tests/usr.bin/xlint/lint1/msg_319.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_319.c:1.5 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_319.c Fri Jul 21 06:02:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_319.c,v 1.5 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_319.c,v 1.6 2023/07/21 06:02:07 rillig Exp $ */
# 3 "msg_319.c"
/* Test for message: compound literals are a C99/GCC extension [319] */
@@ -17,4 +17,4 @@ struct point {
4,
};
/* expect-1: error: compound literals are a C99/GCC extension [319] */
-/* expect-2: error: {}-enclosed initializer required [181] */
+/* expect-2: error: {}-enclosed or constant initializer of type 'struct point' required [181] */
Index: src/tests/usr.bin/xlint/lint1/msg_181.c
diff -u src/tests/usr.bin/xlint/lint1/msg_181.c:1.6 src/tests/usr.bin/xlint/lint1/msg_181.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_181.c:1.6 Fri Jul 21 05:51:12 2023
+++ src/tests/usr.bin/xlint/lint1/msg_181.c Fri Jul 21 06:02:07 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_181.c,v 1.6 2023/07/21 05:51:12 rillig Exp $ */
+/* $NetBSD: msg_181.c,v 1.7 2023/07/21 06:02:07 rillig Exp $ */
# 3 "msg_181.c"
-// Test for message: {}-enclosed initializer required [181]
+// Test for message: {}-enclosed or constant initializer of type '%s' required [181]
/* lint1-extra-flags: -X 351 */
-/* expect+1: error: {}-enclosed initializer required [181] */
+/* expect+1: error: {}-enclosed or constant initializer of type 'struct <unnamed>' required [181] */
struct { int x; } missing_braces = 3;
struct { int x; } including_braces = { 3 };
@@ -20,4 +20,4 @@ struct number {
} num = (struct number){
.value = 3,
};
-/* expect-1: error: {}-enclosed initializer required [181] */
+/* expect-1: error: {}-enclosed or constant initializer of type 'struct number' required [181] */
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.212 src/usr.bin/xlint/lint1/err.c:1.213
--- src/usr.bin/xlint/lint1/err.c:1.212 Thu Jul 13 08:40:38 2023
+++ src/usr.bin/xlint/lint1/err.c Fri Jul 21 06:02:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.212 2023/07/13 08:40:38 rillig Exp $ */
+/* $NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.212 2023/07/13 08:40:38 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $");
#endif
#include <limits.h>
@@ -236,7 +236,7 @@ static const char *const msgs[] = {
"initializer does not fit", /* 178 */
"cannot initialize struct/union with no named member", /* 179 */
"bit-field initializer does not fit", /* 180 */
- "{}-enclosed initializer required", /* 181 */
+ "{}-enclosed or constant initializer of type '%s' required", /* 181 */
"incompatible pointer types to '%s' and '%s'", /* 182 */
"illegal combination of %s '%s' and %s '%s'", /* 183 */
"illegal combination of '%s' and '%s'", /* 184 */
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.248 src/usr.bin/xlint/lint1/init.c:1.249
--- src/usr.bin/xlint/lint1/init.c:1.248 Sat Jul 15 15:51:22 2023
+++ src/usr.bin/xlint/lint1/init.c Fri Jul 21 06:02:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.248 2023/07/15 15:51:22 rillig Exp $ */
+/* $NetBSD: init.c,v 1.249 2023/07/21 06:02:07 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: init.c,v 1.248 2023/07/15 15:51:22 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.249 2023/07/21 06:02:07 rillig Exp $");
#endif
#include <stdlib.h>
@@ -976,8 +976,8 @@ initialization_expr(initialization *in,
goto done;
if (bl == NULL && !is_scalar(tp->t_tspec)) {
- /* {}-enclosed initializer required */
- error(181);
+ /* {}-enclosed or constant initializer of type '%s' required */
+ error(181, type_name(in->in_sym->s_type));
goto done;
}
