Module Name: src
Committed By: rillig
Date: Thu Mar 18 21:26:56 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_init.exp d_struct_init_nested.exp
msg_185.c msg_185.exp
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
lint: reword message about type mismatch in initialization
Using parentheses for quotes is unusual, furthermore the previous
message didn't follow proper grammar rules, sacrificing clarity for
brevity.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/d_c99_init.exp
cvs rdiff -u -r1.5 -r1.6 \
src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_185.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_185.exp
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.233 -r1.234 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_c99_init.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.6 src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.7
--- src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.6 Thu Mar 18 20:20:55 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.exp Thu Mar 18 21:26:56 2021
@@ -1,4 +1,4 @@
d_c99_init.c(22): invalid initializer type int [176]
d_c99_init.c(23): too many initializers [174]
-d_c99_init.c(49): initialization type mismatch (pointer to const void) and (struct any) [185]
+d_c99_init.c(49): cannot initialize 'pointer to const void' from 'struct any' [185]
d_c99_init.c(66): too many array initializers, expected 3 [173]
Index: src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp
diff -u src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.5 src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.6
--- src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.5 Mon Feb 22 15:09:50 2021
+++ src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp Thu Mar 18 21:26:56 2021
@@ -1,4 +1,4 @@
-d_struct_init_nested.c(35): initialization type mismatch (enum I1) and (struct Inner1) [185]
+d_struct_init_nested.c(35): cannot initialize 'enum I1' from 'struct Inner1' [185]
d_struct_init_nested.c(37): too many struct/union initializers [172]
-d_struct_init_nested.c(62): initialization type mismatch (enum I1) and (struct Inner2) [185]
+d_struct_init_nested.c(62): cannot initialize 'enum I1' from 'struct Inner2' [185]
d_struct_init_nested.c(64): warning: enum type mismatch between 'enum I2' and 'enum O3' in initialization [210]
Index: src/tests/usr.bin/xlint/lint1/msg_185.c
diff -u src/tests/usr.bin/xlint/lint1/msg_185.c:1.4 src/tests/usr.bin/xlint/lint1/msg_185.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_185.c:1.4 Thu Mar 18 21:20:21 2021
+++ src/tests/usr.bin/xlint/lint1/msg_185.c Thu Mar 18 21:26:56 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: msg_185.c,v 1.4 2021/03/18 21:20:21 rillig Exp $ */
+/* $NetBSD: msg_185.c,v 1.5 2021/03/18 21:26:56 rillig Exp $ */
# 3 "msg_185.c"
-// Test for message: initialization type mismatch (%s) and (%s) [185]
+// Test for message: cannot initialize '%s' from '%s' [185]
typedef struct any {
const void *value;
@@ -15,5 +15,3 @@ initialization_with_redundant_braces(any
any local = { 3.0 }; /* expect: 185 */
use(&arg);
}
-
-// TODO: message 185 needs to be reworded to "cannot initialize '%s' from '%s'".
Index: src/tests/usr.bin/xlint/lint1/msg_185.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_185.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_185.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_185.exp:1.2 Thu Mar 18 21:20:21 2021
+++ src/tests/usr.bin/xlint/lint1/msg_185.exp Thu Mar 18 21:26:56 2021
@@ -1 +1 @@
-msg_185.c(15): initialization type mismatch (pointer to const void) and (double) [185]
+msg_185.c(15): cannot initialize 'pointer to const void' from 'double' [185]
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.87 src/usr.bin/xlint/lint1/err.c:1.88
--- src/usr.bin/xlint/lint1/err.c:1.87 Sun Mar 7 19:42:54 2021
+++ src/usr.bin/xlint/lint1/err.c Thu Mar 18 21:26:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.87 2021/03/07 19:42:54 rillig Exp $ */
+/* $NetBSD: err.c,v 1.88 2021/03/18 21:26:56 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.87 2021/03/07 19:42:54 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.88 2021/03/18 21:26:56 rillig Exp $");
#endif
#include <sys/types.h>
@@ -244,7 +244,7 @@ const char *msgs[] = {
"incompatible pointer types (%s != %s)", /* 182 */
"illegal combination of %s (%s) and %s (%s)", /* 183 */
"illegal pointer combination", /* 184 */
- "initialization type mismatch (%s) and (%s)", /* 185 */
+ "cannot initialize '%s' from '%s'", /* 185 */
"bit-field initialization is illegal in traditional C", /* 186 */
"non-null byte ignored in string initializer", /* 187 */
"no automatic aggregate initialization in traditional C", /* 188 */
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.233 src/usr.bin/xlint/lint1/tree.c:1.234
--- src/usr.bin/xlint/lint1/tree.c:1.233 Wed Mar 17 01:15:31 2021
+++ src/usr.bin/xlint/lint1/tree.c Thu Mar 18 21:26:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.233 2021/03/17 01:15:31 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.234 2021/03/18 21:26:56 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.233 2021/03/17 01:15:31 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.234 2021/03/18 21:26:56 rillig Exp $");
#endif
#include <float.h>
@@ -1661,7 +1661,7 @@ check_assign_types_compatible(op_t op, i
switch (op) {
case INIT:
- /* initialization type mismatch (%s) and (%s) */
+ /* cannot initialize '%s' from '%s' */
error(185, type_name(ltp), type_name(rtp));
break;
case RETURN:
