Module Name:    src
Committed By:   rillig
Date:           Fri Aug 27 20:49:26 UTC 2021

Modified Files:
        src/tests/usr.bin/xlint/lint1: msg_222.c msg_222.exp msg_226.c
            msg_226.exp msg_233.c msg_233.exp msg_235.c msg_235.exp msg_252.c
            msg_252.exp msg_257.c msg_257.exp msg_289.c msg_289.exp msg_297.c
            msg_297.exp

Log Message:
tests/lint: test some more messages


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_222.c \
    src/tests/usr.bin/xlint/lint1/msg_222.exp \
    src/tests/usr.bin/xlint/lint1/msg_226.c \
    src/tests/usr.bin/xlint/lint1/msg_226.exp \
    src/tests/usr.bin/xlint/lint1/msg_233.c \
    src/tests/usr.bin/xlint/lint1/msg_233.exp \
    src/tests/usr.bin/xlint/lint1/msg_235.c \
    src/tests/usr.bin/xlint/lint1/msg_235.exp \
    src/tests/usr.bin/xlint/lint1/msg_252.c \
    src/tests/usr.bin/xlint/lint1/msg_252.exp \
    src/tests/usr.bin/xlint/lint1/msg_257.c \
    src/tests/usr.bin/xlint/lint1/msg_257.exp \
    src/tests/usr.bin/xlint/lint1/msg_289.c \
    src/tests/usr.bin/xlint/lint1/msg_289.exp \
    src/tests/usr.bin/xlint/lint1/msg_297.c \
    src/tests/usr.bin/xlint/lint1/msg_297.exp

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_222.c
diff -u src/tests/usr.bin/xlint/lint1/msg_222.c:1.2 src/tests/usr.bin/xlint/lint1/msg_222.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_222.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_222.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,31 @@
-/*	$NetBSD: msg_222.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_222.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_222.c"
 
 // Test for message: conversion of negative constant to unsigned type [222]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: warning: initialization of unsigned with negative constant [221] */
+unsigned int global = -1;
+
+void take_unsigned_int(unsigned int);
+
+void
+function(void)
+{
+	/* expect+1: warning: initialization of unsigned with negative constant [221] */
+	unsigned int local = -1;
+
+	/* expect+1: warning: conversion of negative constant to unsigned type, arg #1 [296] */
+	take_unsigned_int(-1);
+
+	if (local & -1)
+		return;
+
+	/* expect+1: warning: comparison of unsigned int with negative constant, op < [162] */
+	if (local < -1)
+		return;
+
+	local &= -1;
+
+	/* expect+1: warning: conversion of negative constant to unsigned type [222] */
+	local += -1;
+}
Index: src/tests/usr.bin/xlint/lint1/msg_222.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_222.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_222.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_222.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_222.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1,5 @@
-msg_222.c(6): error: syntax error ':' [249]
+msg_222.c(7): warning: initialization of unsigned with negative constant [221]
+msg_222.c(15): warning: initialization of unsigned with negative constant [221]
+msg_222.c(18): warning: conversion of negative constant to unsigned type, arg #1 [296]
+msg_222.c(24): warning: comparison of unsigned int with negative constant, op < [162]
+msg_222.c(30): warning: conversion of negative constant to unsigned type [222]
Index: src/tests/usr.bin/xlint/lint1/msg_226.c
diff -u src/tests/usr.bin/xlint/lint1/msg_226.c:1.2 src/tests/usr.bin/xlint/lint1/msg_226.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_226.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_226.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: msg_226.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_226.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_226.c"
 
 // Test for message: static variable %s unused [226]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: warning: static variable unused unused [226] */
+static int unused;
Index: src/tests/usr.bin/xlint/lint1/msg_226.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_226.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_226.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_226.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_226.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1 @@
-msg_226.c(6): error: syntax error ':' [249]
+msg_226.c(7): warning: static variable unused unused [226]
Index: src/tests/usr.bin/xlint/lint1/msg_233.c
diff -u src/tests/usr.bin/xlint/lint1/msg_233.c:1.2 src/tests/usr.bin/xlint/lint1/msg_233.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_233.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_233.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: msg_233.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_233.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_233.c"
 
 // Test for message: struct %s never defined [233]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: warning: struct declared_but_not_defined never defined [233] */
+struct declared_but_not_defined;
Index: src/tests/usr.bin/xlint/lint1/msg_233.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_233.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_233.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_233.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_233.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1 @@
-msg_233.c(6): error: syntax error ':' [249]
+msg_233.c(7): warning: struct declared_but_not_defined never defined [233]
Index: src/tests/usr.bin/xlint/lint1/msg_235.c
diff -u src/tests/usr.bin/xlint/lint1/msg_235.c:1.2 src/tests/usr.bin/xlint/lint1/msg_235.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_235.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_235.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: msg_235.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_235.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_235.c"
 
 // Test for message: enum %s never defined [235]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: warning: enum declared_but_not_defined never defined [235] */
