Module Name: src
Committed By: rillig
Date: Tue Mar 30 15:10:46 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_init.exp
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: reword message for very unlikely .member in array initialization
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/xlint/lint1/d_c99_init.exp
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/xlint/lint1/init.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_c99_init.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.18 src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.19
--- src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.18 Tue Mar 30 15:05:05 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.exp Tue Mar 30 15:10:46 2021
@@ -2,7 +2,7 @@ d_c99_init.c(23): error: too many initia
d_c99_init.c(63): error: cannot initialize 'pointer to const void' from 'struct any' [185]
d_c99_init.c(80): error: too many array initializers, expected 3 [173]
d_c99_init.c(139): error: too many struct/union initializers [172]
-d_c99_init.c(145): error: syntax error 'named member must only be used with struct/union' [249]
+d_c99_init.c(145): error: syntax error 'designator '.member' is only for struct/union' [249]
d_c99_init.c(232): error: too many struct/union initializers [172]
d_c99_init.c(238): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
d_c99_init.c(242): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.180 src/usr.bin/xlint/lint1/init.c:1.181
--- src/usr.bin/xlint/lint1/init.c:1.180 Tue Mar 30 15:07:53 2021
+++ src/usr.bin/xlint/lint1/init.c Tue Mar 30 15:10:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.180 2021/03/30 15:07:53 rillig Exp $ */
+/* $NetBSD: init.c,v 1.181 2021/03/30 15:10:46 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.180 2021/03/30 15:07:53 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.181 2021/03/30 15:10:46 rillig Exp $");
#endif
#include <stdlib.h>
@@ -452,10 +452,9 @@ designator_look_up(const struct designat
return look_up_member_type(tp, dr->dr_name);
case ARRAY:
if (dr->dr_name != NULL) {
- /* TODO: reword; kept for compatibility */
/* syntax error '%s' */
error(249,
- "named member must only be used with struct/union");
+ "designator '.member' is only for struct/union");
}
return tp->t_subt;
default:
