Module Name: src
Committed By: rillig
Date: Mon Jun 20 21:13:36 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: d_decl_old_style_arguments.c decl_arg.c
msg_019.c msg_021.c msg_032.c msg_039.c msg_043.c msg_044.c
msg_045.c msg_047.c msg_048.c msg_050.c msg_052.c msg_053.c
msg_057.c msg_058.c msg_059.c msg_061.c msg_086.c msg_087.c
msg_088.c msg_091.c msg_100.c
src/usr.bin/xlint/lint1: cgram.y decl.c err.c func.c
Log Message:
lint: add quotes around several placeholders in messages
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c \
src/tests/usr.bin/xlint/lint1/msg_032.c \
src/tests/usr.bin/xlint/lint1/msg_044.c \
src/tests/usr.bin/xlint/lint1/msg_047.c \
src/tests/usr.bin/xlint/lint1/msg_050.c \
src/tests/usr.bin/xlint/lint1/msg_053.c \
src/tests/usr.bin/xlint/lint1/msg_061.c \
src/tests/usr.bin/xlint/lint1/msg_086.c \
src/tests/usr.bin/xlint/lint1/msg_087.c \
src/tests/usr.bin/xlint/lint1/msg_088.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/decl_arg.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_019.c \
src/tests/usr.bin/xlint/lint1/msg_045.c \
src/tests/usr.bin/xlint/lint1/msg_048.c \
src/tests/usr.bin/xlint/lint1/msg_057.c \
src/tests/usr.bin/xlint/lint1/msg_100.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_021.c \
src/tests/usr.bin/xlint/lint1/msg_039.c \
src/tests/usr.bin/xlint/lint1/msg_043.c \
src/tests/usr.bin/xlint/lint1/msg_052.c \
src/tests/usr.bin/xlint/lint1/msg_058.c \
src/tests/usr.bin/xlint/lint1/msg_059.c \
src/tests/usr.bin/xlint/lint1/msg_091.c
cvs rdiff -u -r1.419 -r1.420 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.289 -r1.290 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.140 -r1.141 src/usr.bin/xlint/lint1/func.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/d_decl_old_style_arguments.c
diff -u src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.4 src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.5
--- src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.4 Sat Jan 15 14:22:03 2022
+++ src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c Mon Jun 20 21:13:36 2022
@@ -16,6 +16,6 @@ void func(num, ptr, dbl, def)
char *ptr;
double dbl;
{
- /* expect-1: warning: argument type defaults to 'int': def [32] */
+ /* expect-1: warning: type of argument 'def' defaults to 'int' [32] */
/* expect-2: error: parameter mismatch: 3 declared, 4 defined [51] */
}
Index: src/tests/usr.bin/xlint/lint1/msg_032.c
diff -u src/tests/usr.bin/xlint/lint1/msg_032.c:1.4 src/tests/usr.bin/xlint/lint1/msg_032.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_032.c:1.4 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/msg_032.c Mon Jun 20 21:13:36 2022
@@ -1,13 +1,13 @@
-/* $NetBSD: msg_032.c,v 1.4 2022/04/24 20:08:23 rillig Exp $ */
+/* $NetBSD: msg_032.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_032.c"
-// Test for message: argument type defaults to 'int': %s [32]
+// Test for message: type of argument '%s' defaults to 'int' [32]
/* expect+5: error: old style declaration; add 'int' [1] */
add(a, b, c)
-/* expect+3: warning: argument type defaults to 'int': a [32] */
-/* expect+2: warning: argument type defaults to 'int': b [32] */
-/* expect+1: warning: argument type defaults to 'int': c [32] */
+/* expect+3: warning: type of argument 'a' defaults to 'int' [32] */
+/* expect+2: warning: type of argument 'b' defaults to 'int' [32] */
+/* expect+1: warning: type of argument 'c' defaults to 'int' [32] */
{
return a + b + c;
}
Index: src/tests/usr.bin/xlint/lint1/msg_044.c
diff -u src/tests/usr.bin/xlint/lint1/msg_044.c:1.4 src/tests/usr.bin/xlint/lint1/msg_044.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_044.c:1.4 Sat Jun 11 11:52:13 2022
+++ src/tests/usr.bin/xlint/lint1/msg_044.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_044.c,v 1.4 2022/06/11 11:52:13 rillig Exp $ */
+/* $NetBSD: msg_044.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_044.c"
-// Test for message: declaration introduces new type in ANSI C: %s %s [44]
+// Test for message: declaration of '%s %s' introduces new type in ANSI C [44]
/* expect+1: warning: struct 'tag' never defined [233] */
struct tag;
@@ -9,7 +9,7 @@ struct tag;
void declaration(struct tag *);
void definition(void) {
- /* expect+2: warning: declaration introduces new type in ANSI C: struct tag [44] */
+ /* expect+2: warning: declaration of 'struct tag' introduces new type in ANSI C [44] */
/* expect+1: warning: struct 'tag' never defined [233] */
struct tag;
}
Index: src/tests/usr.bin/xlint/lint1/msg_047.c
diff -u src/tests/usr.bin/xlint/lint1/msg_047.c:1.4 src/tests/usr.bin/xlint/lint1/msg_047.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_047.c:1.4 Sun Feb 27 12:00:27 2022
+++ src/tests/usr.bin/xlint/lint1/msg_047.c Mon Jun 20 21:13:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_047.c,v 1.4 2022/02/27 12:00:27 rillig Exp $ */
+/* $NetBSD: msg_047.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_047.c"
/* Test for message: zero sized %s is a C99 feature [47] */
@@ -12,7 +12,7 @@ struct empty {
struct zero_sized {
/* expect+2: error: zero sized array is a C99 extension [322] */
- /* expect+1: error: zero sized array in struct is a C99 extension: dummy [39] */
+ /* expect+1: error: zero-sized array 'dummy' in struct is a C99 extension [39] */
char dummy[0];
};
/* expect-1: error: zero sized struct is a C99 feature [47] */
Index: src/tests/usr.bin/xlint/lint1/msg_050.c
diff -u src/tests/usr.bin/xlint/lint1/msg_050.c:1.4 src/tests/usr.bin/xlint/lint1/msg_050.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_050.c:1.4 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_050.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_050.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_050.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_050.c"
-/* Test for message: a function is declared as an argument: %s [50] */
+/* Test for message: argument '%s' has function type, should be pointer [50] */
/* lint1-flags: -Stw */
@@ -9,7 +9,7 @@ typedef void (function)();
/* expect+1: warning: argument 'f' unused in function 'example' [231] */
void example(f)
- /* expect+1: warning: a function is declared as an argument: f [50] */
+ /* expect+1: warning: argument 'f' has function type, should be pointer [50] */
function f;
{
}
Index: src/tests/usr.bin/xlint/lint1/msg_053.c
diff -u src/tests/usr.bin/xlint/lint1/msg_053.c:1.4 src/tests/usr.bin/xlint/lint1/msg_053.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_053.c:1.4 Sun Apr 24 20:08:23 2022
+++ src/tests/usr.bin/xlint/lint1/msg_053.c Mon Jun 20 21:13:36 2022
@@ -1,12 +1,12 @@
-/* $NetBSD: msg_053.c,v 1.4 2022/04/24 20:08:23 rillig Exp $ */
+/* $NetBSD: msg_053.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_053.c"
-// Test for message: declared argument %s is missing [53]
+// Test for message: declared argument '%s' is missing [53]
/* expect+2: error: old style declaration; add 'int' [1] */
oldstyle(argument)
int argument;
- /* expect+1: error: declared argument extra_argument is missing [53] */
+ /* expect+1: error: declared argument 'extra_argument' is missing [53] */
int extra_argument;
{
return argument;
Index: src/tests/usr.bin/xlint/lint1/msg_061.c
diff -u src/tests/usr.bin/xlint/lint1/msg_061.c:1.4 src/tests/usr.bin/xlint/lint1/msg_061.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_061.c:1.4 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_061.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_061.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_061.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_061.c"
-// Test for message: void parameter cannot have name: %s [61]
+// Test for message: void parameter '%s' cannot have name [61]
-/* expect+1: error: void parameter cannot have name: arg [61] */
+/* expect+1: error: void parameter 'arg' cannot have name [61] */
void example(void arg);
Index: src/tests/usr.bin/xlint/lint1/msg_086.c
diff -u src/tests/usr.bin/xlint/lint1/msg_086.c:1.4 src/tests/usr.bin/xlint/lint1/msg_086.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_086.c:1.4 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_086.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_086.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_086.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_086.c"
-// Test for message: automatic hides external declaration: %s [86]
+// Test for message: automatic '%s' hides external declaration [86]
/* lint1-flags: -S -g -h -w */
@@ -10,7 +10,7 @@ extern int identifier;
int
local_auto(void)
{
- /* expect+1: warning: automatic hides external declaration: identifier [86] */
+ /* expect+1: warning: automatic 'identifier' hides external declaration [86] */
int identifier = 3;
return identifier;
}
Index: src/tests/usr.bin/xlint/lint1/msg_087.c
diff -u src/tests/usr.bin/xlint/lint1/msg_087.c:1.4 src/tests/usr.bin/xlint/lint1/msg_087.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_087.c:1.4 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_087.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_087.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_087.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_087.c"
-// Test for message: static hides external declaration: %s [87]
+// Test for message: static '%s' hides external declaration [87]
/* lint1-flags: -g -h -S -w */
@@ -10,7 +10,7 @@ extern int counter;
int
count(void)
{
- /* expect+1: warning: static hides external declaration: counter [87] */
+ /* expect+1: warning: static 'counter' hides external declaration [87] */
static int counter;
return counter++;
}
Index: src/tests/usr.bin/xlint/lint1/msg_088.c
diff -u src/tests/usr.bin/xlint/lint1/msg_088.c:1.4 src/tests/usr.bin/xlint/lint1/msg_088.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_088.c:1.4 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_088.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_088.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_088.c,v 1.5 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_088.c"
-// Test for message: typedef hides external declaration: %s [88]
+// Test for message: typedef '%s' hides external declaration [88]
/* lint1-flags: -g -h -S -w */
@@ -10,6 +10,6 @@ extern int identifier;
void
func(void)
{
- /* expect+1: warning: typedef hides external declaration: identifier [88] */
+ /* expect+1: warning: typedef 'identifier' hides external declaration [88] */
typedef double identifier;
}
Index: src/tests/usr.bin/xlint/lint1/decl_arg.c
diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.6 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.7
--- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.6 Sun Jul 25 06:04:40 2021
+++ src/tests/usr.bin/xlint/lint1/decl_arg.c Mon Jun 20 21:13:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_arg.c,v 1.6 2021/07/25 06:04:40 rillig Exp $ */
+/* $NetBSD: decl_arg.c,v 1.7 2022/06/20 21:13:36 rillig Exp $ */
# 3 "decl_arg.c"
/*
@@ -35,16 +35,16 @@ static;
static "error";
/* expect+1: warning: empty declaration [2] */
const;
-/* expect+1: error: declared argument undeclared is missing [53] */
+/* expect+1: error: declared argument 'undeclared' is missing [53] */
const undeclared;
-/* expect+2: error: declared argument undeclared_initialized is missing [53] */
-/* expect+1: error: cannot initialize parameter: undeclared_initialized [52] */
+/* expect+2: error: declared argument 'undeclared_initialized' is missing [53] */
+/* expect+1: error: cannot initialize parameter 'undeclared_initialized' [52] */
const undeclared_initialized = 12345;
/* expect+1: warning: empty declaration [2] */
int;
/* expect+1: warning: 'struct arg_struct' declared in argument declaration list [3] */
struct arg_struct { int member; };
-/* expect+1: error: cannot initialize parameter: an_int [52] */
+/* expect+1: error: cannot initialize parameter 'an_int' [52] */
int an_int = 12345;
const int a_const_int;
number a_number;
@@ -61,27 +61,27 @@ struct a_struct { int member; } a_struct
extern int
cover_notype_direct_decl(arg)
int arg;
-/* expect+1: error: declared argument name is missing [53] */
+/* expect+1: error: declared argument 'name' is missing [53] */
const name;
-/* expect+1: error: declared argument parenthesized_name is missing [53] */
+/* expect+1: error: declared argument 'parenthesized_name' is missing [53] */
const (parenthesized_name);
-/* expect+1: error: declared argument array is missing [53] */
+/* expect+1: error: declared argument 'array' is missing [53] */
const array[];
-/* expect+1: error: declared argument array_size is missing [53] */
+/* expect+1: error: declared argument 'array_size' is missing [53] */
const array_size[1+1+1];
-/* expect+2: error: declared argument multi_array is missing [53] */
+/* expect+2: error: declared argument 'multi_array' is missing [53] */
/* expect+1: error: null dimension [17] */
const multi_array[][][][][][];
-/* expect+1: error: declared argument function is missing [53] */
+/* expect+1: error: declared argument 'function' is missing [53] */
const function(void);
-/* expect+1: error: declared argument prefix_attribute is missing [53] */
+/* expect+1: error: declared argument 'prefix_attribute' is missing [53] */
const __attribute__((deprecated)) prefix_attribute;
-/* expect+1: error: declared argument postfix_attribute is missing [53] */
+/* expect+1: error: declared argument 'postfix_attribute' is missing [53] */
const postfix_attribute __attribute__((deprecated));
-/* expect+1: error: declared argument infix_attribute is missing [53] */
+/* expect+1: error: declared argument 'infix_attribute' is missing [53] */
const __attribute__((deprecated)) infix_attribute __attribute__((deprecated));
/* The __attribute__ before the '*' is consumed by some other grammar rule. */
-/* expect+7: error: declared argument pointer_prefix_attribute is missing [53] */
+/* expect+7: error: declared argument 'pointer_prefix_attribute' is missing [53] */
const
__attribute__((deprecated))
*
Index: src/tests/usr.bin/xlint/lint1/msg_019.c
diff -u src/tests/usr.bin/xlint/lint1/msg_019.c:1.5 src/tests/usr.bin/xlint/lint1/msg_019.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_019.c:1.5 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_019.c Mon Jun 20 21:13:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_019.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_019.c,v 1.6 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_019.c"
// Test for message: void type for '%s' [19]
@@ -11,7 +11,7 @@ void global_variable;
static void unit_variable;
/* expect+3: warning: argument 'parameter' unused in function 'function' [231] */
-/* expect+2: error: void parameter cannot have name: parameter [61] */
+/* expect+2: error: void parameter 'parameter' cannot have name [61] */
void
function(void parameter)
{
Index: src/tests/usr.bin/xlint/lint1/msg_045.c
diff -u src/tests/usr.bin/xlint/lint1/msg_045.c:1.5 src/tests/usr.bin/xlint/lint1/msg_045.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_045.c:1.5 Sun Jun 19 12:14:34 2022
+++ src/tests/usr.bin/xlint/lint1/msg_045.c Mon Jun 20 21:13:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_045.c,v 1.5 2022/06/19 12:14:34 rillig Exp $ */
+/* $NetBSD: msg_045.c,v 1.6 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_045.c"
/* Test for message: base type is really '%s %s' [45] */
@@ -12,7 +12,7 @@ struct counter {
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+3: warning: declaration of 'union counter' introduces new type in ANSI C [44] */
/* expect+2: error: 'counter' has incomplete type 'incomplete union counter' [31] */
/* expect+1: warning: union 'counter' never defined [234] */
union counter counter;
Index: src/tests/usr.bin/xlint/lint1/msg_048.c
diff -u src/tests/usr.bin/xlint/lint1/msg_048.c:1.5 src/tests/usr.bin/xlint/lint1/msg_048.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_048.c:1.5 Fri Jun 17 18:54:53 2022
+++ src/tests/usr.bin/xlint/lint1/msg_048.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_048.c,v 1.5 2022/06/17 18:54:53 rillig Exp $ */
+/* $NetBSD: msg_048.c,v 1.6 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_048.c"
-// Test for message: overflow in enumeration values: %s [48]
+// Test for message: enumeration value '%s' overflows [48]
/*
* Before decl.c 1.269 from 2022-04-08, the comparison for enum constant
@@ -16,7 +16,7 @@ enum int_limits {
MAX_MINUS_2 = 0x7ffffffd,
MAX_MINUS_1,
MAX,
- /* expect+1: warning: overflow in enumeration values: MIN [48] */
+ /* expect+1: warning: enumeration value 'MIN' overflows [48] */
MIN,
MIN_PLUS_1
};
Index: src/tests/usr.bin/xlint/lint1/msg_057.c
diff -u src/tests/usr.bin/xlint/lint1/msg_057.c:1.5 src/tests/usr.bin/xlint/lint1/msg_057.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_057.c:1.5 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_057.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_057.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_057.c,v 1.6 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_057.c"
-// Test for message: enumeration constant hides parameter: %s [57]
+// Test for message: enumeration constant '%s' hides parameter [57]
long
/* expect+3: warning: argument 'red' unused in function 'rgb' [231] */
@@ -10,11 +10,11 @@ long
rgb(int red, int green, int blue)
{
enum color {
- /* expect+2: warning: enumeration constant hides parameter: red [57] */
- /* expect+1: warning: enumeration constant hides parameter: green [57] */
+ /* expect+2: warning: enumeration constant 'red' hides parameter [57] */
+ /* expect+1: warning: enumeration constant 'green' hides parameter [57] */
red, green, blue
};
- /* expect-1: warning: enumeration constant hides parameter: blue [57] */
+ /* expect-1: warning: enumeration constant 'blue' hides parameter [57] */
/*
* The warning for 'blue' is at the semicolon since the parser has
* already advanced that far, checking for an optional initializer.
Index: src/tests/usr.bin/xlint/lint1/msg_100.c
diff -u src/tests/usr.bin/xlint/lint1/msg_100.c:1.5 src/tests/usr.bin/xlint/lint1/msg_100.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_100.c:1.5 Wed Jun 15 20:18:31 2022
+++ src/tests/usr.bin/xlint/lint1/msg_100.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_100.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
+/* $NetBSD: msg_100.c,v 1.6 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_100.c"
-/* Test for message: unary + is illegal in traditional C [100] */
+/* Test for message: unary '+' is illegal in traditional C [100] */
/* lint1-flags: -tw */
@@ -9,6 +9,6 @@ int
unary_plus(x)
int x;
{
- /* expect+1: warning: unary + is illegal in traditional C [100] */
+ /* expect+1: warning: unary '+' is illegal in traditional C [100] */
return +x;
}
Index: src/tests/usr.bin/xlint/lint1/msg_021.c
diff -u src/tests/usr.bin/xlint/lint1/msg_021.c:1.3 src/tests/usr.bin/xlint/lint1/msg_021.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_021.c:1.3 Sat Jun 11 12:24:00 2022
+++ src/tests/usr.bin/xlint/lint1/msg_021.c Mon Jun 20 21:13:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_021.c,v 1.3 2022/06/11 12:24:00 rillig Exp $ */
+/* $NetBSD: msg_021.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_021.c"
// Test for message: redeclaration of formal parameter '%s' [21]
@@ -11,7 +11,7 @@ void
old_style_with_duplicate_parameter(parameter, parameter)
int parameter;
{
- /* expect-1: warning: argument type defaults to 'int': parameter [32] */
+ /* expect-1: warning: type of argument 'parameter' defaults to 'int' [32] */
}
void
Index: src/tests/usr.bin/xlint/lint1/msg_039.c
diff -u src/tests/usr.bin/xlint/lint1/msg_039.c:1.3 src/tests/usr.bin/xlint/lint1/msg_039.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_039.c:1.3 Tue Apr 5 23:09:19 2022
+++ src/tests/usr.bin/xlint/lint1/msg_039.c Mon Jun 20 21:13:36 2022
@@ -1,13 +1,13 @@
-/* $NetBSD: msg_039.c,v 1.3 2022/04/05 23:09:19 rillig Exp $ */
+/* $NetBSD: msg_039.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_039.c"
-/* Test for message: zero sized array in struct is a C99 extension: %s [39] */
+/* Test for message: zero-sized array '%s' in struct is a C99 extension [39] */
/* lint1-flags: -w */
struct s {
/* expect+2: warning: zero sized array is a C99 extension [322] */
- /* expect+1: warning: zero sized array in struct is a C99 extension: member [39] */
+ /* expect+1: warning: zero-sized array 'member' in struct is a C99 extension [39] */
char member[0];
char member2;
};
Index: src/tests/usr.bin/xlint/lint1/msg_043.c
diff -u src/tests/usr.bin/xlint/lint1/msg_043.c:1.3 src/tests/usr.bin/xlint/lint1/msg_043.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_043.c:1.3 Fri Apr 8 21:29:29 2022
+++ src/tests/usr.bin/xlint/lint1/msg_043.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_043.c,v 1.3 2022/04/08 21:29:29 rillig Exp $ */
+/* $NetBSD: msg_043.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_043.c"
-/* Test for message: redefinition hides earlier one: %s [43] */
+/* Test for message: redefinition of '%s' hides earlier one [43] */
/* lint1-extra-flags: -h */
@@ -12,7 +12,7 @@ struct s {
void
example(void)
{
- /* expect+1: warning: redefinition hides earlier one: s [43] */
+ /* expect+1: warning: redefinition of 's' hides earlier one [43] */
struct s {
int member;
};
Index: src/tests/usr.bin/xlint/lint1/msg_052.c
diff -u src/tests/usr.bin/xlint/lint1/msg_052.c:1.3 src/tests/usr.bin/xlint/lint1/msg_052.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_052.c:1.3 Fri Aug 27 20:16:50 2021
+++ src/tests/usr.bin/xlint/lint1/msg_052.c Mon Jun 20 21:13:36 2022
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_052.c,v 1.3 2021/08/27 20:16:50 rillig Exp $ */
+/* $NetBSD: msg_052.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_052.c"
-// Test for message: cannot initialize parameter: %s [52]
+// Test for message: cannot initialize parameter '%s' [52]
int
definition(i)
- /* expect+1: error: cannot initialize parameter: i [52] */
+ /* expect+1: error: cannot initialize parameter 'i' [52] */
int i = 3;
{
return i;
Index: src/tests/usr.bin/xlint/lint1/msg_058.c
diff -u src/tests/usr.bin/xlint/lint1/msg_058.c:1.3 src/tests/usr.bin/xlint/lint1/msg_058.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_058.c:1.3 Sun Feb 27 20:02:44 2022
+++ src/tests/usr.bin/xlint/lint1/msg_058.c Mon Jun 20 21:13:36 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_058.c,v 1.3 2022/02/27 20:02:44 rillig Exp $ */
+/* $NetBSD: msg_058.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_058.c"
-// Test for message: type does not match prototype: %s [58]
+// Test for message: type of '%s' does not match prototype [58]
int function(int, char, const char *);
@@ -10,7 +10,7 @@ function(i, dbl, str)
int i;
double dbl;
const char *str;
-/* expect+1: error: type does not match prototype: dbl [58] */
+/* expect+1: error: type of 'dbl' does not match prototype [58] */
{
return i + (int)dbl + str[0];
}
Index: src/tests/usr.bin/xlint/lint1/msg_059.c
diff -u src/tests/usr.bin/xlint/lint1/msg_059.c:1.3 src/tests/usr.bin/xlint/lint1/msg_059.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_059.c:1.3 Sun Feb 27 20:02:44 2022
+++ src/tests/usr.bin/xlint/lint1/msg_059.c Mon Jun 20 21:13:36 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: msg_059.c,v 1.3 2022/02/27 20:02:44 rillig Exp $ */
+/* $NetBSD: msg_059.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_059.c"
-// Test for message: formal parameter lacks name: param #%d [59]
+// Test for message: formal parameter #%d lacks name [59]
-/* expect+4: error: formal parameter lacks name: param #2 [59] */
-/* expect+3: error: formal parameter lacks name: param #3 [59] */
+/* expect+4: error: formal parameter #2 lacks name [59] */
+/* expect+3: error: formal parameter #3 lacks name [59] */
int
function_definition(int a, int, double)
{
Index: src/tests/usr.bin/xlint/lint1/msg_091.c
diff -u src/tests/usr.bin/xlint/lint1/msg_091.c:1.3 src/tests/usr.bin/xlint/lint1/msg_091.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_091.c:1.3 Sun Apr 3 09:34:45 2022
+++ src/tests/usr.bin/xlint/lint1/msg_091.c Mon Jun 20 21:13:36 2022
@@ -1,14 +1,14 @@
-/* $NetBSD: msg_091.c,v 1.3 2022/04/03 09:34:45 rillig Exp $ */
+/* $NetBSD: msg_091.c,v 1.4 2022/06/20 21:13:36 rillig Exp $ */
# 3 "msg_091.c"
-/* Test for message: declaration hides parameter: %s [91] */
+/* Test for message: declaration of '%s' hides parameter [91] */
/* lint1-flags: -htw */
add(a, b)
int a, b;
{
- /* expect+1: warning: declaration hides parameter: a [91] */
+ /* expect+1: warning: declaration of 'a' hides parameter [91] */
int a;
/* expect+1: warning: a may be used before set [158] */
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.419 src/usr.bin/xlint/lint1/cgram.y:1.420
--- src/usr.bin/xlint/lint1/cgram.y:1.419 Thu May 26 13:40:49 2022
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jun 20 21:13:35 2022
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.419 2022/05/26 13:40:49 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.420 2022/06/20 21:13:35 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.419 2022/05/26 13:40:49 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.420 2022/06/20 21:13:35 rillig Exp $");
#endif
#include <limits.h>
@@ -603,7 +603,7 @@ unary_expression:
}
| T_ADDITIVE sys cast_expression {
if (!allow_c90 && $1 == PLUS) {
- /* unary + is illegal in traditional C */
+ /* unary '+' is illegal in traditional C */
warning(100);
}
$$ = build_unary($1 == PLUS ? UPLUS : UMINUS, $2, $3);
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.289 src/usr.bin/xlint/lint1/decl.c:1.290
--- src/usr.bin/xlint/lint1/decl.c:1.289 Sun Jun 19 12:14:33 2022
+++ src/usr.bin/xlint/lint1/decl.c Mon Jun 20 21:13:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.289 2022/06/19 12:14:33 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.290 2022/06/20 21:13:35 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.289 2022/06/19 12:14:33 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.290 2022/06/20 21:13:35 rillig Exp $");
#endif
#include <sys/param.h>
@@ -1006,7 +1006,7 @@ check_type(sym_t *sym)
if (dcs->d_kind == DK_PROTO_ARG) {
if (sym->s_scl != ABSTRACT) {
lint_assert(sym->s_name != unnamed);
- /* void parameter cannot have ... */
+ /* void parameter '%s' cannot ... */
error(61, sym->s_name);
*tpp = gettyp(INT);
}
@@ -1149,7 +1149,7 @@ declarator_1_struct_union(sym_t *dsym)
*/
if ((sz = length_in_bits(dsym->s_type, dsym->s_name)) == 0) {
if (t == ARRAY && dsym->s_type->t_dim == 0) {
- /* zero sized array in struct is a C99 extension: %s */
+ /* zero-sized array '%s' in struct is a C99 extension */
c99ism(39, dsym->s_name);
}
}
@@ -1754,7 +1754,7 @@ newtag(sym_t *tag, scl_t scl, bool decl,
if (allow_c90) {
/* XXX: Why is this warning suppressed in C90 mode? */
if (allow_trad || allow_c99)
- /* declaration introduces new ... */
+ /* declaration of '%s %s' intro... */
warning(44, storage_class_name(scl),
tag->s_name);
tag = pushdown(tag);
@@ -1767,7 +1767,7 @@ newtag(sym_t *tag, scl_t scl, bool decl,
} else if (decl) {
/* "struct a { ... } " */
if (hflag)
- /* redefinition hides earlier one: %s */
+ /* redefinition of '%s' hides earlier one */
warning(43, tag->s_name);
tag = pushdown(tag);
dcs->d_enclosing->d_nonempty_decl = true;
@@ -1777,7 +1777,7 @@ newtag(sym_t *tag, scl_t scl, bool decl,
tag->s_name);
/* XXX: Why is this warning suppressed in C90 mode? */
if (allow_trad || allow_c99) {
- /* declaration introduces new type in ... */
+ /* declaration of '%s %s' introduces ... */
warning(44, storage_class_name(scl),
tag->s_name);
}
@@ -1897,9 +1897,9 @@ enumeration_constant(sym_t *sym, int val
if (sym->s_scl != NOSCL) {
if (sym->s_block_level == block_level) {
- /* no hflag, because this is illegal!!! */
+ /* no hflag, because this is illegal */
if (sym->s_arg) {
- /* enumeration constant hides parameter: %s */
+ /* enumeration constant '%s' hides parameter */
warning(57, sym->s_name);
} else {
/* redeclaration of '%s' */
@@ -1914,7 +1914,7 @@ enumeration_constant(sym_t *sym, int val
}
} else {
if (hflag)
- /* redefinition hides earlier one: %s */
+ /* redefinition of '%s' hides earlier one */
warning(43, sym->s_name);
}
sym = pushdown(sym);
@@ -1923,7 +1923,7 @@ enumeration_constant(sym_t *sym, int val
sym->s_type = dcs->d_tagtyp;
sym->u.s_enum_constant = val;
if (impl && val == TARG_INT_MIN) {
- /* overflow in enumeration values: %s */
+ /* enumeration value '%s' overflows */
warning(48, sym->s_name);
}
enumval = val == TARG_INT_MAX ? TARG_INT_MIN : val + 1;
@@ -2456,13 +2456,13 @@ declare_argument(sym_t *sym, bool initfl
}
if (!sym->s_arg) {
- /* declared argument %s is missing */
+ /* declared argument '%s' is missing */
error(53, sym->s_name);
sym->s_arg = true;
}
if (initflg) {
- /* cannot initialize parameter: %s */
+ /* cannot initialize parameter '%s' */
error(52, sym->s_name);
}
@@ -2473,7 +2473,7 @@ declare_argument(sym_t *sym, bool initfl
sym->s_type = block_derive_type(sym->s_type->t_subt, PTR);
} else if (t == FUNC) {
if (!allow_c90)
- /* a function is declared as an argument: %s */
+ /* argument '%s' has function type, should be ... */
warning(50, sym->s_name);
sym->s_type = block_derive_type(sym->s_type, PTR);
} else if (t == FLOAT) {
@@ -2588,7 +2588,7 @@ check_func_old_style_arguments(void)
*/
for (arg = args; arg != NULL; arg = arg->s_next) {
if (arg->s_defarg) {
- /* argument type defaults to 'int': %s */
+ /* type of argument '%s' defaults to 'int' */
warning(32, arg->s_name);
arg->s_defarg = false;
mark_as_set(arg);
@@ -2652,20 +2652,20 @@ check_prototype_declaration(sym_t *arg,
if (!eqtype(tp, ptp, true, true, &dowarn)) {
if (eqtype(tp, ptp, true, false, &dowarn)) {
- /* type does not match prototype: %s */
+ /* type of '%s' does not match prototype */
return gnuism(58, arg->s_name);
} else {
- /* type does not match prototype: %s */
+ /* type of '%s' does not match prototype */
error(58, arg->s_name);
return true;
}
} else if (dowarn) {
/* TODO: Make this an error in C99 mode as well. */
if (!allow_trad && !allow_c99)
- /* type does not match prototype: %s */
+ /* type of '%s' does not match prototype */
error(58, arg->s_name);
else
- /* type does not match prototype: %s */
+ /* type of '%s' does not match prototype */
warning(58, arg->s_name);
return true;
}
@@ -2678,15 +2678,15 @@ check_local_hiding(const sym_t *dsym)
{
switch (dsym->s_scl) {
case AUTO:
- /* automatic hides external declaration: %s */
+ /* automatic '%s' hides external declaration */
warning(86, dsym->s_name);
break;
case STATIC:
- /* static hides external declaration: %s */
+ /* static '%s' hides external declaration */
warning(87, dsym->s_name);
break;
case TYPEDEF:
- /* typedef hides external declaration: %s */
+ /* typedef '%s' hides external declaration */
warning(88, dsym->s_name);
break;
case EXTERN:
@@ -2714,7 +2714,7 @@ check_local_redeclaration(const sym_t *d
*/
if (!allow_c90) {
if (hflag)
- /* declaration hides parameter: %s */
+ /* declaration of '%s' hides ... */
warning(91, dsym->s_name);
rmsym(rsym);
}
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.172 src/usr.bin/xlint/lint1/err.c:1.173
--- src/usr.bin/xlint/lint1/err.c:1.172 Sun Jun 19 12:14:33 2022
+++ src/usr.bin/xlint/lint1/err.c Mon Jun 20 21:13:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.172 2022/06/19 12:14:33 rillig Exp $ */
+/* $NetBSD: err.c,v 1.173 2022/06/20 21:13:35 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.172 2022/06/19 12:14:33 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.173 2022/06/20 21:13:35 rillig Exp $");
#endif
#include <sys/types.h>
@@ -86,36 +86,36 @@ static const char *const msgs[] = {
"'%s' was previously declared extern, becomes static", /* 29 */
"redeclaration of '%s'; ANSI C requires static", /* 30 */
"'%s' has incomplete type '%s'", /* 31 */
- "argument type defaults to 'int': %s", /* 32 */
+ "type of argument '%s' defaults to 'int'", /* 32 */
"duplicate member name '%s'", /* 33 */
"nonportable bit-field type '%s'", /* 34 */
"illegal bit-field type '%s'", /* 35 */
"illegal bit-field size: %d", /* 36 */
"zero size bit-field", /* 37 */
"function illegal in structure or union", /* 38 */
- "zero sized array in struct is a C99 extension: %s", /* 39 */
+ "zero-sized array '%s' in struct is a C99 extension", /* 39 */
"", /* never used */ /* 40 */
"bit-field in union is very unusual", /* 41 */
"forward reference to enum type", /* 42 */
- "redefinition hides earlier one: %s", /* 43 */
- "declaration introduces new type in ANSI C: %s %s", /* 44 */
+ "redefinition of '%s' hides earlier one", /* 43 */
+ "declaration of '%s %s' introduces new type in ANSI C", /* 44 */
"base type is really '%s %s'", /* 45 */
"%s tag '%s' redeclared as %s", /* 46 */
"zero sized %s is a C99 feature", /* 47 */
- "overflow in enumeration values: %s", /* 48 */
+ "enumeration value '%s' overflows", /* 48 */
"anonymous struct/union members is a C11 feature", /* 49 */
- "a function is declared as an argument: %s", /* 50 */
+ "argument '%s' has function type, should be pointer", /* 50 */
"parameter mismatch: %d declared, %d defined", /* 51 */
- "cannot initialize parameter: %s", /* 52 */
- "declared argument %s is missing", /* 53 */
+ "cannot initialize parameter '%s'", /* 52 */
+ "declared argument '%s' is missing", /* 53 */
"trailing ',' prohibited in enum declaration", /* 54 */
"integral constant expression expected", /* 55 */
"integral constant too large", /* 56 */
- "enumeration constant hides parameter: %s", /* 57 */
- "type does not match prototype: %s", /* 58 */
- "formal parameter lacks name: param #%d", /* 59 */
+ "enumeration constant '%s' hides parameter", /* 57 */
+ "type of '%s' does not match prototype", /* 58 */
+ "formal parameter #%d lacks name", /* 59 */
"void must be sole parameter", /* 60 */
- "void parameter cannot have name: %s", /* 61 */
+ "void parameter '%s' cannot have name", /* 61 */
"function prototype parameters must have types", /* 62 */
"prototype does not match old-style definition", /* 63 */
"()-less function definition", /* 64 */
@@ -140,12 +140,12 @@ static const char *const msgs[] = {
"storage class after type is obsolescent", /* 83 */
"ANSI C requires formal parameter before '...'", /* 84 */
"dubious tag declaration: %s %s", /* 85 */
- "automatic hides external declaration: %s", /* 86 */
- "static hides external declaration: %s", /* 87 */
- "typedef hides external declaration: %s", /* 88 */
+ "automatic '%s' hides external declaration", /* 86 */
+ "static '%s' hides external declaration", /* 87 */
+ "typedef '%s' hides external declaration", /* 88 */
"typedef '%s' redeclared", /* 89 */
"inconsistent redeclaration of extern: %s", /* 90 */
- "declaration hides parameter: %s", /* 91 */
+ "declaration of '%s' hides parameter", /* 91 */
"inconsistent redeclaration of static: %s", /* 92 */
"dubious static function at block level: %s", /* 93 */
"function has illegal storage class: %s", /* 94 */
@@ -154,7 +154,7 @@ static const char *const msgs[] = {
"suffix U is illegal in traditional C", /* 97 */
"suffixes F and L are illegal in traditional C", /* 98 */
"'%s' undefined", /* 99 */
- "unary + is illegal in traditional C", /* 100 */
+ "unary '+' is illegal in traditional C", /* 100 */
"type '%s' does not have member '%s'", /* 101 */
"illegal use of member '%s'", /* 102 */
"left operand of '.' must be struct or union, not '%s'", /* 103 */
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.140 src/usr.bin/xlint/lint1/func.c:1.141
--- src/usr.bin/xlint/lint1/func.c:1.140 Wed Jun 15 18:29:21 2022
+++ src/usr.bin/xlint/lint1/func.c Mon Jun 20 21:13:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.140 2022/06/15 18:29:21 rillig Exp $ */
+/* $NetBSD: func.c,v 1.141 2022/06/20 21:13:35 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: func.c,v 1.140 2022/06/15 18:29:21 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.141 2022/06/20 21:13:35 rillig Exp $");
#endif
#include <stdlib.h>
@@ -283,7 +283,7 @@ funcdef(sym_t *fsym)
for (arg = fsym->s_type->t_args; arg != NULL; arg = arg->s_next) {
if (arg->s_scl == ABSTRACT) {
lint_assert(arg->s_name == unnamed);
- /* formal parameter lacks name: param #%d */
+ /* formal parameter #%d lacks name */
error(59, n);
} else {
lint_assert(arg->s_name != unnamed);