+enum declared_but_not_defined;
Index: src/tests/usr.bin/xlint/lint1/msg_235.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_235.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_235.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_235.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_235.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1 @@
-msg_235.c(6): error: syntax error ':' [249]
+msg_235.c(7): warning: enum declared_but_not_defined never defined [235]
Index: src/tests/usr.bin/xlint/lint1/msg_252.c
diff -u src/tests/usr.bin/xlint/lint1/msg_252.c:1.2 src/tests/usr.bin/xlint/lint1/msg_252.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_252.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_252.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: msg_252.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_252.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_252.c"
 
 // Test for message: integer constant out of range [252]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: warning: integer constant out of range [252] */
+int constant = 1111111111111111111111111111111111111111111111111111;
Index: src/tests/usr.bin/xlint/lint1/msg_252.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_252.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_252.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_252.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_252.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1 @@
-msg_252.c(6): error: syntax error ':' [249]
+msg_252.c(7): warning: integer constant out of range [252]
Index: src/tests/usr.bin/xlint/lint1/msg_257.c
diff -u src/tests/usr.bin/xlint/lint1/msg_257.c:1.2 src/tests/usr.bin/xlint/lint1/msg_257.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_257.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_257.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,28 @@
-/*	$NetBSD: msg_257.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_257.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_257.c"
 
 // Test for message: extra characters in lint comment [257]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+void take(const void *);
+
+/* expect+1: warning: extra characters in lint comment [257] */
+/* FALLTHROUGH 3 */
+
+/* expect+1: warning: extra characters in lint comment [257] */
+/* FALLTHROUGH extra */
+
+/* PRINTFLIKE 7 */
+void
+my_printf(const char *fmt)
+/* expect+1: warning: argument number mismatch with directive: */
+{
+	take(fmt);
+}
+
+/* expect+1: warning: extra characters in lint comment [257] */
+/* SCANFLIKE extra */
+void
+my_scanf(const char *fmt)
+{
+	take(fmt);
+}
Index: src/tests/usr.bin/xlint/lint1/msg_257.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_257.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_257.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_257.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_257.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1,4 @@
-msg_257.c(6): error: syntax error ':' [249]
+msg_257.c(9): warning: extra characters in lint comment [257]
+msg_257.c(12): warning: extra characters in lint comment [257]
+msg_257.c(18): warning: argument number mismatch with directive: /* PRINTFLIKE */ [283]
+msg_257.c(23): warning: extra characters in lint comment [257]
Index: src/tests/usr.bin/xlint/lint1/msg_289.c
diff -u src/tests/usr.bin/xlint/lint1/msg_289.c:1.2 src/tests/usr.bin/xlint/lint1/msg_289.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_289.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_289.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,11 @@
-/*	$NetBSD: msg_289.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_289.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_289.c"
 
 // Test for message: can't be used together: /* PRINTFLIKE */ /* SCANFLIKE */ [289]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* PRINTFLIKE */ /* SCANFLIKE */
+void
+both(void)
+/* expect+1: warning: can't be used together */
+{
+}
Index: src/tests/usr.bin/xlint/lint1/msg_289.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_289.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_289.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_289.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_289.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1 @@
-msg_289.c(6): error: syntax error ':' [249]
+msg_289.c(10): warning: can't be used together: /* PRINTFLIKE */ /* SCANFLIKE */ [289]
Index: src/tests/usr.bin/xlint/lint1/msg_297.c
diff -u src/tests/usr.bin/xlint/lint1/msg_297.c:1.2 src/tests/usr.bin/xlint/lint1/msg_297.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_297.c:1.2	Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_297.c	Fri Aug 27 20:49:25 2021
@@ -1,7 +1,24 @@
-/*	$NetBSD: msg_297.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_297.c,v 1.3 2021/08/27 20:49:25 rillig Exp $	*/
 # 3 "msg_297.c"
 
 // Test for message: conversion to '%s' may sign-extend incorrectly, arg #%d [297]
 
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* lint1-extra-flags: -P -a -p */
+
+void take_unsigned_long_long(unsigned long long);
+void take_long_long(long long);
+
+void
+caller(signed int si, unsigned int ui)
+{
+
+	/* expect+1: warning: conversion to 'unsigned long long' may sign-extend incorrectly, arg #1 [297] */
+	take_unsigned_long_long(si);
+
+	take_unsigned_long_long(ui);
+
+	take_long_long(si);
+
+	/* expect+1: warning: conversion to 'long long' may sign-extend incorrectly, arg #1 [297] */
+	take_long_long(ui);
+}
Index: src/tests/usr.bin/xlint/lint1/msg_297.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_297.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_297.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_297.exp:1.2	Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_297.exp	Fri Aug 27 20:49:25 2021
@@ -1 +1,2 @@
-msg_297.c(6): error: syntax error ':' [249]
+msg_297.c(16): warning: conversion to 'unsigned long long' may sign-extend incorrectly, arg #1 [297]
+msg_297.c(23): warning: conversion to 'long long' may sign-extend incorrectly, arg #1 [297]

Reply via email to