Module Name: src
Committed By: rillig
Date: Fri Mar 26 23:17:33 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_pr_22119.c d_pr_22119.exp msg_099.c
msg_099.exp
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
lint: add quotes around placeholder in message about undefined variable
Before: error: expected undefined [99]
After: error: 'expected' undefined [99]
Seen in external/mpl/bind, which for Clang defines in stdatomic.h:
> #define atomic_exchange_explicit(obj, desired, order) \
> __c11_atomic_exchange_explicit(obj, expected, order)
Note the mismatch between 'desired' and 'expected'.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/d_pr_22119.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/d_pr_22119.exp
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_099.c \
src/tests/usr.bin/xlint/lint1/msg_099.exp
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.250 -r1.251 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/d_pr_22119.c
diff -u src/tests/usr.bin/xlint/lint1/d_pr_22119.c:1.1 src/tests/usr.bin/xlint/lint1/d_pr_22119.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_pr_22119.c:1.1 Sun Feb 28 22:12:16 2021
+++ src/tests/usr.bin/xlint/lint1/d_pr_22119.c Fri Mar 26 23:17:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_pr_22119.c,v 1.1 2021/02/28 22:12:16 rillig Exp $ */
+/* $NetBSD: d_pr_22119.c,v 1.2 2021/03/26 23:17:33 rillig Exp $ */
# 3 "d_pr_22119.c"
/*
@@ -13,6 +13,6 @@ func1(void)
{
void (*f1)(void);
- f1 = (void (*)(void))p; /* expect: p undefined [99] */
+ f1 = (void (*)(void))p; /* expect: 'p' undefined [99] */
f1 = (void *()(void))p; /* crash before 2021-02-28 */
}
Index: src/tests/usr.bin/xlint/lint1/d_pr_22119.exp
diff -u src/tests/usr.bin/xlint/lint1/d_pr_22119.exp:1.2 src/tests/usr.bin/xlint/lint1/d_pr_22119.exp:1.3
--- src/tests/usr.bin/xlint/lint1/d_pr_22119.exp:1.2 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/d_pr_22119.exp Fri Mar 26 23:17:33 2021
@@ -1 +1 @@
-d_pr_22119.c(16): error: p undefined [99]
+d_pr_22119.c(16): error: 'p' undefined [99]
Index: src/tests/usr.bin/xlint/lint1/msg_099.c
diff -u src/tests/usr.bin/xlint/lint1/msg_099.c:1.3 src/tests/usr.bin/xlint/lint1/msg_099.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_099.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_099.c Fri Mar 26 23:17:33 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_099.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_099.c,v 1.4 2021/03/26 23:17:33 rillig Exp $ */
# 3 "msg_099.c"
-// Test for message: %s undefined [99]
+// Test for message: '%s' undefined [99]
void
example(int defined_variable)
Index: src/tests/usr.bin/xlint/lint1/msg_099.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_099.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_099.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_099.exp:1.3 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/msg_099.exp Fri Mar 26 23:17:33 2021
@@ -1 +1 @@
-msg_099.c(10): error: undefined_variable undefined [99]
+msg_099.c(10): error: 'undefined_variable' undefined [99]
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.94 src/usr.bin/xlint/lint1/err.c:1.95
--- src/usr.bin/xlint/lint1/err.c:1.94 Fri Mar 26 21:05:27 2021
+++ src/usr.bin/xlint/lint1/err.c Fri Mar 26 23:17:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.94 2021/03/26 21:05:27 rillig Exp $ */
+/* $NetBSD: err.c,v 1.95 2021/03/26 23:17:33 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.94 2021/03/26 21:05:27 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.95 2021/03/26 23:17:33 rillig Exp $");
#endif
#include <sys/types.h>
@@ -153,7 +153,7 @@ const char *msgs[] = {
"cannot dereference non-pointer type", /* 96 */
"suffix U is illegal in traditional C", /* 97 */
"suffixes F and L are illegal in traditional C", /* 98 */
- "%s undefined", /* 99 */
+ "'%s' undefined", /* 99 */
"unary + is illegal in traditional C", /* 100 */
"undefined struct/union member: %s", /* 101 */
"illegal member use: %s", /* 102 */
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.250 src/usr.bin/xlint/lint1/tree.c:1.251
--- src/usr.bin/xlint/lint1/tree.c:1.250 Fri Mar 26 20:31:07 2021
+++ src/usr.bin/xlint/lint1/tree.c Fri Mar 26 23:17:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.250 2021/03/26 20:31:07 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.251 2021/03/26 23:17:33 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.250 2021/03/26 20:31:07 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.251 2021/03/26 23:17:33 rillig Exp $");
#endif
#include <float.h>
@@ -246,7 +246,7 @@ fallback_symbol(sym_t *sym)
return;
}
- /* %s undefined */
+ /* '%s' undefined */
error(99, sym->s_name);
}
