Module Name: src
Committed By: rillig
Date: Thu Feb 20 19:04:00 UTC 2025
Modified Files:
src/tests/usr.bin/xlint/lint2: msg_000.ln msg_001.ln msg_002.ln
msg_003.ln msg_004.ln msg_005.ln msg_006.ln msg_007.ln msg_008.ln
msg_009.ln msg_010.ln msg_011.ln msg_012.ln msg_013.ln msg_014.ln
msg_015.ln msg_016.ln msg_017.ln msg_018.ln
Log Message:
tests/lint: sync messages in test comments with their counterparts
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint2/msg_000.ln \
src/tests/usr.bin/xlint/lint2/msg_011.ln
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint2/msg_001.ln
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint2/msg_002.ln \
src/tests/usr.bin/xlint/lint2/msg_003.ln \
src/tests/usr.bin/xlint/lint2/msg_004.ln \
src/tests/usr.bin/xlint/lint2/msg_005.ln \
src/tests/usr.bin/xlint/lint2/msg_006.ln \
src/tests/usr.bin/xlint/lint2/msg_008.ln \
src/tests/usr.bin/xlint/lint2/msg_009.ln \
src/tests/usr.bin/xlint/lint2/msg_010.ln \
src/tests/usr.bin/xlint/lint2/msg_012.ln
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint2/msg_007.ln \
src/tests/usr.bin/xlint/lint2/msg_013.ln \
src/tests/usr.bin/xlint/lint2/msg_016.ln
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint2/msg_014.ln \
src/tests/usr.bin/xlint/lint2/msg_015.ln \
src/tests/usr.bin/xlint/lint2/msg_017.ln \
src/tests/usr.bin/xlint/lint2/msg_018.ln
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/lint2/msg_000.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_000.ln:1.5 src/tests/usr.bin/xlint/lint2/msg_000.ln:1.6
--- src/tests/usr.bin/xlint/lint2/msg_000.ln:1.5 Wed Aug 2 18:51:25 2023
+++ src/tests/usr.bin/xlint/lint2/msg_000.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_000.ln,v 1.5 2023/08/02 18:51:25 rillig Exp $
+# $NetBSD: msg_000.ln,v 1.6 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 0 of lint2:
-# %s used( %s ), but not defined
+# %s is used in %s but never defined
#
# Define file number 0.
Index: src/tests/usr.bin/xlint/lint2/msg_011.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_011.ln:1.5 src/tests/usr.bin/xlint/lint2/msg_011.ln:1.6
--- src/tests/usr.bin/xlint/lint2/msg_011.ln:1.5 Sat Nov 30 16:34:27 2024
+++ src/tests/usr.bin/xlint/lint2/msg_011.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_011.ln,v 1.5 2024/11/30 16:34:27 rillig Exp $
+# $NetBSD: msg_011.ln,v 1.6 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 11 of lint2:
-# %s, arg %d declared inconsistently (%s != %s) %s :: %s
+# %s has parameter %d declared as '%s' in %s, versus '%s' in %s
# msg_011_define.c:2: double add(double a, double b) { return a + b; }
0 s msg_011_define.c
Index: src/tests/usr.bin/xlint/lint2/msg_001.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_001.ln:1.6 src/tests/usr.bin/xlint/lint2/msg_001.ln:1.7
--- src/tests/usr.bin/xlint/lint2/msg_001.ln:1.6 Sat Jan 14 08:48:18 2023
+++ src/tests/usr.bin/xlint/lint2/msg_001.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_001.ln,v 1.6 2023/01/14 08:48:18 rillig Exp $
+# $NetBSD: msg_001.ln,v 1.7 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 1 of lint2:
-# %s defined( %s ), but never used
+# %s is defined in %s but never used
#
0 s msg_001.c
Index: src/tests/usr.bin/xlint/lint2/msg_002.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_002.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_002.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_002.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_002.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_002.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_002.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 2 of lint2:
-# %s declared( %s ), but never used or defined
+# %s is declared in %s but never used or defined
#
0 s msg_002.c
Index: src/tests/usr.bin/xlint/lint2/msg_003.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_003.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_003.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_003.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_003.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_003.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_003.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 3 of lint2:
-# %s multiply defined %s :: %s
+# %s has multiple definitions in %s and %s
0 s msg_003_a.c
S msg_003_a.c
Index: src/tests/usr.bin/xlint/lint2/msg_004.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_004.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_004.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_004.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_004.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_004.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_004.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 4 of lint2:
-# %s value used inconsistently %s :: %s
+# %s has its return value used inconsistently by %s and %s
# msg_004_define.c:2: double add(double a, double b) { return a + b; }
0 s msg_004_define.c
Index: src/tests/usr.bin/xlint/lint2/msg_005.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_005.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_005.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_005.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_005.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_005.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_005.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 5 of lint2:
-# %s value declared inconsistently (%s != %s) %s :: %s
+# %s returns '%s' at %s, versus '%s' at %s
# msg_005_define.c:2: double add(double a, double b) { return a + b; }
0 s msg_005_define.c
Index: src/tests/usr.bin/xlint/lint2/msg_006.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_006.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_006.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_006.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_006.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_006.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_006.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 6 of lint2:
-# %s, arg %d used inconsistently %s[%s] :: %s[%s]
+# %s has argument %d with type '%s' at %s, versus '%s' at %s
# msg_006_define.c:2: double add(double a, double b) { return a + b; }
0 s msg_006_define.c
Index: src/tests/usr.bin/xlint/lint2/msg_008.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_008.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_008.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_008.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_008.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_008.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_008.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 8 of lint2:
-# %s returns value which is always ignored
+# %s returns a value that is always ignored
#
0 s msg_008.c
Index: src/tests/usr.bin/xlint/lint2/msg_009.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_009.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_009.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_009.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_009.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_009.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_009.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 9 of lint2:
-# %s returns value which is sometimes ignored
+# %s returns a value that is sometimes ignored
#
0 s msg_009.c
Index: src/tests/usr.bin/xlint/lint2/msg_010.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_010.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_010.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_010.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_010.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_010.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_010.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 10 of lint2:
-# %s value is used( %s ), but none returned
+# %s has its return value used in %s but doesn't return one
#
0 s msg_010.c
Index: src/tests/usr.bin/xlint/lint2/msg_012.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_012.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_012.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_012.ln:1.3 Tue Aug 24 23:38:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_012.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_012.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
+# $NetBSD: msg_012.ln,v 1.4 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 12 of lint2:
-# %s: variable # of args declared %s :: %s
+# %s has %d parameters in %s, versus %d in %s
# msg_012_a.c:2: int add(int, int);
0 s msg_012_a.c
Index: src/tests/usr.bin/xlint/lint2/msg_007.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_007.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_007.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_007.ln:1.2 Sat Nov 30 16:52:19 2024
+++ src/tests/usr.bin/xlint/lint2/msg_007.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_007.ln,v 1.2 2024/11/30 16:52:19 rillig Exp $
+# $NetBSD: msg_007.ln,v 1.3 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 7 of lint2:
-# %s: variable # of args %s :: %s
+# %s has %d parameters in %s, versus %d arguments in %s
#
Index: src/tests/usr.bin/xlint/lint2/msg_013.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_013.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_013.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_013.ln:1.2 Sat Aug 5 09:44:18 2023
+++ src/tests/usr.bin/xlint/lint2/msg_013.ln Thu Feb 20 19:04:00 2025
@@ -1,7 +1,7 @@
-# $NetBSD: msg_013.ln,v 1.2 2023/08/05 09:44:18 rillig Exp $
+# $NetBSD: msg_013.ln,v 1.3 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 13 of lint2:
-# %s: malformed format string %s
+# %s is called with a malformed format string in %s
#
0 s local.c
Index: src/tests/usr.bin/xlint/lint2/msg_016.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_016.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_016.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_016.ln:1.2 Fri Apr 1 01:00:39 2022
+++ src/tests/usr.bin/xlint/lint2/msg_016.ln Thu Feb 20 19:04:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: msg_016.ln,v 1.2 2022/04/01 01:00:39 rillig Exp $
+# $NetBSD: msg_016.ln,v 1.3 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 16 of lint2:
-# %s: too many args for format %s
+# %s is called in %s with too many arguments for format string
#
# TODO: add actual test data
Index: src/tests/usr.bin/xlint/lint2/msg_014.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_014.ln:1.1 src/tests/usr.bin/xlint/lint2/msg_014.ln:1.2
--- src/tests/usr.bin/xlint/lint2/msg_014.ln:1.1 Thu Aug 5 22:36:08 2021
+++ src/tests/usr.bin/xlint/lint2/msg_014.ln Thu Feb 20 19:04:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: msg_014.ln,v 1.1 2021/08/05 22:36:08 rillig Exp $
+# $NetBSD: msg_014.ln,v 1.2 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 14 of lint2:
-# %s, arg %d inconsistent with format %s
+# %s is called in %s with argument %d being incompatible with format string
#
# TODO: add actual test data
Index: src/tests/usr.bin/xlint/lint2/msg_015.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_015.ln:1.1 src/tests/usr.bin/xlint/lint2/msg_015.ln:1.2
--- src/tests/usr.bin/xlint/lint2/msg_015.ln:1.1 Thu Aug 5 22:36:08 2021
+++ src/tests/usr.bin/xlint/lint2/msg_015.ln Thu Feb 20 19:04:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: msg_015.ln,v 1.1 2021/08/05 22:36:08 rillig Exp $
+# $NetBSD: msg_015.ln,v 1.2 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 15 of lint2:
-# %s: too few args for format %s
+# %s is called in %s with too few arguments for format string
#
# TODO: add actual test data
Index: src/tests/usr.bin/xlint/lint2/msg_017.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_017.ln:1.1 src/tests/usr.bin/xlint/lint2/msg_017.ln:1.2
--- src/tests/usr.bin/xlint/lint2/msg_017.ln:1.1 Thu Aug 5 22:36:08 2021
+++ src/tests/usr.bin/xlint/lint2/msg_017.ln Thu Feb 20 19:04:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: msg_017.ln,v 1.1 2021/08/05 22:36:08 rillig Exp $
+# $NetBSD: msg_017.ln,v 1.2 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 17 of lint2:
-# %s function value must be declared before use %s :: %s
+# %s's return type in %s must be declared before use in %s
#
# TODO: add actual test data
Index: src/tests/usr.bin/xlint/lint2/msg_018.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_018.ln:1.1 src/tests/usr.bin/xlint/lint2/msg_018.ln:1.2
--- src/tests/usr.bin/xlint/lint2/msg_018.ln:1.1 Thu Aug 5 22:36:08 2021
+++ src/tests/usr.bin/xlint/lint2/msg_018.ln Thu Feb 20 19:04:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: msg_018.ln,v 1.1 2021/08/05 22:36:08 rillig Exp $
+# $NetBSD: msg_018.ln,v 1.2 2025/02/20 19:04:00 rillig Exp $
#
# Test data for message 18:
-# %s renamed multiple times %s :: %s
+# %s is renamed multiple times in %s and %s
#
# TODO: add actual test data