Module Name: src
Committed By: rillig
Date: Sat Jun 11 11:52:13 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: decl.c decl.exp emit.c emit.exp
gcc_attribute_func.c gcc_attribute_func.exp
gcc_init_compound_literal.c gcc_init_compound_literal.exp init.c
init.exp msg_000.exp msg_001.c msg_001.exp msg_019.exp msg_031.exp
msg_044.c msg_044.exp msg_045.c msg_045.exp msg_046.c msg_046.exp
msg_067.c msg_067.exp msg_085.exp msg_135.c msg_135.exp msg_136.exp
msg_143.exp msg_152.exp msg_175.exp msg_226.c msg_226.exp msg_233.c
msg_233.exp msg_234.c msg_234.exp msg_235.c msg_235.exp msg_236.c
msg_236.exp msg_247.c msg_247.exp msg_260.c msg_260.exp msg_261.c
msg_261.exp msg_268.c msg_268.exp msg_269.c msg_269.exp msg_307.c
msg_307.exp msg_314.c msg_347.c msg_347.exp msg_348.c msg_348.exp
platform_long.c platform_long.exp platform_lp64.c platform_lp64.exp
src/usr.bin/xlint/lint1: decl.c err.c
Log Message:
lint: add quotes around a few more placeholders in messages
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/xlint/lint1/decl.exp \
src/tests/usr.bin/xlint/lint1/emit.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/emit.exp \
src/tests/usr.bin/xlint/lint1/msg_044.c \
src/tests/usr.bin/xlint/lint1/msg_044.exp \
src/tests/usr.bin/xlint/lint1/msg_045.c \
src/tests/usr.bin/xlint/lint1/msg_045.exp \
src/tests/usr.bin/xlint/lint1/msg_085.exp \
src/tests/usr.bin/xlint/lint1/msg_136.exp \
src/tests/usr.bin/xlint/lint1/msg_143.exp \
src/tests/usr.bin/xlint/lint1/msg_226.c \
src/tests/usr.bin/xlint/lint1/msg_226.exp \
src/tests/usr.bin/xlint/lint1/msg_233.c \
src/tests/usr.bin/xlint/lint1/msg_233.exp \
src/tests/usr.bin/xlint/lint1/msg_234.c \
src/tests/usr.bin/xlint/lint1/msg_234.exp \
src/tests/usr.bin/xlint/lint1/msg_235.c \
src/tests/usr.bin/xlint/lint1/msg_235.exp \
src/tests/usr.bin/xlint/lint1/msg_236.c \
src/tests/usr.bin/xlint/lint1/msg_236.exp \
src/tests/usr.bin/xlint/lint1/msg_261.c \
src/tests/usr.bin/xlint/lint1/msg_261.exp \
src/tests/usr.bin/xlint/lint1/msg_268.c \
src/tests/usr.bin/xlint/lint1/msg_268.exp \
src/tests/usr.bin/xlint/lint1/msg_269.c \
src/tests/usr.bin/xlint/lint1/msg_269.exp \
src/tests/usr.bin/xlint/lint1/msg_307.c \
src/tests/usr.bin/xlint/lint1/msg_307.exp \
src/tests/usr.bin/xlint/lint1/msg_314.c \
src/tests/usr.bin/xlint/lint1/msg_347.c \
src/tests/usr.bin/xlint/lint1/msg_347.exp \
src/tests/usr.bin/xlint/lint1/platform_long.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c \
src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp \
src/tests/usr.bin/xlint/lint1/msg_000.exp \
src/tests/usr.bin/xlint/lint1/platform_long.exp \
src/tests/usr.bin/xlint/lint1/platform_lp64.c \
src/tests/usr.bin/xlint/lint1/platform_lp64.exp
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c \
src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp \
src/tests/usr.bin/xlint/lint1/msg_046.c \
src/tests/usr.bin/xlint/lint1/msg_046.exp \
src/tests/usr.bin/xlint/lint1/msg_067.c \
src/tests/usr.bin/xlint/lint1/msg_067.exp \
src/tests/usr.bin/xlint/lint1/msg_260.c \
src/tests/usr.bin/xlint/lint1/msg_260.exp \
src/tests/usr.bin/xlint/lint1/msg_348.c \
src/tests/usr.bin/xlint/lint1/msg_348.exp
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/init.c \
src/tests/usr.bin/xlint/lint1/init.exp
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_001.c \
src/tests/usr.bin/xlint/lint1/msg_031.exp
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_001.exp \
src/tests/usr.bin/xlint/lint1/msg_019.exp \
src/tests/usr.bin/xlint/lint1/msg_152.exp
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/msg_135.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_135.exp
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_175.exp
cvs rdiff -u -r1.16 -r1.17 src/tests/usr.bin/xlint/lint1/msg_247.c
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/xlint/lint1/msg_247.exp
cvs rdiff -u -r1.283 -r1.284 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/xlint/lint1/err.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/decl.c
diff -u src/tests/usr.bin/xlint/lint1/decl.c:1.15 src/tests/usr.bin/xlint/lint1/decl.c:1.16
--- src/tests/usr.bin/xlint/lint1/decl.c:1.15 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/decl.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.15 2022/04/24 20:08:23 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.16 2022/06/11 11:52:13 rillig Exp $ */
# 3 "decl.c"
/*
@@ -108,8 +108,8 @@ declaration_without_type_specifier(void)
return i;
}
-/* TODO: add quotes around %s */
-/* expect+2: warning: static function unused unused [236] */
+
+/* expect+2: warning: static function 'unused' unused [236] */
static void
unused(void)
{
@@ -168,7 +168,7 @@ __thread int thread_int;
__thread__ int thread_int;
/* expect+4: error: old style declaration; add 'int' [1] */
-/* expect+2: warning: static function cover_func_declarator unused [236] */
+/* expect+2: warning: static function 'cover_func_declarator' unused [236] */
static
cover_func_declarator(void)
{
Index: src/tests/usr.bin/xlint/lint1/decl.exp
diff -u src/tests/usr.bin/xlint/lint1/decl.exp:1.11 src/tests/usr.bin/xlint/lint1/decl.exp:1.12
--- src/tests/usr.bin/xlint/lint1/decl.exp:1.11 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/decl.exp Sat Jun 11 11:52:13 2022
@@ -16,6 +16,6 @@ decl.c(168): error: old style declaratio
decl.c(168): error: syntax error 'int' [249]
decl.c(174): error: old style declaration; add 'int' [1]
decl.c(183): error: syntax error 'goto' [249]
-decl.c(114): warning: static function unused unused [236]
-decl.c(173): warning: static function cover_func_declarator unused [236]
+decl.c(114): warning: static function 'unused' unused [236]
+decl.c(173): warning: static function 'cover_func_declarator' unused [236]
decl.c(183): warning: empty array declaration: void_array_error [190]
Index: src/tests/usr.bin/xlint/lint1/emit.c
diff -u src/tests/usr.bin/xlint/lint1/emit.c:1.11 src/tests/usr.bin/xlint/lint1/emit.c:1.12
--- src/tests/usr.bin/xlint/lint1/emit.c:1.11 Sun Apr 24 19:21:01 2022
+++ src/tests/usr.bin/xlint/lint1/emit.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.11 2022/04/24 19:21:01 rillig Exp $ */
+/* $NetBSD: emit.c,v 1.12 2022/06/11 11:52:13 rillig Exp $ */
# 3 "emit.c"
/*
@@ -104,7 +104,7 @@ extern enum {
extern int declared_int;
int defined_int;
-/* expect+1: warning: static variable static_int unused [226] */
+/* expect+1: warning: static variable 'static_int' unused [226] */
static int static_int;
/*
Index: src/tests/usr.bin/xlint/lint1/emit.exp
diff -u src/tests/usr.bin/xlint/lint1/emit.exp:1.3 src/tests/usr.bin/xlint/lint1/emit.exp:1.4
--- src/tests/usr.bin/xlint/lint1/emit.exp:1.3 Sun Apr 24 19:21:01 2022
+++ src/tests/usr.bin/xlint/lint1/emit.exp Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
emit.c(123): error: old style declaration; add 'int' [1]
-emit.c(108): warning: static variable static_int unused [226]
+emit.c(108): warning: static variable 'static_int' unused [226]
emit.c(129): warning: static function static_return_void_no_parameters declared but not defined [290]
emit.c(149): warning: static function static_function declared but not defined [290]
Index: src/tests/usr.bin/xlint/lint1/msg_044.c
diff -u src/tests/usr.bin/xlint/lint1/msg_044.c:1.3 src/tests/usr.bin/xlint/lint1/msg_044.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_044.c:1.3 Thu Aug 26 19:23:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_044.c Sat Jun 11 11:52:13 2022
@@ -1,15 +1,15 @@
-/* $NetBSD: msg_044.c,v 1.3 2021/08/26 19:23:25 rillig Exp $ */
+/* $NetBSD: msg_044.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_044.c"
// Test for message: declaration introduces new type in ANSI C: %s %s [44]
-/* expect+1: warning: struct tag never defined [233] */
+/* expect+1: warning: struct 'tag' never defined [233] */
struct tag;
void declaration(struct tag *);
void definition(void) {
/* expect+2: warning: declaration introduces new type in ANSI C: struct tag [44] */
- /* expect+1: warning: struct tag never defined [233] */
+ /* expect+1: warning: struct 'tag' never defined [233] */
struct tag;
}
Index: src/tests/usr.bin/xlint/lint1/msg_044.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_044.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_044.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_044.exp:1.3 Thu Aug 26 19:23:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_044.exp Sat Jun 11 11:52:13 2022
@@ -1,3 +1,3 @@
msg_044.c(14): warning: declaration introduces new type in ANSI C: struct tag [44]
-msg_044.c(14): warning: struct tag never defined [233]
-msg_044.c(7): warning: struct tag never defined [233]
+msg_044.c(14): warning: struct 'tag' never defined [233]
+msg_044.c(7): warning: struct 'tag' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_045.c
diff -u src/tests/usr.bin/xlint/lint1/msg_045.c:1.3 src/tests/usr.bin/xlint/lint1/msg_045.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_045.c:1.3 Fri Apr 8 21:29:29 2022
+++ src/tests/usr.bin/xlint/lint1/msg_045.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_045.c,v 1.3 2022/04/08 21:29:29 rillig Exp $ */
+/* $NetBSD: msg_045.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_045.c"
/* Test for message: base type is really '%s %s' [45] */
@@ -14,7 +14,7 @@ function()
/* expect+4: warning: base type is really 'struct counter' [45] */
/* expect+3: warning: declaration introduces new type in ANSI C: union counter [44] */
/* expect+2: error: 'counter' has incomplete type 'incomplete union counter' [31] */
- /* expect+1: warning: union counter never defined [234] */
+ /* expect+1: warning: union 'counter' never defined [234] */
union counter counter;
/* expect+1: warning: illegal member use: value [102] */
counter.value++;
Index: src/tests/usr.bin/xlint/lint1/msg_045.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_045.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_045.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_045.exp:1.3 Fri Apr 8 21:29:29 2022
+++ src/tests/usr.bin/xlint/lint1/msg_045.exp Sat Jun 11 11:52:13 2022
@@ -2,4 +2,4 @@ msg_045.c(18): warning: base type is rea
msg_045.c(18): warning: declaration introduces new type in ANSI C: union counter [44]
msg_045.c(18): error: 'counter' has incomplete type 'incomplete union counter' [31]
msg_045.c(20): warning: illegal member use: value [102]
-msg_045.c(18): warning: union counter never defined [234]
+msg_045.c(18): warning: union 'counter' never defined [234]
Index: src/tests/usr.bin/xlint/lint1/msg_085.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_085.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_085.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_085.exp:1.3 Sun Jan 31 09:21:24 2021
+++ src/tests/usr.bin/xlint/lint1/msg_085.exp Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
msg_085.c(6): warning: dubious tag declaration: struct in_argument [85]
msg_085.c(7): warning: dubious tag declaration: union in_argument [85]
msg_085.c(8): warning: dubious tag declaration: enum in_argument [85]
-msg_085.c(10): warning: struct ok never defined [233]
+msg_085.c(10): warning: struct 'ok' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_136.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_136.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_136.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_136.exp:1.3 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/msg_136.exp Sat Jun 11 11:52:13 2022
@@ -1,2 +1,2 @@
msg_136.c(11): error: cannot do pointer arithmetic on operand of unknown size [136]
-msg_136.c(6): warning: struct incomplete never defined [233]
+msg_136.c(6): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_143.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_143.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_143.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_143.exp:1.3 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/msg_143.exp Sat Jun 11 11:52:13 2022
@@ -1,2 +1,2 @@
msg_143.c(11): error: cannot take size/alignment of incomplete type [143]
-msg_143.c(6): warning: struct incomplete never defined [233]
+msg_143.c(6): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_226.c
diff -u src/tests/usr.bin/xlint/lint1/msg_226.c:1.3 src/tests/usr.bin/xlint/lint1/msg_226.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_226.c:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_226.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_226.c,v 1.3 2021/08/27 20:49:25 rillig Exp $ */
+/* $NetBSD: msg_226.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_226.c"
-// Test for message: static variable %s unused [226]
+// Test for message: static variable '%s' unused [226]
-/* expect+1: warning: static variable unused unused [226] */
+/* expect+1: warning: static variable 'unused' unused [226] */
static int unused;
Index: src/tests/usr.bin/xlint/lint1/msg_226.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_226.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_226.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_226.exp:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_226.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_226.c(7): warning: static variable unused unused [226]
+msg_226.c(7): warning: static variable 'unused' unused [226]
Index: src/tests/usr.bin/xlint/lint1/msg_233.c
diff -u src/tests/usr.bin/xlint/lint1/msg_233.c:1.3 src/tests/usr.bin/xlint/lint1/msg_233.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_233.c:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_233.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_233.c,v 1.3 2021/08/27 20:49:25 rillig Exp $ */
+/* $NetBSD: msg_233.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_233.c"
-// Test for message: struct %s never defined [233]
+// Test for message: struct '%s' never defined [233]
-/* expect+1: warning: struct declared_but_not_defined never defined [233] */
+/* expect+1: warning: struct 'declared_but_not_defined' never defined [233] */
struct declared_but_not_defined;
Index: src/tests/usr.bin/xlint/lint1/msg_233.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_233.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_233.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_233.exp:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_233.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_233.c(7): warning: struct declared_but_not_defined never defined [233]
+msg_233.c(7): warning: struct 'declared_but_not_defined' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_234.c
diff -u src/tests/usr.bin/xlint/lint1/msg_234.c:1.3 src/tests/usr.bin/xlint/lint1/msg_234.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_234.c:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_234.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_234.c,v 1.3 2022/06/11 11:20:40 rillig Exp $ */
+/* $NetBSD: msg_234.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_234.c"
-// Test for message: union %s never defined [234]
+// Test for message: union '%s' never defined [234]
-/* expect+1: warning: union declared_but_not_defined never defined [234] */
+/* expect+1: warning: union 'declared_but_not_defined' never defined [234] */
union declared_but_not_defined;
Index: src/tests/usr.bin/xlint/lint1/msg_234.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_234.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_234.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_234.exp:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_234.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_234.c(7): warning: union declared_but_not_defined never defined [234]
+msg_234.c(7): warning: union 'declared_but_not_defined' never defined [234]
Index: src/tests/usr.bin/xlint/lint1/msg_235.c
diff -u src/tests/usr.bin/xlint/lint1/msg_235.c:1.3 src/tests/usr.bin/xlint/lint1/msg_235.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_235.c:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_235.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_235.c,v 1.3 2021/08/27 20:49:25 rillig Exp $ */
+/* $NetBSD: msg_235.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_235.c"
-// Test for message: enum %s never defined [235]
+// Test for message: enum '%s' never defined [235]
-/* expect+1: warning: enum declared_but_not_defined never defined [235] */
+/* expect+1: warning: enum 'declared_but_not_defined' never defined [235] */
enum declared_but_not_defined;
Index: src/tests/usr.bin/xlint/lint1/msg_235.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_235.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_235.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_235.exp:1.3 Fri Aug 27 20:49:25 2021
+++ src/tests/usr.bin/xlint/lint1/msg_235.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_235.c(7): warning: enum declared_but_not_defined never defined [235]
+msg_235.c(7): warning: enum 'declared_but_not_defined' never defined [235]
Index: src/tests/usr.bin/xlint/lint1/msg_236.c
diff -u src/tests/usr.bin/xlint/lint1/msg_236.c:1.3 src/tests/usr.bin/xlint/lint1/msg_236.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_236.c:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_236.c Sat Jun 11 11:52:13 2022
@@ -1,14 +1,14 @@
-/* $NetBSD: msg_236.c,v 1.3 2022/06/11 11:20:40 rillig Exp $ */
+/* $NetBSD: msg_236.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_236.c"
-// Test for message: static function %s unused [236]
+// Test for message: static function '%s' unused [236]
void
external_function(void)
{
}
-/* expect+2: warning: static function static_function unused [236] */
+/* expect+2: warning: static function 'static_function' unused [236] */
static void
static_function(void)
{
Index: src/tests/usr.bin/xlint/lint1/msg_236.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_236.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_236.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_236.exp:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_236.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_236.c(13): warning: static function static_function unused [236]
+msg_236.c(13): warning: static function 'static_function' unused [236]
Index: src/tests/usr.bin/xlint/lint1/msg_261.c
diff -u src/tests/usr.bin/xlint/lint1/msg_261.c:1.3 src/tests/usr.bin/xlint/lint1/msg_261.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_261.c:1.3 Sat Jun 11 10:46:38 2022
+++ src/tests/usr.bin/xlint/lint1/msg_261.c Sat Jun 11 11:52:13 2022
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_261.c,v 1.3 2022/06/11 10:46:38 rillig Exp $ */
+/* $NetBSD: msg_261.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_261.c"
-// Test for message: previous definition of %s [261]
+// Test for message: previous definition of '%s' [261]
/* lint1-extra-flags: -r */
-/* expect+2: previous definition of function [261] */
+/* expect+2: previous definition of 'function' [261] */
void
function(void)
{
Index: src/tests/usr.bin/xlint/lint1/msg_261.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_261.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_261.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_261.exp:1.3 Sat Jun 11 10:46:38 2022
+++ src/tests/usr.bin/xlint/lint1/msg_261.exp Sat Jun 11 11:52:13 2022
@@ -1,3 +1,3 @@
msg_261.c(16): error: redeclaration of 'function' with type 'function(void) returning int', expected 'function(void) returning void' [347]
-msg_261.c(10): previous definition of function [261]
+msg_261.c(10): previous definition of 'function' [261]
msg_261.c(16): warning: static function function declared but not defined [290]
Index: src/tests/usr.bin/xlint/lint1/msg_268.c
diff -u src/tests/usr.bin/xlint/lint1/msg_268.c:1.3 src/tests/usr.bin/xlint/lint1/msg_268.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_268.c:1.3 Sun Aug 22 13:45:56 2021
+++ src/tests/usr.bin/xlint/lint1/msg_268.c Sat Jun 11 11:52:13 2022
@@ -1,12 +1,12 @@
-/* $NetBSD: msg_268.c,v 1.3 2021/08/22 13:45:56 rillig Exp $ */
+/* $NetBSD: msg_268.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_268.c"
-// Test for message: variable declared inline: %s [268]
+// Test for message: variable '%s' declared inline [268]
int
example(int arg)
{
- /* expect+1: warning: variable declared inline: local [268] */
+ /* expect+1: warning: variable 'local' declared inline [268] */
inline int local = arg;
return local;
Index: src/tests/usr.bin/xlint/lint1/msg_268.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_268.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_268.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_268.exp:1.3 Sun Aug 22 13:45:56 2021
+++ src/tests/usr.bin/xlint/lint1/msg_268.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_268.c(10): warning: variable declared inline: local [268]
+msg_268.c(10): warning: variable 'local' declared inline [268]
Index: src/tests/usr.bin/xlint/lint1/msg_269.c
diff -u src/tests/usr.bin/xlint/lint1/msg_269.c:1.3 src/tests/usr.bin/xlint/lint1/msg_269.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_269.c:1.3 Sun Aug 22 13:45:56 2021
+++ src/tests/usr.bin/xlint/lint1/msg_269.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_269.c,v 1.3 2021/08/22 13:45:56 rillig Exp $ */
+/* $NetBSD: msg_269.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_269.c"
-// Test for message: argument declared inline: %s [269]
+// Test for message: argument '%s' declared inline [269]
-/* expect+1: warning: argument declared inline: x [269] */
+/* expect+1: warning: argument 'x' declared inline [269] */
void example(inline int x);
Index: src/tests/usr.bin/xlint/lint1/msg_269.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_269.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_269.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_269.exp:1.3 Sun Aug 22 13:45:56 2021
+++ src/tests/usr.bin/xlint/lint1/msg_269.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_269.c(7): warning: argument declared inline: x [269]
+msg_269.c(7): warning: argument 'x' declared inline [269]
Index: src/tests/usr.bin/xlint/lint1/msg_307.c
diff -u src/tests/usr.bin/xlint/lint1/msg_307.c:1.3 src/tests/usr.bin/xlint/lint1/msg_307.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_307.c:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_307.c Sat Jun 11 11:52:13 2022
@@ -1,9 +1,9 @@
-/* $NetBSD: msg_307.c,v 1.3 2022/06/11 11:20:40 rillig Exp $ */
+/* $NetBSD: msg_307.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_307.c"
-// Test for message: static variable %s set but not used [307]
+// Test for message: static variable '%s' set but not used [307]
-/* expect+1: warning: static variable set_but_not_used set but not used [307] */
+/* expect+1: warning: static variable 'set_but_not_used' set but not used [307] */
static int set_but_not_used;
static int only_incremented;
Index: src/tests/usr.bin/xlint/lint1/msg_307.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_307.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_307.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_307.exp:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_307.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-msg_307.c(7): warning: static variable set_but_not_used set but not used [307]
+msg_307.c(7): warning: static variable 'set_but_not_used' set but not used [307]
Index: src/tests/usr.bin/xlint/lint1/msg_314.c
diff -u src/tests/usr.bin/xlint/lint1/msg_314.c:1.3 src/tests/usr.bin/xlint/lint1/msg_314.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_314.c:1.3 Sat Jun 11 11:20:40 2022
+++ src/tests/usr.bin/xlint/lint1/msg_314.c Sat Jun 11 11:52:13 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_314.c,v 1.3 2022/06/11 11:20:40 rillig Exp $ */
+/* $NetBSD: msg_314.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_314.c"
-// Test for message: %s is not a structure or a union [314]
+// Test for message: '%s' is not a structure or a union [314]
/* This message is not used. */
/*
Index: src/tests/usr.bin/xlint/lint1/msg_347.c
diff -u src/tests/usr.bin/xlint/lint1/msg_347.c:1.3 src/tests/usr.bin/xlint/lint1/msg_347.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_347.c:1.3 Mon Sep 13 06:11:51 2021
+++ src/tests/usr.bin/xlint/lint1/msg_347.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_347.c,v 1.3 2021/09/13 06:11:51 rillig Exp $ */
+/* $NetBSD: msg_347.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_347.c"
// Test for message: redeclaration of '%s' with type '%s', expected '%s' [347]
@@ -23,13 +23,13 @@
* ) returning void
*/
/* FIXME: the type of the second parameter is not 'int' */
-/* expect+1: previous declaration of function_parameter [260] */
+/* expect+1: previous declaration of 'function_parameter' [260] */
void function_parameter(void *, double *(void *, int));
/* expect+1: error: redeclaration of 'function_parameter' with type 'function(pointer to void, pointer to function(pointer to void, int) returning pointer to double) returning void', expected 'function(pointer to void, int) returning void' [347] */
void function_parameter(void *fs, double *func(void *, int));
-/* expect+1: warning: struct last_arg never defined [233] */
+/* expect+1: warning: struct 'last_arg' never defined [233] */
struct last_arg;
/*
* FIXME: The following error is completely wrong.
@@ -37,7 +37,7 @@ struct last_arg;
* to it.
*/
/* expect+2: error: '<unnamed>' has incomplete type 'incomplete struct last_arg' [31] */
-/* expect+1: previous declaration of last_arg_struct [260] */
+/* expect+1: previous declaration of 'last_arg_struct' [260] */
void last_arg_struct(double, double *(struct last_arg *));
/* expect+1: error: redeclaration of 'last_arg_struct' with type 'function(double, pointer to function(pointer to incomplete struct last_arg) returning pointer to double) returning void', expected 'function(double, incomplete struct last_arg) returning void' [347] */
void last_arg_struct(double d, double *fn(struct last_arg *));
@@ -47,7 +47,7 @@ struct last_param {
int member;
};
-/* expect+1: previous declaration of last_param [260] */
+/* expect+1: previous declaration of 'last_param' [260] */
void last_param(double, double *(struct last_param));
/*
Index: src/tests/usr.bin/xlint/lint1/msg_347.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_347.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_347.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_347.exp:1.3 Mon Sep 13 06:11:51 2021
+++ src/tests/usr.bin/xlint/lint1/msg_347.exp Sat Jun 11 11:52:13 2022
@@ -1,10 +1,10 @@
msg_347.c(29): error: redeclaration of 'function_parameter' with type 'function(pointer to void, pointer to function(pointer to void, int) returning pointer to double) returning void', expected 'function(pointer to void, int) returning void' [347]
-msg_347.c(27): previous declaration of function_parameter [260]
+msg_347.c(27): previous declaration of 'function_parameter' [260]
msg_347.c(41): error: '<unnamed>' has incomplete type 'incomplete struct last_arg' [31]
msg_347.c(43): error: redeclaration of 'last_arg_struct' with type 'function(double, pointer to function(pointer to incomplete struct last_arg) returning pointer to double) returning void', expected 'function(double, incomplete struct last_arg) returning void' [347]
-msg_347.c(41): previous declaration of last_arg_struct [260]
+msg_347.c(41): previous declaration of 'last_arg_struct' [260]
msg_347.c(58): error: cannot initialize 'double' from 'pointer to function(double, struct last_param) returning void' [185]
msg_347.c(61): error: redeclaration of 'last_param' with type 'function(double, pointer to function(struct last_param) returning pointer to double) returning void', expected 'function(double, struct last_param) returning void' [347]
-msg_347.c(51): previous declaration of last_param [260]
+msg_347.c(51): previous declaration of 'last_param' [260]
msg_347.c(64): error: cannot initialize 'double' from 'pointer to function(double, pointer to function(struct last_param) returning pointer to double) returning void' [185]
-msg_347.c(33): warning: struct last_arg never defined [233]
+msg_347.c(33): warning: struct 'last_arg' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/platform_long.c
diff -u src/tests/usr.bin/xlint/lint1/platform_long.c:1.3 src/tests/usr.bin/xlint/lint1/platform_long.c:1.4
--- src/tests/usr.bin/xlint/lint1/platform_long.c:1.3 Sun Sep 26 14:52:37 2021
+++ src/tests/usr.bin/xlint/lint1/platform_long.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_long.c,v 1.3 2021/09/26 14:52:37 rillig Exp $ */
+/* $NetBSD: platform_long.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
# 3 "platform_long.c"
/*
@@ -30,5 +30,5 @@ convert_unsigned_char_to_size(unsigned c
to_size(uc);
}
-/* expect+1: warning: static variable unused_variable unused [226] */
+/* expect+1: warning: static variable 'unused_variable' unused [226] */
static int unused_variable;
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c:1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c:1.2 Wed Jul 14 20:39:13 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_func.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_func.c,v 1.2 2021/07/14 20:39:13 rillig Exp $ */
+/* $NetBSD: gcc_attribute_func.c,v 1.3 2022/06/11 11:52:13 rillig Exp $ */
# 3 "gcc_attribute_func.c"
/*
@@ -25,13 +25,13 @@ void *attribute_after_parameters(void) _
* The attribute 'used' does not influence static functions, it only
* applies to function parameters.
*/
-/* expect+2: warning: static function used_function unused [236] */
+/* expect+2: warning: static function 'used_function' unused [236] */
static void __attribute__((used))
used_function(void)
{
}
-/* expect+2: warning: static function unused_function unused [236] */
+/* expect+2: warning: static function 'unused_function' unused [236] */
static void
unused_function(void)
{
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp:1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp:1.2 Wed Jul 14 20:39:13 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp Sat Jun 11 11:52:13 2022
@@ -1,2 +1,2 @@
-gcc_attribute_func.c(30): warning: static function used_function unused [236]
-gcc_attribute_func.c(36): warning: static function unused_function unused [236]
+gcc_attribute_func.c(30): warning: static function 'used_function' unused [236]
+gcc_attribute_func.c(36): warning: static function 'unused_function' unused [236]
Index: src/tests/usr.bin/xlint/lint1/msg_000.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_000.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_000.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_000.exp:1.2 Sat Jan 2 18:06:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_000.exp Sat Jun 11 11:52:13 2022
@@ -1,2 +1,2 @@
msg_000.c(8): warning: empty declaration [0]
-msg_000.c(10): warning: static variable local_defined unused [226]
+msg_000.c(10): warning: static variable 'local_defined' unused [226]
Index: src/tests/usr.bin/xlint/lint1/platform_long.exp
diff -u src/tests/usr.bin/xlint/lint1/platform_long.exp:1.2 src/tests/usr.bin/xlint/lint1/platform_long.exp:1.3
--- src/tests/usr.bin/xlint/lint1/platform_long.exp:1.2 Sun Sep 26 14:52:37 2021
+++ src/tests/usr.bin/xlint/lint1/platform_long.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-platform_long.c(34): warning: static variable unused_variable unused [226]
+platform_long.c(34): warning: static variable 'unused_variable' unused [226]
Index: src/tests/usr.bin/xlint/lint1/platform_lp64.c
diff -u src/tests/usr.bin/xlint/lint1/platform_lp64.c:1.2 src/tests/usr.bin/xlint/lint1/platform_lp64.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_lp64.c:1.2 Sun Sep 26 14:28:22 2021
+++ src/tests/usr.bin/xlint/lint1/platform_lp64.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_lp64.c,v 1.2 2021/09/26 14:28:22 rillig Exp $ */
+/* $NetBSD: platform_lp64.c,v 1.3 2022/06/11 11:52:13 rillig Exp $ */
# 3 "platform_lp64.c"
/*
@@ -18,5 +18,5 @@ convert_unsigned_char_to_size_t(unsigned
to_size_t(uc);
}
-/* expect+1: warning: static variable unused_variable unused [226] */
+/* expect+1: warning: static variable 'unused_variable' unused [226] */
static int unused_variable;
Index: src/tests/usr.bin/xlint/lint1/platform_lp64.exp
diff -u src/tests/usr.bin/xlint/lint1/platform_lp64.exp:1.2 src/tests/usr.bin/xlint/lint1/platform_lp64.exp:1.3
--- src/tests/usr.bin/xlint/lint1/platform_lp64.exp:1.2 Sun Sep 26 14:28:22 2021
+++ src/tests/usr.bin/xlint/lint1/platform_lp64.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-platform_lp64.c(22): warning: static variable unused_variable unused [226]
+platform_lp64.c(22): warning: static variable 'unused_variable' unused [226]
Index: src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c:1.4 src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c:1.5
--- src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c:1.4 Sun Apr 18 08:03:56 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_init_compound_literal.c,v 1.4 2021/04/18 08:03:56 rillig Exp $ */
+/* $NetBSD: gcc_init_compound_literal.c,v 1.5 2022/06/11 11:52:13 rillig Exp $ */
# 3 "gcc_init_compound_literal.c"
/*
@@ -37,7 +37,7 @@ struct node {
* Initial tree for representing the decisions in the classic number guessing
* game often used in teaching the basics of programming.
*/
-/* expect+1: static variable guess unused */
+/* expect+1: static variable 'guess' unused */
static const struct node guess = {
50,
&(struct node){
Index: src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp:1.4 src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp:1.5
--- src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp:1.4 Sun Apr 18 08:03:56 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp Sat Jun 11 11:52:13 2022
@@ -1 +1 @@
-gcc_init_compound_literal.c(41): warning: static variable guess unused [226]
+gcc_init_compound_literal.c(41): warning: static variable 'guess' unused [226]
Index: src/tests/usr.bin/xlint/lint1/msg_046.c
diff -u src/tests/usr.bin/xlint/lint1/msg_046.c:1.4 src/tests/usr.bin/xlint/lint1/msg_046.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_046.c:1.4 Mon Aug 16 06:49:57 2021
+++ src/tests/usr.bin/xlint/lint1/msg_046.c Sat Jun 11 11:52:13 2022
@@ -1,36 +1,36 @@
-/* $NetBSD: msg_046.c,v 1.4 2021/08/16 06:49:57 rillig Exp $ */
+/* $NetBSD: msg_046.c,v 1.5 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_046.c"
// Test for message: %s tag '%s' redeclared as %s [46]
-/* expect+1: warning: struct tag1 never defined [233] */
+/* expect+1: warning: struct 'tag1' never defined [233] */
struct tag1;
/* expect+2: error: struct tag 'tag1' redeclared as union [46] */
-/* expect+1: warning: union tag1 never defined [234] */
+/* expect+1: warning: union 'tag1' never defined [234] */
union tag1;
-/* expect+1: warning: union tag2 never defined [234] */
+/* expect+1: warning: union 'tag2' never defined [234] */
union tag2;
/* expect+2: error: union tag 'tag2' redeclared as enum [46] */
-/* expect+1: warning: enum tag2 never defined [235] */
+/* expect+1: warning: enum 'tag2' never defined [235] */
enum tag2;
-/* expect+1: warning: enum tag3 never defined [235] */
+/* expect+1: warning: enum 'tag3' never defined [235] */
enum tag3;
/* expect+2: error: enum tag 'tag3' redeclared as struct [46] */
-/* expect+1: warning: struct tag3 never defined [233] */
+/* expect+1: warning: struct 'tag3' never defined [233] */
struct tag3;
/* expect+2: error: union tag 'tag1' redeclared as struct [46] */
-/* expect+1: warning: struct tag1 never defined [233] */
+/* expect+1: warning: struct 'tag1' never defined [233] */
struct tag1 *use_tag1(void);
/* expect+2: error: enum tag 'tag2' redeclared as union [46] */
-/* expect+1: warning: union tag2 never defined [234] */
+/* expect+1: warning: union 'tag2' never defined [234] */
union tag2 *use_tag2(void);
/* expect+2: error: struct tag 'tag3' redeclared as enum [46] */
-/* expect+1: warning: enum tag3 never defined [235] */
+/* expect+1: warning: enum 'tag3' never defined [235] */
enum tag3 *use_tag3(void);
/* expect+2: error: struct tag 'tag1' redeclared as union [46] */
-/* expect+1: warning: union tag1 never defined [234] */
+/* expect+1: warning: union 'tag1' never defined [234] */
union tag1 *mismatch_tag1(void);
Index: src/tests/usr.bin/xlint/lint1/msg_046.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_046.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_046.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_046.exp:1.4 Mon Aug 16 06:49:57 2021
+++ src/tests/usr.bin/xlint/lint1/msg_046.exp Sat Jun 11 11:52:13 2022
@@ -5,13 +5,13 @@ msg_046.c(26): error: union tag 'tag1' r
msg_046.c(29): error: enum tag 'tag2' redeclared as union [46]
msg_046.c(32): error: struct tag 'tag3' redeclared as enum [46]
msg_046.c(36): error: struct tag 'tag1' redeclared as union [46]
-msg_046.c(7): warning: struct tag1 never defined [233]
-msg_046.c(10): warning: union tag1 never defined [234]
-msg_046.c(13): warning: union tag2 never defined [234]
-msg_046.c(16): warning: enum tag2 never defined [235]
-msg_046.c(19): warning: enum tag3 never defined [235]
-msg_046.c(22): warning: struct tag3 never defined [233]
-msg_046.c(26): warning: struct tag1 never defined [233]
-msg_046.c(29): warning: union tag2 never defined [234]
-msg_046.c(32): warning: enum tag3 never defined [235]
-msg_046.c(36): warning: union tag1 never defined [234]
+msg_046.c(7): warning: struct 'tag1' never defined [233]
+msg_046.c(10): warning: union 'tag1' never defined [234]
+msg_046.c(13): warning: union 'tag2' never defined [234]
+msg_046.c(16): warning: enum 'tag2' never defined [235]
+msg_046.c(19): warning: enum 'tag3' never defined [235]
+msg_046.c(22): warning: struct 'tag3' never defined [233]
+msg_046.c(26): warning: struct 'tag1' never defined [233]
+msg_046.c(29): warning: union 'tag2' never defined [234]
+msg_046.c(32): warning: enum 'tag3' never defined [235]
+msg_046.c(36): warning: union 'tag1' never defined [234]
Index: src/tests/usr.bin/xlint/lint1/msg_067.c
diff -u src/tests/usr.bin/xlint/lint1/msg_067.c:1.4 src/tests/usr.bin/xlint/lint1/msg_067.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_067.c:1.4 Tue Jul 13 22:01:34 2021
+++ src/tests/usr.bin/xlint/lint1/msg_067.c Sat Jun 11 11:52:13 2022
@@ -1,9 +1,9 @@
-/* $NetBSD: msg_067.c,v 1.4 2021/07/13 22:01:34 rillig Exp $ */
+/* $NetBSD: msg_067.c,v 1.5 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_067.c"
// Test for message: cannot return incomplete type [67]
-/* expect+1: warning: struct incomplete never defined [233] */
+/* expect+1: warning: struct 'incomplete' never defined [233] */
struct incomplete;
struct incomplete function_declaration(void);
Index: src/tests/usr.bin/xlint/lint1/msg_067.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_067.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_067.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_067.exp:1.4 Tue Jul 13 22:01:34 2021
+++ src/tests/usr.bin/xlint/lint1/msg_067.exp Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
msg_067.c(14): error: cannot return incomplete type [67]
msg_067.c(16): error: 'r' has incomplete type 'incomplete struct incomplete' [31]
msg_067.c(19): error: cannot return incomplete type [212]
-msg_067.c(7): warning: struct incomplete never defined [233]
+msg_067.c(7): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_260.c
diff -u src/tests/usr.bin/xlint/lint1/msg_260.c:1.4 src/tests/usr.bin/xlint/lint1/msg_260.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_260.c:1.4 Mon Aug 16 06:49:57 2021
+++ src/tests/usr.bin/xlint/lint1/msg_260.c Sat Jun 11 11:52:13 2022
@@ -1,12 +1,12 @@
-/* $NetBSD: msg_260.c,v 1.4 2021/08/16 06:49:57 rillig Exp $ */
+/* $NetBSD: msg_260.c,v 1.5 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_260.c"
-// Test for message: previous declaration of %s [260]
+// Test for message: previous declaration of '%s' [260]
/* lint1-extra-flags: -r */
# 100 "header.h" 1
-/* expect+1: previous declaration of s [260] */
+/* expect+1: previous declaration of 's' [260] */
struct s {
int member;
};
@@ -14,7 +14,7 @@ struct s {
# 200 "header.h" 1
/* expect+2: error: struct tag 's' redeclared as union [46] */
-/* expect+1: previous declaration of s [260] */
+/* expect+1: previous declaration of 's' [260] */
union s {
int member;
};
Index: src/tests/usr.bin/xlint/lint1/msg_260.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_260.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_260.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_260.exp:1.4 Mon Aug 16 06:49:57 2021
+++ src/tests/usr.bin/xlint/lint1/msg_260.exp Sat Jun 11 11:52:13 2022
@@ -1,6 +1,6 @@
header.h(202): error: struct tag 's' redeclared as union [46]
included from msg_260.c(15)
-header.h(101): previous declaration of s [260]
+header.h(101): previous declaration of 's' [260]
included from msg_260.c(15)
msg_260.c(28): error: union tag 's' redeclared as union [46]
-header.h(202): previous declaration of s [260]
+header.h(202): previous declaration of 's' [260]
Index: src/tests/usr.bin/xlint/lint1/msg_348.c
diff -u src/tests/usr.bin/xlint/lint1/msg_348.c:1.4 src/tests/usr.bin/xlint/lint1/msg_348.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_348.c:1.4 Mon Nov 1 18:11:26 2021
+++ src/tests/usr.bin/xlint/lint1/msg_348.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_348.c,v 1.4 2021/11/01 18:11:26 rillig Exp $ */
+/* $NetBSD: msg_348.c,v 1.5 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_348.c"
// Test for message 348: maximum value %d of '%s' does not match maximum array index %d [348]
@@ -8,8 +8,8 @@
enum color {
red,
green,
- /* expect+2: previous declaration of blue [260] */
- /* expect+1: previous declaration of blue [260] */
+ /* expect+2: previous declaration of 'blue' [260] */
+ /* expect+1: previous declaration of 'blue' [260] */
blue
};
Index: src/tests/usr.bin/xlint/lint1/msg_348.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_348.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_348.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_348.exp:1.4 Mon Nov 1 18:11:26 2021
+++ src/tests/usr.bin/xlint/lint1/msg_348.exp Sat Jun 11 11:52:13 2022
@@ -1,6 +1,6 @@
msg_348.c(36): warning: maximum value 2 of 'enum color' does not match maximum array index 1 [348]
-msg_348.c(13): previous declaration of blue [260]
+msg_348.c(13): previous declaration of 'blue' [260]
msg_348.c(49): warning: maximum value 2 of 'enum color' does not match maximum array index 3 [348]
-msg_348.c(13): previous declaration of blue [260]
+msg_348.c(13): previous declaration of 'blue' [260]
msg_348.c(107): warning: integral constant too large [56]
msg_348.c(109): warning: integral constant too large [56]
Index: src/tests/usr.bin/xlint/lint1/init.c
diff -u src/tests/usr.bin/xlint/lint1/init.c:1.10 src/tests/usr.bin/xlint/lint1/init.c:1.11
--- src/tests/usr.bin/xlint/lint1/init.c:1.10 Wed Dec 22 00:45:53 2021
+++ src/tests/usr.bin/xlint/lint1/init.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.10 2021/12/22 00:45:53 rillig Exp $ */
+/* $NetBSD: init.c,v 1.11 2022/06/11 11:52:13 rillig Exp $ */
# 3 "init.c"
/*
@@ -111,7 +111,7 @@ union incomplete_union {
/* expect+1: warning: cannot initialize extern declaration: extern_var [26] */
extern int extern_var = 1;
int defined_var = 1;
-/* expect+1: warning: static variable static_var unused [226] */
+/* expect+1: warning: static variable 'static_var' unused [226] */
static int static_var = 1;
/* expect+1: error: illegal storage class [8] */
register int register_var = 1;
Index: src/tests/usr.bin/xlint/lint1/init.exp
diff -u src/tests/usr.bin/xlint/lint1/init.exp:1.10 src/tests/usr.bin/xlint/lint1/init.exp:1.11
--- src/tests/usr.bin/xlint/lint1/init.exp:1.10 Wed Dec 22 00:45:53 2021
+++ src/tests/usr.bin/xlint/lint1/init.exp Sat Jun 11 11:52:13 2022
@@ -10,4 +10,4 @@ init.c(104): error: 'u2' has incomplete
init.c(112): warning: cannot initialize extern declaration: extern_var [26]
init.c(117): error: illegal storage class [8]
init.c(119): error: cannot initialize typedef: typedef_var [25]
-init.c(115): warning: static variable static_var unused [226]
+init.c(115): warning: static variable 'static_var' unused [226]
Index: src/tests/usr.bin/xlint/lint1/msg_001.c
diff -u src/tests/usr.bin/xlint/lint1/msg_001.c:1.6 src/tests/usr.bin/xlint/lint1/msg_001.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_001.c:1.6 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/msg_001.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_001.c,v 1.6 2022/04/24 20:08:23 rillig Exp $ */
+/* $NetBSD: msg_001.c,v 1.7 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_001.c"
// Test for message: old style declaration; add 'int' [1]
@@ -9,10 +9,10 @@ old_style = 1;
int new_style = 1;
/* expect+2: error: old style declaration; add 'int' [1] */
-/* expect+1: warning: static variable static_old_style unused [226] */
+/* expect+1: warning: static variable 'static_old_style' unused [226] */
static static_old_style = 1;
-/* expect+1: warning: static variable static_new_style unused [226] */
+/* expect+1: warning: static variable 'static_new_style' unused [226] */
static int static_new_style = 1;
/* expect+2: error: old style declaration; add 'int' [1] */
@@ -21,7 +21,7 @@ extern_implicit_int(void)
}
/* expect+4: error: old style declaration; add 'int' [1] */
-/* expect+2: warning: static function static_implicit_int unused [236] */
+/* expect+2: warning: static function 'static_implicit_int' unused [236] */
static
static_implicit_int(void)
{
Index: src/tests/usr.bin/xlint/lint1/msg_031.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_031.exp:1.6 src/tests/usr.bin/xlint/lint1/msg_031.exp:1.7
--- src/tests/usr.bin/xlint/lint1/msg_031.exp:1.6 Tue Jul 13 22:01:34 2021
+++ src/tests/usr.bin/xlint/lint1/msg_031.exp Sat Jun 11 11:52:13 2022
@@ -1,3 +1,3 @@
msg_031.c(20): error: '<unnamed>' has incomplete type 'incomplete struct incomplete' [31]
-msg_031.c(10): warning: struct incomplete never defined [233]
+msg_031.c(10): warning: struct 'incomplete' never defined [233]
msg_031.c(16): error: 'incomplete_var' has incomplete type 'incomplete struct incomplete' [31]
Index: src/tests/usr.bin/xlint/lint1/msg_001.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_001.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_001.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_001.exp:1.5 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/msg_001.exp Sat Jun 11 11:52:13 2022
@@ -2,6 +2,6 @@ msg_001.c(7): warning: old style declara
msg_001.c(13): error: old style declaration; add 'int' [1]
msg_001.c(20): error: old style declaration; add 'int' [1]
msg_001.c(27): error: old style declaration; add 'int' [1]
-msg_001.c(13): warning: static variable static_old_style unused [226]
-msg_001.c(16): warning: static variable static_new_style unused [226]
-msg_001.c(26): warning: static function static_implicit_int unused [236]
+msg_001.c(13): warning: static variable 'static_old_style' unused [226]
+msg_001.c(16): warning: static variable 'static_new_style' unused [226]
+msg_001.c(26): warning: static function 'static_implicit_int' unused [236]
Index: src/tests/usr.bin/xlint/lint1/msg_019.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_019.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_019.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_019.exp:1.5 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_019.exp Sat Jun 11 11:52:13 2022
@@ -3,4 +3,4 @@ msg_019.c(8): error: void type for 'unit
msg_019.c(11): error: void parameter cannot have name: parameter [61]
msg_019.c(13): error: void type for 'local_variable' [19]
msg_019.c(11): warning: argument 'parameter' unused in function 'function' [231]
-msg_019.c(8): warning: static variable unit_variable unused [226]
+msg_019.c(8): warning: static variable 'unit_variable' unused [226]
Index: src/tests/usr.bin/xlint/lint1/msg_152.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_152.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_152.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_152.exp:1.5 Tue Jul 13 22:01:34 2021
+++ src/tests/usr.bin/xlint/lint1/msg_152.exp Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
msg_152.c(8): error: '<unnamed>' has incomplete type 'incomplete struct incomplete' [31]
msg_152.c(13): error: 'local_var' has incomplete type 'incomplete struct incomplete' [31]
msg_152.c(14): error: argument cannot have unknown size, arg #1 [152]
-msg_152.c(6): warning: struct incomplete never defined [233]
+msg_152.c(6): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_135.c
diff -u src/tests/usr.bin/xlint/lint1/msg_135.c:1.9 src/tests/usr.bin/xlint/lint1/msg_135.c:1.10
--- src/tests/usr.bin/xlint/lint1/msg_135.c:1.9 Thu Jul 15 21:22:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_135.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_135.c,v 1.9 2021/07/15 21:22:19 rillig Exp $ */
+/* $NetBSD: msg_135.c,v 1.10 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_135.c"
// Test for message: converting '%s' to '%s' may cause alignment problem [135]
@@ -18,7 +18,8 @@ read_uint(const unsigned short **pp)
return val;
}
-struct incomplete; /* expect: never defined */
+/* expect+1: warning: struct 'incomplete' never defined [233] */
+struct incomplete;
struct complete {
int member;
Index: src/tests/usr.bin/xlint/lint1/msg_135.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_135.exp:1.7 src/tests/usr.bin/xlint/lint1/msg_135.exp:1.8
--- src/tests/usr.bin/xlint/lint1/msg_135.exp:1.7 Thu Jul 15 21:22:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_135.exp Sat Jun 11 11:52:13 2022
@@ -1,2 +1,2 @@
msg_135.c(16): warning: converting 'pointer to const unsigned short' to 'pointer to const unsigned int' may cause alignment problem [135]
-msg_135.c(21): warning: struct incomplete never defined [233]
+msg_135.c(22): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_175.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_175.exp:1.8 src/tests/usr.bin/xlint/lint1/msg_175.exp:1.9
--- src/tests/usr.bin/xlint/lint1/msg_175.exp:1.8 Tue Jul 13 22:01:34 2021
+++ src/tests/usr.bin/xlint/lint1/msg_175.exp Sat Jun 11 11:52:13 2022
@@ -1,3 +1,3 @@
msg_175.c(8): error: initialization of incomplete type 'incomplete struct incomplete' [175]
msg_175.c(10): error: 'incomplete' has incomplete type 'incomplete struct incomplete' [31]
-msg_175.c(6): warning: struct incomplete never defined [233]
+msg_175.c(6): warning: struct 'incomplete' never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_247.c
diff -u src/tests/usr.bin/xlint/lint1/msg_247.c:1.16 src/tests/usr.bin/xlint/lint1/msg_247.c:1.17
--- src/tests/usr.bin/xlint/lint1/msg_247.c:1.16 Thu Jul 15 21:22:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_247.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_247.c,v 1.16 2021/07/15 21:22:19 rillig Exp $ */
+/* $NetBSD: msg_247.c,v 1.17 2022/06/11 11:52:13 rillig Exp $ */
# 3 "msg_247.c"
// Test for message: pointer cast from '%s' to '%s' may be troublesome [247]
@@ -131,7 +131,8 @@ counter_increment(struct counter *counte
* warnings about possibly troublesome pointer casts.
*/
-struct lhash_st; /* expect: struct lhash_st never defined */
+/* expect+1: warning: struct 'lhash_st' never defined [233] */
+struct lhash_st;
struct lhash_st *OPENSSL_LH_new(void);
@@ -153,7 +154,7 @@ lh_OPENSSL_STRING_new(void)
*/
return (struct lhash_st_OPENSSL_STRING *)OPENSSL_LH_new();
}
-# 157 "msg_247.c" 2
+# 158 "msg_247.c" 2
void sink(const void *);
Index: src/tests/usr.bin/xlint/lint1/msg_247.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_247.exp:1.12 src/tests/usr.bin/xlint/lint1/msg_247.exp:1.13
--- src/tests/usr.bin/xlint/lint1/msg_247.exp:1.12 Thu Jul 15 21:22:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_247.exp Sat Jun 11 11:52:13 2022
@@ -1,3 +1,3 @@
msg_247.c(31): warning: pointer cast from 'pointer to struct Other' to 'pointer to struct <unnamed>' may be troublesome [247]
msg_247.c(70): warning: pointer cast from 'pointer to struct Other' to 'pointer to signed char' may be troublesome [247]
-msg_247.c(134): warning: struct lhash_st never defined [233]
+msg_247.c(135): warning: struct 'lhash_st' never defined [233]
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.283 src/usr.bin/xlint/lint1/decl.c:1.284
--- src/usr.bin/xlint/lint1/decl.c:1.283 Tue May 31 00:35:18 2022
+++ src/usr.bin/xlint/lint1/decl.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.283 2022/05/31 00:35:18 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.284 2022/06/11 11:52:13 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.283 2022/05/31 00:35:18 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.284 2022/06/11 11:52:13 rillig Exp $");
#endif
#include <sys/param.h>
@@ -1973,7 +1973,7 @@ declare_extern(sym_t *dsym, bool initflg
if (dsym->s_type->t_tspec == FUNC) {
dsym->s_inline = true;
} else {
- /* variable declared inline: %s */
+ /* variable '%s' declared inline */
warning(268, dsym->s_name);
}
}
@@ -2489,7 +2489,7 @@ declare_argument(sym_t *sym, bool initfl
}
if (dcs->d_inline)
- /* argument declared inline: %s */
+ /* argument '%s' declared inline */
warning(269, sym->s_name);
/*
@@ -2777,7 +2777,7 @@ declare_local(sym_t *dsym, bool initflg)
if (dsym->s_type->t_tspec == FUNC) {
dsym->s_inline = true;
} else {
- /* variable declared inline: %s */
+ /* variable '%s' declared inline */
warning(268, dsym->s_name);
}
}
@@ -3199,15 +3199,15 @@ check_tag_usage(sym_t *sym)
switch (sym->s_type->t_tspec) {
case STRUCT:
- /* struct %s never defined */
+ /* struct '%s' never defined */
warning_at(233, &sym->s_def_pos, sym->s_name);
break;
case UNION:
- /* union %s never defined */
+ /* union '%s' never defined */
warning_at(234, &sym->s_def_pos, sym->s_name);
break;
case ENUM:
- /* enum %s never defined */
+ /* enum '%s' never defined */
warning_at(235, &sym->s_def_pos, sym->s_name);
break;
default:
@@ -3250,17 +3250,17 @@ check_unused_static_global_variable(cons
if (sym->s_type->t_tspec == FUNC) {
if (sym->s_def == DEF) {
if (!sym->s_inline)
- /* static function %s unused */
+ /* static function '%s' unused */
warning_at(236, &sym->s_def_pos, sym->s_name);
} else {
/* static function %s declared but not defined */
warning_at(290, &sym->s_def_pos, sym->s_name);
}
} else if (!sym->s_set) {
- /* static variable %s unused */
+ /* static variable '%s' unused */
warning_at(226, &sym->s_def_pos, sym->s_name);
} else {
- /* static variable %s set but not used */
+ /* static variable '%s' set but not used */
warning_at(307, &sym->s_def_pos, sym->s_name);
}
}
@@ -3351,10 +3351,10 @@ print_previous_declaration(int msg, cons
if (msg != -1) {
(message_at)(msg, &psym->s_def_pos);
} else if (psym->s_def == DEF || psym->s_def == TDEF) {
- /* previous definition of %s */
+ /* previous definition of '%s' */
message_at(261, &psym->s_def_pos, psym->s_name);
} else {
- /* previous declaration of %s */
+ /* previous declaration of '%s' */
message_at(260, &psym->s_def_pos, psym->s_name);
}
}
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.167 src/usr.bin/xlint/lint1/err.c:1.168
--- src/usr.bin/xlint/lint1/err.c:1.167 Tue May 31 00:01:35 2022
+++ src/usr.bin/xlint/lint1/err.c Sat Jun 11 11:52:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.167 2022/05/31 00:01:35 rillig Exp $ */
+/* $NetBSD: err.c,v 1.168 2022/06/11 11:52:13 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.167 2022/05/31 00:01:35 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.168 2022/06/11 11:52:13 rillig Exp $");
#endif
#include <sys/types.h>
@@ -280,17 +280,17 @@ const char *const msgs[] = {
"end-of-loop code not reached", /* 223 */
"cannot recover from previous errors", /* 224 */
"static function called but not defined: %s()", /* 225 */
- "static variable %s unused", /* 226 */
+ "static variable '%s' unused", /* 226 */
"const object %s should have initializer", /* 227 */
"function cannot return const or volatile object", /* 228 */
"converting '%s' to '%s' is questionable", /* 229 */
"nonportable character comparison '%s %d'", /* 230 */
"argument '%s' unused in function '%s'", /* 231 */
"label '%s' unused in function '%s'", /* 232 */
- "struct %s never defined", /* 233 */
- "union %s never defined", /* 234 */
- "enum %s never defined", /* 235 */
- "static function %s unused", /* 236 */
+ "struct '%s' never defined", /* 233 */
+ "union '%s' never defined", /* 234 */
+ "enum '%s' never defined", /* 235 */
+ "static function '%s' unused", /* 236 */
"redeclaration of formal parameter %s", /* 237 */
"initialization of union is illegal in traditional C", /* 238 */
"constant argument to '!'", /* 239 */
@@ -314,16 +314,16 @@ const char *const msgs[] = {
"extra characters in lint comment", /* 257 */
"unterminated string constant", /* 258 */
"argument #%d is converted from '%s' to '%s' due to prototype", /* 259 */
- "previous declaration of %s", /* 260 */
- "previous definition of %s", /* 261 */
+ "previous declaration of '%s'", /* 260 */
+ "previous definition of '%s'", /* 261 */
"\\\" inside character constants undefined in traditional C", /* 262 */
"\\? undefined in traditional C", /* 263 */
"\\v undefined in traditional C", /* 264 */
"%s does not support 'long long'", /* 265 */
"'long double' is illegal in traditional C", /* 266 */
"shift equal to size of object", /* 267 */
- "variable declared inline: %s", /* 268 */
- "argument declared inline: %s", /* 269 */
+ "variable '%s' declared inline", /* 268 */
+ "argument '%s' declared inline", /* 269 */
"function prototypes are illegal in traditional C", /* 270 */
"switch expression must be of type 'int' in traditional C", /* 271 */
"empty translation unit", /* 272 */
@@ -361,14 +361,14 @@ const char *const msgs[] = {
"ANSI C forbids conversion of %s to %s, arg #%d", /* 304 */
"ANSI C forbids conversion of %s to %s, op %s", /* 305 */
"constant truncated by conversion, op %s", /* 306 */
- "static variable %s set but not used", /* 307 */
+ "static variable '%s' set but not used", /* 307 */
"invalid type for _Complex", /* 308 */
"extra bits set to 0 in conversion of '%s' to '%s', op '%s'", /* 309 */
"symbol renaming can't be used on function arguments", /* 310 */
"symbol renaming can't be used on automatic variables", /* 311 */
"%s does not support // comments", /* 312 */
"struct or union member name in initializer is a C99 feature",/* 313 */
- "%s is not a structure or a union", /* 314 */
+ "", /* never used */ /* 314 */
"GCC style struct or union member name in initializer", /* 315 */
"__FUNCTION__/__PRETTY_FUNCTION__ is a GCC extension", /* 316 */
"__func__ is a C99 feature", /* 317 */
