Module Name: src
Committed By: rillig
Date: Sun Jul 9 11:18:55 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: c11_generic_expression.c
d_c99_bool_strict.c d_decl_old_style_arguments.c d_fold_test.c
decl_arg.c expr_sizeof.c msg_019.c msg_050.c msg_051.c msg_057.c
msg_097.c msg_098.c msg_170.c msg_183.c msg_192.c msg_204.c
msg_213.c msg_231.c msg_240.c msg_269.c msg_280.c msg_293.c
msg_310.c
src/usr.bin/xlint/lint1: decl.c err.c lex.c tree.c
Log Message:
lint: clean up wording in diagnostics
Use the term 'parameter' as defined in C99 3.15.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.c
cvs rdiff -u -r1.42 -r1.43 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.7 -r1.8 \
src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c \
src/tests/usr.bin/xlint/lint1/msg_019.c \
src/tests/usr.bin/xlint/lint1/msg_057.c \
src/tests/usr.bin/xlint/lint1/msg_280.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/d_fold_test.c \
src/tests/usr.bin/xlint/lint1/msg_050.c \
src/tests/usr.bin/xlint/lint1/msg_051.c \
src/tests/usr.bin/xlint/lint1/msg_170.c \
src/tests/usr.bin/xlint/lint1/msg_240.c
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/decl_arg.c
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/xlint/lint1/expr_sizeof.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_097.c \
src/tests/usr.bin/xlint/lint1/msg_098.c \
src/tests/usr.bin/xlint/lint1/msg_183.c \
src/tests/usr.bin/xlint/lint1/msg_192.c \
src/tests/usr.bin/xlint/lint1/msg_213.c \
src/tests/usr.bin/xlint/lint1/msg_231.c \
src/tests/usr.bin/xlint/lint1/msg_269.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_204.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_293.c \
src/tests/usr.bin/xlint/lint1/msg_310.c
cvs rdiff -u -r1.346 -r1.347 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.170 -r1.171 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.556 -r1.557 src/usr.bin/xlint/lint1/tree.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/c11_generic_expression.c
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.17 src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.18
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.17 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: c11_generic_expression.c,v 1.17 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: c11_generic_expression.c,v 1.18 2023/07/09 11:18:55 rillig Exp $ */
# 3 "c11_generic_expression.c"
/* lint1-extra-flags: -X 351 */
@@ -22,7 +22,7 @@
const char *
classify_type_without_default(double var)
{
- /* expect-2: warning: argument 'var' unused in function 'classify_type_without_default' [231] */
+ /* expect-2: warning: parameter 'var' unused in function 'classify_type_without_default' [231] */
return _Generic(var,
long double: "long double",
@@ -38,7 +38,7 @@ classify_type_without_default(double var
const char *
classify_type_with_default(double var)
{
- /* expect-2: warning: argument 'var' unused in function 'classify_type_with_default' [231] */
+ /* expect-2: warning: parameter 'var' unused in function 'classify_type_with_default' [231] */
return _Generic(var,
long double: "long double",
@@ -54,7 +54,7 @@ classify_type_with_default(double var)
const char *
classify_char(char c)
{
- /* expect-2: warning: argument 'c' unused in function 'classify_char' [231] */
+ /* expect-2: warning: parameter 'c' unused in function 'classify_char' [231] */
return _Generic(c,
char: "yes",
Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.42 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.43
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.42 Sun Jul 9 10:42:07 2023
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_bool_strict.c,v 1.42 2023/07/09 10:42:07 rillig Exp $ */
+/* $NetBSD: d_c99_bool_strict.c,v 1.43 2023/07/09 11:18:55 rillig Exp $ */
# 3 "d_c99_bool_strict.c"
/*
@@ -297,7 +297,7 @@ strict_bool_conversion_return_2(void)
return 2;
}
-/* expect+2: warning: argument 'p' unused in function 'strict_bool_conversion_return_pointer' [231] */
+/* expect+2: warning: parameter 'p' unused in function 'strict_bool_conversion_return_pointer' [231] */
bool
strict_bool_conversion_return_pointer(const void *p)
{
@@ -393,7 +393,7 @@ strict_bool_conversion_between_bool_and_
b = i;
}
-/* expect+2: warning: argument 'b' unused in function 'strict_bool_conversion_from_bool_to_scalar' [231] */
+/* expect+2: warning: parameter 'b' unused in function 'strict_bool_conversion_from_bool_to_scalar' [231] */
void
strict_bool_conversion_from_bool_to_scalar(bool b)
{
@@ -815,7 +815,7 @@ enum Flags {
FLAG28 = 1 << 28
};
-/* expect+2: warning: argument 'flags' unused in function 'strict_bool_bitwise_and_enum' [231] */
+/* expect+2: warning: parameter 'flags' unused in function 'strict_bool_bitwise_and_enum' [231] */
void
strict_bool_bitwise_and_enum(enum Flags flags)
{
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.7 src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.8
--- src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c:1.7 Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/d_decl_old_style_arguments.c Sun Jul 9 11:18:55 2023
@@ -9,10 +9,10 @@
void func(int a, int b, int c);
-/* expect+4: warning: argument 'num' unused in function 'func' [231] */
-/* expect+3: warning: argument 'ptr' unused in function 'func' [231] */
-/* expect+2: warning: argument 'dbl' unused in function 'func' [231] */
-/* expect+1: warning: argument 'def' unused in function 'func' [231] */
+/* expect+4: warning: parameter 'num' unused in function 'func' [231] */
+/* expect+3: warning: parameter 'ptr' unused in function 'func' [231] */
+/* expect+2: warning: parameter 'dbl' unused in function 'func' [231] */
+/* expect+1: warning: parameter 'def' unused in function 'func' [231] */
void func(num, ptr, dbl, def)
int num;
char *ptr;
Index: src/tests/usr.bin/xlint/lint1/msg_019.c
diff -u src/tests/usr.bin/xlint/lint1/msg_019.c:1.7 src/tests/usr.bin/xlint/lint1/msg_019.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_019.c:1.7 Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/msg_019.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_019.c,v 1.7 2023/03/28 14:44:34 rillig Exp $ */
+/* $NetBSD: msg_019.c,v 1.8 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_019.c"
// Test for message: void type for '%s' [19]
@@ -12,7 +12,7 @@ void global_variable;
/* expect+1: warning: static variable 'unit_variable' unused [226] */
static void unit_variable;
-/* expect+3: warning: argument 'parameter' unused in function 'function' [231] */
+/* expect+3: warning: parameter 'parameter' unused in function 'function' [231] */
/* expect+2: error: void parameter 'parameter' cannot have name [61] */
void
function(void parameter)
Index: src/tests/usr.bin/xlint/lint1/msg_057.c
diff -u src/tests/usr.bin/xlint/lint1/msg_057.c:1.7 src/tests/usr.bin/xlint/lint1/msg_057.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_057.c:1.7 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_057.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_057.c,v 1.7 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_057.c,v 1.8 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_057.c"
// Test for message: enumeration constant '%s' hides parameter [57]
@@ -6,9 +6,9 @@
/* lint1-extra-flags: -X 351 */
long
-/* expect+3: warning: argument 'red' unused in function 'rgb' [231] */
-/* expect+2: warning: argument 'green' unused in function 'rgb' [231] */
-/* expect+1: warning: argument 'blue' unused in function 'rgb' [231] */
+/* expect+3: warning: parameter 'red' unused in function 'rgb' [231] */
+/* expect+2: warning: parameter 'green' unused in function 'rgb' [231] */
+/* expect+1: warning: parameter 'blue' unused in function 'rgb' [231] */
rgb(int red, int green, int blue)
{
enum color {
Index: src/tests/usr.bin/xlint/lint1/msg_280.c
diff -u src/tests/usr.bin/xlint/lint1/msg_280.c:1.7 src/tests/usr.bin/xlint/lint1/msg_280.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_280.c:1.7 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_280.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_280.c,v 1.7 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_280.c,v 1.8 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_280.c"
// Test for message: comment /* %s */ must be outside function [280]
@@ -53,7 +53,7 @@ varargs_bad_body(const char *str, ...)
}
void
-/* expect+1: warning: argument 'str' unused in function 'argsused_bad_body' [231] */
+/* expect+1: warning: parameter 'str' unused in function 'argsused_bad_body' [231] */
argsused_bad_body(const char *str)
{
/* expect+1: warning: comment ** ARGSUSED ** must be outside function [280] */
Index: src/tests/usr.bin/xlint/lint1/d_fold_test.c
diff -u src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.6 src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.7
--- src/tests/usr.bin/xlint/lint1/d_fold_test.c:1.6 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/d_fold_test.c Sun Jul 9 11:18:55 2023
@@ -59,28 +59,28 @@ void if_enum(enum e e) { if (e) return
/* C99 6.2.5p20 */
void if_array(struct arr arr) { if (arr.arr) return; }
/* expect+2: error: controlling expressions must have scalar type [204] */
-/* expect+1: warning: argument 's' unused in function 'if_struct' [231] */
+/* expect+1: warning: parameter 's' unused in function 'if_struct' [231] */
void if_struct(struct s s) { if (s) return; }
/* expect+2: error: controlling expressions must have scalar type [204] */
-/* expect+1: warning: argument 'u' unused in function 'if_union' [231] */
+/* expect+1: warning: parameter 'u' unused in function 'if_union' [231] */
void if_union(union u u) { if (u) return; }
void if_function(void) { if (if_function) return; }
void if_pointer(void *p) { if (p) return; }
/* C99 6.8.5 */
/* expect+2: error: controlling expressions must have scalar type [204] */
-/* expect+1: warning: argument 's' unused in function 'while_struct' [231] */
+/* expect+1: warning: parameter 's' unused in function 'while_struct' [231] */
void while_struct(struct s s) { while (s) return; }
/* expect+3: error: controlling expressions must have scalar type [204] */
/* expect+2: warning: end-of-loop code not reached [223] */
-/* expect+1: warning: argument 's' unused in function 'for_struct' [231] */
+/* expect+1: warning: parameter 's' unused in function 'for_struct' [231] */
void for_struct(struct s s) { for (;s;) return; }
/* expect+2: error: controlling expressions must have scalar type [204] */
-/* expect+1: warning: argument 's' unused in function 'do_while_struct' [231] */
+/* expect+1: warning: parameter 's' unused in function 'do_while_struct' [231] */
void do_while_struct(struct s s) { do { return; } while (s); }
/* C99 6.5.15 does not require a scalar type, curiously. */
-/* expect+3: error: first operand must have scalar type, op ? : [170] */
+/* expect+3: error: first operand of '?' must have scalar type [170] */
/* expect+2: warning: function 'conditional_struct' expects to return value [214] */
-/* expect+1: warning: argument 's' unused in function 'conditional_struct' [231] */
+/* expect+1: warning: parameter 's' unused in function 'conditional_struct' [231] */
int conditional_struct(struct s s) { return s ? 1 : 2; }
Index: src/tests/usr.bin/xlint/lint1/msg_050.c
diff -u src/tests/usr.bin/xlint/lint1/msg_050.c:1.6 src/tests/usr.bin/xlint/lint1/msg_050.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_050.c:1.6 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_050.c Sun Jul 9 11:18:55 2023
@@ -1,15 +1,15 @@
-/* $NetBSD: msg_050.c,v 1.6 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_050.c,v 1.7 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_050.c"
-/* Test for message: argument '%s' has function type, should be pointer [50] */
+/* Test for message: parameter '%s' has function type, should be pointer [50] */
/* lint1-flags: -tw */
typedef void (function)();
-/* expect+1: warning: argument 'f' unused in function 'example' [231] */
+/* expect+1: warning: parameter 'f' unused in function 'example' [231] */
void example(f)
- /* expect+1: warning: argument 'f' has function type, should be pointer [50] */
+ /* expect+1: warning: parameter 'f' has function type, should be pointer [50] */
function f;
{
}
Index: src/tests/usr.bin/xlint/lint1/msg_051.c
diff -u src/tests/usr.bin/xlint/lint1/msg_051.c:1.6 src/tests/usr.bin/xlint/lint1/msg_051.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_051.c:1.6 Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/msg_051.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_051.c,v 1.6 2023/03/28 14:44:34 rillig Exp $ */
+/* $NetBSD: msg_051.c,v 1.7 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_051.c"
// Test for message: parameter mismatch: %d declared, %d defined [51]
@@ -9,9 +9,9 @@ void
example(int, int);
void
-/* expect+3: warning: argument 'a' unused in function 'example' [231] */
-/* expect+2: warning: argument 'b' unused in function 'example' [231] */
-/* expect+1: warning: argument 'c' unused in function 'example' [231] */
+/* expect+3: warning: parameter 'a' unused in function 'example' [231] */
+/* expect+2: warning: parameter 'b' unused in function 'example' [231] */
+/* expect+1: warning: parameter 'c' unused in function 'example' [231] */
example(a, b, c)
int a, b, c;
/* expect+1: error: parameter mismatch: 2 declared, 3 defined [51] */
Index: src/tests/usr.bin/xlint/lint1/msg_170.c
diff -u src/tests/usr.bin/xlint/lint1/msg_170.c:1.6 src/tests/usr.bin/xlint/lint1/msg_170.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_170.c:1.6 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_170.c Sun Jul 9 11:18:55 2023
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_170.c,v 1.6 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_170.c,v 1.7 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_170.c"
-// Test for message: first operand must have scalar type, op ? : [170]
+// Test for message: first operand of '?' must have scalar type [170]
/* lint1-extra-flags: -X 351 */
@@ -10,10 +10,10 @@ struct number {
};
_Bool
-/* expect+1: warning: argument 'num' unused in function 'example' [231] */
+/* expect+1: warning: parameter 'num' unused in function 'example' [231] */
example(const struct number *num)
{
- /* expect+2: error: first operand must have scalar type, op ? : [170] */
+ /* expect+2: error: first operand of '?' must have scalar type [170] */
/* expect+1: warning: function 'example' expects to return value [214] */
return *num ? 1 : 0;
}
Index: src/tests/usr.bin/xlint/lint1/msg_240.c
diff -u src/tests/usr.bin/xlint/lint1/msg_240.c:1.6 src/tests/usr.bin/xlint/lint1/msg_240.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_240.c:1.6 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_240.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_240.c,v 1.6 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_240.c,v 1.7 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_240.c"
// Test for message: assignment of different structures (%s != %s) [240]
@@ -22,7 +22,7 @@ union u_arg {
int member;
};
-/* expect+2: warning: argument 's_arg' unused in function 'return_other_struct' [231] */
+/* expect+2: warning: parameter 's_arg' unused in function 'return_other_struct' [231] */
struct s_return
return_other_struct(struct s_arg s_arg)
{
@@ -30,7 +30,7 @@ return_other_struct(struct s_arg s_arg)
return s_arg;
}
-/* expect+2: warning: argument 's_arg' unused in function 'assign_other_struct' [231] */
+/* expect+2: warning: parameter 's_arg' unused in function 'assign_other_struct' [231] */
void
assign_other_struct(struct s_arg s_arg)
{
@@ -40,7 +40,7 @@ assign_other_struct(struct s_arg s_arg)
s_local = s_arg;
}
-/* expect+2: warning: argument 'u_arg' unused in function 'return_other_union' [231] */
+/* expect+2: warning: parameter 'u_arg' unused in function 'return_other_union' [231] */
struct s_return
return_other_union(union u_arg u_arg)
{
Index: src/tests/usr.bin/xlint/lint1/decl_arg.c
diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.9 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.10
--- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.9 Sun Jul 9 11:01:27 2023
+++ src/tests/usr.bin/xlint/lint1/decl_arg.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_arg.c,v 1.9 2023/07/09 11:01:27 rillig Exp $ */
+/* $NetBSD: decl_arg.c,v 1.10 2023/07/09 11:18:55 rillig Exp $ */
# 3 "decl_arg.c"
/*
@@ -23,11 +23,11 @@ void type_qualifier_pointer(const number
/*
* Just some unrealistic coverage for the grammar rule 'arg_declaration'.
*/
-/* expect+6: warning: argument 'an_int' unused in function 'old_style' [231] */
-/* expect+5: warning: argument 'a_const_int' unused in function 'old_style' [231] */
-/* expect+4: warning: argument 'a_number' unused in function 'old_style' [231] */
-/* expect+3: warning: argument 'a_function' unused in function 'old_style' [231] */
-/* expect+2: warning: argument 'a_struct' unused in function 'old_style' [231] */
+/* expect+6: warning: parameter 'an_int' unused in function 'old_style' [231] */
+/* expect+5: warning: parameter 'a_const_int' unused in function 'old_style' [231] */
+/* expect+4: warning: parameter 'a_number' unused in function 'old_style' [231] */
+/* expect+3: warning: parameter 'a_function' unused in function 'old_style' [231] */
+/* expect+2: warning: parameter 'a_struct' unused in function 'old_style' [231] */
extern void
old_style(an_int, a_const_int, a_number, a_function, a_struct)
/* expect+2: warning: empty declaration [2] */
Index: src/tests/usr.bin/xlint/lint1/expr_sizeof.c
diff -u src/tests/usr.bin/xlint/lint1/expr_sizeof.c:1.12 src/tests/usr.bin/xlint/lint1/expr_sizeof.c:1.13
--- src/tests/usr.bin/xlint/lint1/expr_sizeof.c:1.12 Fri Jun 30 21:06:18 2023
+++ src/tests/usr.bin/xlint/lint1/expr_sizeof.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: expr_sizeof.c,v 1.12 2023/06/30 21:06:18 rillig Exp $ */
+/* $NetBSD: expr_sizeof.c,v 1.13 2023/07/09 11:18:55 rillig Exp $ */
# 3 "expr_sizeof.c"
/*
@@ -60,7 +60,7 @@ int arr[] = { 1, 2, 3 };
typedef int arr_count[-(int)sizeof(arr) / (int)sizeof(arr)[0]];
/* FIXME: 'n' is actually used, for the variable length array. */
-/* expect+2: warning: argument 'n' unused in function 'variable_length_array' [231] */
+/* expect+2: warning: parameter 'n' unused in function 'variable_length_array' [231] */
void
variable_length_array(int n)
{
Index: src/tests/usr.bin/xlint/lint1/msg_097.c
diff -u src/tests/usr.bin/xlint/lint1/msg_097.c:1.5 src/tests/usr.bin/xlint/lint1/msg_097.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_097.c:1.5 Fri Jul 7 06:03:31 2023
+++ src/tests/usr.bin/xlint/lint1/msg_097.c Sun Jul 9 11:18:55 2023
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_097.c,v 1.5 2023/07/07 06:03:31 rillig Exp $ */
+/* $NetBSD: msg_097.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_097.c"
-/* Test for message: suffix U is illegal in traditional C [97] */
+/* Test for message: suffix 'U' is illegal in traditional C [97] */
/* lint1-flags: -gtw -X 191 */
@@ -11,16 +11,16 @@ example()
int i = 1234567;
unsigned u = 1234567;
- /* expect+1: warning: suffix U is illegal in traditional C [97] */
+ /* expect+1: warning: suffix 'U' is illegal in traditional C [97] */
unsigned u_upper = 1234567U;
- /* expect+1: warning: suffix U is illegal in traditional C [97] */
+ /* expect+1: warning: suffix 'U' is illegal in traditional C [97] */
unsigned u_lower = 1234567u;
long l = 1234567L;
- /* expect+1: warning: suffix U is illegal in traditional C [97] */
+ /* expect+1: warning: suffix 'U' is illegal in traditional C [97] */
unsigned long ul = 1234567UL;
long long ll = 1234567LL;
- /* expect+1: warning: suffix U is illegal in traditional C [97] */
+ /* expect+1: warning: suffix 'U' is illegal in traditional C [97] */
unsigned long long ull = 1234567ULL;
}
Index: src/tests/usr.bin/xlint/lint1/msg_098.c
diff -u src/tests/usr.bin/xlint/lint1/msg_098.c:1.5 src/tests/usr.bin/xlint/lint1/msg_098.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_098.c:1.5 Sun Apr 3 09:34:45 2022
+++ src/tests/usr.bin/xlint/lint1/msg_098.c Sun Jul 9 11:18:55 2023
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_098.c,v 1.5 2022/04/03 09:34:45 rillig Exp $ */
+/* $NetBSD: msg_098.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_098.c"
-/* Test for message: suffixes F and L are illegal in traditional C [98] */
+/* Test for message: suffixes 'F' and 'L' are illegal in traditional C [98] */
/* lint1-flags: -gtw */
@@ -9,9 +9,9 @@ void
example()
{
float f = 1234.5;
- /* expect+1: warning: suffixes F and L are illegal in traditional C [98] */
+ /* expect+1: warning: suffixes 'F' and 'L' are illegal in traditional C [98] */
float f_F = 1234.5F;
- /* expect+1: warning: suffixes F and L are illegal in traditional C [98] */
+ /* expect+1: warning: suffixes 'F' and 'L' are illegal in traditional C [98] */
float f_f = 1234.5f;
double d = 1234.5;
@@ -21,6 +21,6 @@ example()
/* expect+1: warning: 'long double' is illegal in traditional C [266] */
long double ld = 1234.5;
/* expect+2: warning: 'long double' is illegal in traditional C [266] */
- /* expect+1: warning: suffixes F and L are illegal in traditional C [98] */
+ /* expect+1: warning: suffixes 'F' and 'L' are illegal in traditional C [98] */
long double ld_L = 1234.5L;
}
Index: src/tests/usr.bin/xlint/lint1/msg_183.c
diff -u src/tests/usr.bin/xlint/lint1/msg_183.c:1.5 src/tests/usr.bin/xlint/lint1/msg_183.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_183.c:1.5 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_183.c Sun Jul 9 11:18:55 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_183.c,v 1.5 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_183.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_183.c"
// Test for message: illegal combination of %s '%s' and %s '%s' [183]
/* lint1-extra-flags: -X 351 */
-/* expect+2: warning: argument 'x' unused in function 'example' [231] */
+/* expect+2: warning: parameter 'x' unused in function 'example' [231] */
void *
example(double x, int i, void *vp, int *ip, double *dp, void (*fp)(void))
{
Index: src/tests/usr.bin/xlint/lint1/msg_192.c
diff -u src/tests/usr.bin/xlint/lint1/msg_192.c:1.5 src/tests/usr.bin/xlint/lint1/msg_192.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_192.c:1.5 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_192.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_192.c,v 1.5 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_192.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_192.c"
// Test for message: '%s' unused in function '%s' [192]
@@ -6,7 +6,7 @@
/* lint1-extra-flags: -X 351 */
void
-/* expect+1: warning: argument 'param' unused in function 'example' [231] */
+/* expect+1: warning: parameter 'param' unused in function 'example' [231] */
example(int param)
{
/* expect+1: warning: 'local' unused in function 'example' [192] */
Index: src/tests/usr.bin/xlint/lint1/msg_213.c
diff -u src/tests/usr.bin/xlint/lint1/msg_213.c:1.5 src/tests/usr.bin/xlint/lint1/msg_213.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_213.c:1.5 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_213.c Sun Jul 9 11:18:55 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_213.c,v 1.5 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_213.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_213.c"
// Test for message: void function '%s' cannot return value [213]
/* lint1-extra-flags: -X 351 */
-/* expect+2: warning: argument 'x' unused in function 'example' [231] */
+/* expect+2: warning: parameter 'x' unused in function 'example' [231] */
void
example(int x)
{
Index: src/tests/usr.bin/xlint/lint1/msg_231.c
diff -u src/tests/usr.bin/xlint/lint1/msg_231.c:1.5 src/tests/usr.bin/xlint/lint1/msg_231.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_231.c:1.5 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_231.c Sun Jul 9 11:18:55 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_231.c,v 1.5 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_231.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_231.c"
-// Test for message: argument '%s' unused in function '%s' [231]
+// Test for message: parameter '%s' unused in function '%s' [231]
/* lint1-extra-flags: -X 351 */
-/* expect+2: warning: argument 'param' unused in function 'example' [231] */
+/* expect+2: warning: parameter 'param' unused in function 'example' [231] */
void
example(int param)
{
Index: src/tests/usr.bin/xlint/lint1/msg_269.c
diff -u src/tests/usr.bin/xlint/lint1/msg_269.c:1.5 src/tests/usr.bin/xlint/lint1/msg_269.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_269.c:1.5 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_269.c Sun Jul 9 11:18:55 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: msg_269.c,v 1.5 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_269.c,v 1.6 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_269.c"
-// Test for message: argument '%s' declared inline [269]
+// Test for message: parameter '%s' declared inline [269]
/* lint1-extra-flags: -X 351 */
-/* expect+1: warning: argument 'x' declared inline [269] */
+/* expect+1: warning: parameter 'x' declared inline [269] */
void example(inline int x);
Index: src/tests/usr.bin/xlint/lint1/msg_204.c
diff -u src/tests/usr.bin/xlint/lint1/msg_204.c:1.8 src/tests/usr.bin/xlint/lint1/msg_204.c:1.9
--- src/tests/usr.bin/xlint/lint1/msg_204.c:1.8 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_204.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_204.c,v 1.8 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_204.c,v 1.9 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_204.c"
// Test for message: controlling expressions must have scalar type [204]
@@ -107,6 +107,6 @@ void do_while_struct(struct s s) { do {
* C99 6.5.15 for the '?:' operator does not explicitly mention that the
* controlling expression must have a scalar type, curiously.
*/
-/* expect+2: error: first operand must have scalar type, op ? : [170] */
+/* expect+2: error: first operand of '?' must have scalar type [170] */
/* expect+1: warning: function 'conditional_struct' expects to return value [214] */
int conditional_struct(struct s s) { return s ? 1 : 2; }
Index: src/tests/usr.bin/xlint/lint1/msg_293.c
diff -u src/tests/usr.bin/xlint/lint1/msg_293.c:1.4 src/tests/usr.bin/xlint/lint1/msg_293.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_293.c:1.4 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_293.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_293.c,v 1.4 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_293.c,v 1.5 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_293.c"
// Test for message: argument %d must be 'char *' for PRINTFLIKE/SCANFLIKE [293]
@@ -6,7 +6,7 @@
/* lint1-extra-flags: -X 351 */
/* expect+3: warning: argument 1 must be 'char *' for PRINTFLIKE/SCANFLIKE [293] */
-/* expect+2: warning: argument 'msgid' unused in function 'my_printf' [231] */
+/* expect+2: warning: parameter 'msgid' unused in function 'my_printf' [231] */
/* PRINTFLIKE 1 */
void my_printf(int msgid, ...) {
}
Index: src/tests/usr.bin/xlint/lint1/msg_310.c
diff -u src/tests/usr.bin/xlint/lint1/msg_310.c:1.4 src/tests/usr.bin/xlint/lint1/msg_310.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_310.c:1.4 Fri Jul 7 19:45:22 2023
+++ src/tests/usr.bin/xlint/lint1/msg_310.c Sun Jul 9 11:18:55 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: msg_310.c,v 1.4 2023/07/07 19:45:22 rillig Exp $ */
+/* $NetBSD: msg_310.c,v 1.5 2023/07/09 11:18:55 rillig Exp $ */
# 3 "msg_310.c"
// Test for message: symbol renaming can't be used on function arguments [310]
/* lint1-extra-flags: -X 351 */
-/* expect+2: warning: argument 'callback' unused in function 'function' [231] */
+/* expect+2: warning: parameter 'callback' unused in function 'function' [231] */
void
function(int (*callback)(void) __symbolrename(argument))
{
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.346 src/usr.bin/xlint/lint1/decl.c:1.347
--- src/usr.bin/xlint/lint1/decl.c:1.346 Sun Jul 9 11:01:27 2023
+++ src/usr.bin/xlint/lint1/decl.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.346 2023/07/09 11:01:27 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.347 2023/07/09 11:18:55 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.346 2023/07/09 11:01:27 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.347 2023/07/09 11:18:55 rillig Exp $");
#endif
#include <sys/param.h>
@@ -2345,7 +2345,7 @@ declare_argument(sym_t *sym, bool has_in
sym->s_type = block_derive_type(sym->s_type->t_subt, PTR);
if (t == FUNC) {
if (!allow_c90)
- /* argument '%s' has function type, should be ... */
+ /* parameter '%s' has function type, should be ... */
warning(50, sym->s_name);
sym->s_type = block_derive_type(sym->s_type, PTR);
}
@@ -2353,7 +2353,7 @@ declare_argument(sym_t *sym, bool has_in
sym->s_type = gettyp(DOUBLE);
if (dcs->d_inline)
- /* argument '%s' declared inline */
+ /* parameter '%s' declared inline */
warning(269, sym->s_name);
/*
@@ -2925,7 +2925,7 @@ check_argument_usage(bool novar, sym_t *
return;
if (!arg->s_used && !vflag) {
- /* argument '%s' unused in function '%s' */
+ /* parameter '%s' unused in function '%s' */
warning_at(231, &arg->s_def_pos, arg->s_name, funcsym->s_name);
}
}
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.207 src/usr.bin/xlint/lint1/err.c:1.208
--- src/usr.bin/xlint/lint1/err.c:1.207 Sun Jul 9 11:01:27 2023
+++ src/usr.bin/xlint/lint1/err.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.207 2023/07/09 11:01:27 rillig Exp $ */
+/* $NetBSD: err.c,v 1.208 2023/07/09 11:18:55 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.207 2023/07/09 11:01:27 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.208 2023/07/09 11:18:55 rillig Exp $");
#endif
#include <limits.h>
@@ -105,7 +105,7 @@ static const char *const msgs[] = {
"zero sized %s is a C99 feature", /* 47 */
"enumeration value '%s' overflows", /* 48 */
"anonymous struct/union members is a C11 feature", /* 49 */
- "argument '%s' has function type, should be pointer", /* 50 */
+ "parameter '%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 */
@@ -152,8 +152,8 @@ static const char *const msgs[] = {
"function '%s' has illegal storage class", /* 94 */
"declaration of '%s' hides earlier one", /* 95 */
"cannot dereference non-pointer type '%s'", /* 96 */
- "suffix U is illegal in traditional C", /* 97 */
- "suffixes F and L are illegal in traditional C", /* 98 */
+ "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 */
"type '%s' does not have member '%s'", /* 101 */
@@ -225,7 +225,7 @@ static const char *const msgs[] = {
"array subscript cannot be negative: %ld", /* 167 */
"array subscript cannot be > %d: %ld", /* 168 */
"precedence confusion possible: parenthesize!", /* 169 */
- "first operand must have scalar type, op ? :", /* 170 */
+ "first operand of '?' must have scalar type", /* 170 */
"cannot assign to '%s' from '%s'", /* 171 */
"too many struct/union initializers", /* 172 */
"too many array initializers, expected %d", /* 173 */
@@ -286,7 +286,7 @@ static const char *const msgs[] = {
"function cannot return const or volatile object", /* 228 */
"converting '%s' to '%s' is questionable", /* 229 */
"nonportable character comparison '%s'", /* 230 */
- "argument '%s' unused in function '%s'", /* 231 */
+ "parameter '%s' unused in function '%s'", /* 231 */
"label '%s' unused in function '%s'", /* 232 */
"struct '%s' never defined", /* 233 */
"union '%s' never defined", /* 234 */
@@ -324,7 +324,7 @@ static const char *const msgs[] = {
"'long double' is illegal in traditional C", /* 266 */
"shift amount %u equals bit-size of '%s'", /* 267 */
"variable '%s' declared inline", /* 268 */
- "argument '%s' declared inline", /* 269 */
+ "parameter '%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 */
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.170 src/usr.bin/xlint/lint1/lex.c:1.171
--- src/usr.bin/xlint/lint1/lex.c:1.170 Sun Jul 9 11:01:27 2023
+++ src/usr.bin/xlint/lint1/lex.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.170 2023/07/09 11:01:27 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.171 2023/07/09 11:18:55 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.170 2023/07/09 11:01:27 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.171 2023/07/09 11:18:55 rillig Exp $");
#endif
#include <ctype.h>
@@ -498,7 +498,7 @@ lex_integer_constant(const char *yytext,
u_suffix = 1;
}
if (!allow_c90 && u_suffix > 0) {
- /* suffix U is illegal in traditional C */
+ /* suffix 'U' is illegal in traditional C */
warning(97);
}
tspec_t typ = suffix_type[u_suffix][l_suffix];
@@ -642,7 +642,7 @@ lex_floating_constant(const char *yytext
typ = imaginary ? DCOMPLEX : DOUBLE;
if (!allow_c90 && typ != DOUBLE) {
- /* suffixes F and L are illegal in traditional C */
+ /* suffixes 'F' and 'L' are illegal in traditional C */
warning(98);
}
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.556 src/usr.bin/xlint/lint1/tree.c:1.557
--- src/usr.bin/xlint/lint1/tree.c:1.556 Sun Jul 9 11:01:27 2023
+++ src/usr.bin/xlint/lint1/tree.c Sun Jul 9 11:18:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.556 2023/07/09 11:01:27 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.557 2023/07/09 11:18:55 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.556 2023/07/09 11:01:27 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.557 2023/07/09 11:18:55 rillig Exp $");
#endif
#include <float.h>
@@ -2454,7 +2454,7 @@ static bool
typeok_quest(tspec_t lt, const tnode_t *rn)
{
if (!is_scalar(lt)) {
- /* first operand must have scalar type, op ? : */
+ /* first operand of '?' must have scalar type */
error(170);
return false;
}
