Module Name: src
Committed By: rillig
Date: Wed Aug 2 18:57:54 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_150.c msg_346.c
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: fix plural form in message 150
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_150.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_346.c
cvs rdiff -u -r1.574 -r1.575 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/msg_150.c
diff -u src/tests/usr.bin/xlint/lint1/msg_150.c:1.6 src/tests/usr.bin/xlint/lint1/msg_150.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_150.c:1.6 Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/msg_150.c Wed Aug 2 18:57:54 2023
@@ -1,16 +1,21 @@
-/* $NetBSD: msg_150.c,v 1.6 2023/03/28 14:44:34 rillig Exp $ */
+/* $NetBSD: msg_150.c,v 1.7 2023/08/02 18:57:54 rillig Exp $ */
# 3 "msg_150.c"
// Test for message: argument mismatch: %d %s passed, %d expected [150]
/* lint1-extra-flags: -X 351 */
-int
-add2(int, int);
+int add2(int, int);
int
example(void)
{
+ /* expect+1: error: argument mismatch: 0 arguments passed, 2 expected [150] */
+ int a = add2();
+ /* expect+1: error: argument mismatch: 1 argument passed, 2 expected [150] */
+ int b = add2(1);
/* expect+1: error: argument mismatch: 4 arguments passed, 2 expected [150] */
- return add2(2, 3, 5, 7);
+ int c = add2(2, 3, 5, 7);
+
+ return a + b + c;
}
Index: src/tests/usr.bin/xlint/lint1/msg_346.c
diff -u src/tests/usr.bin/xlint/lint1/msg_346.c:1.8 src/tests/usr.bin/xlint/lint1/msg_346.c:1.9
--- src/tests/usr.bin/xlint/lint1/msg_346.c:1.8 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_346.c Wed Aug 2 18:57:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_346.c,v 1.8 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_346.c,v 1.9 2023/08/02 18:57:54 rillig Exp $ */
# 3 "msg_346.c"
// Test for message: call to '%s' effectively discards 'const' from argument [346]
@@ -56,9 +56,9 @@ all_functions(void)
void
edge_cases(void)
-{ /* TODO: '0 argument passed' is not correct English */
+{
/* No arguments, to cover the 'an == NULL' in is_first_arg_const. */
- /* expect+1: error: argument mismatch: 0 argument passed, 2 expected [150] */
+ /* expect+1: error: argument mismatch: 0 arguments passed, 2 expected [150] */
take_char_ptr(strchr());
}
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.574 src/usr.bin/xlint/lint1/tree.c:1.575
--- src/usr.bin/xlint/lint1/tree.c:1.574 Wed Aug 2 18:51:25 2023
+++ src/usr.bin/xlint/lint1/tree.c Wed Aug 2 18:57:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.574 2023/08/02 18:51:25 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.575 2023/08/02 18:57:54 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.574 2023/08/02 18:51:25 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.575 2023/08/02 18:57:54 rillig Exp $");
#endif
#include <float.h>
@@ -4223,7 +4223,7 @@ check_function_arguments(type_t *ftp, tn
const sym_t *param = ftp->t_params;
if (ftp->t_proto && npar != narg && !(ftp->t_vararg && npar < narg)) {
/* argument mismatch: %d %s passed, %d expected */
- error(150, narg, narg > 1 ? "arguments" : "argument", npar);
+ error(150, narg, narg != 1 ? "arguments" : "argument", npar);
param = NULL;
}
