Module Name: src
Committed By: rillig
Date: Tue Aug 3 18:44:33 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: c11_generic_expression.exp
d_c99_bool_strict_syshdr.exp d_fold_test.exp expr_cast.c
expr_cast.exp msg_096.exp msg_109.exp msg_126.exp msg_170.exp
msg_204.exp msg_214.c msg_214.exp msg_343.exp
src/usr.bin/xlint/lint1: err.c func.c
Log Message:
lint: add quotes around placeholder in message 214
function '%s' expects to return value
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp
cvs rdiff -u -r1.9 -r1.10 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_fold_test.exp \
src/tests/usr.bin/xlint/lint1/msg_096.exp \
src/tests/usr.bin/xlint/lint1/msg_109.exp \
src/tests/usr.bin/xlint/lint1/msg_170.exp \
src/tests/usr.bin/xlint/lint1/msg_343.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/expr_cast.c \
src/tests/usr.bin/xlint/lint1/expr_cast.exp
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_126.exp \
src/tests/usr.bin/xlint/lint1/msg_204.exp
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_214.c \
src/tests/usr.bin/xlint/lint1/msg_214.exp
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.118 -r1.119 src/usr.bin/xlint/lint1/func.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/c11_generic_expression.exp
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.7 src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.8
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.7 Sun Jul 11 20:37:21 2021
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp Tue Aug 3 18:44:33 2021
@@ -1,4 +1,4 @@
-c11_generic_expression.c(29): warning: function classify_type_without_default expects to return value [214]
+c11_generic_expression.c(29): warning: function 'classify_type_without_default' expects to return value [214]
c11_generic_expression.c(21): warning: argument 'var' unused in function 'classify_type_without_default' [231]
c11_generic_expression.c(37): warning: argument 'var' unused in function 'classify_type_with_default' [231]
c11_generic_expression.c(53): warning: argument 'c' unused in function 'classify_char' [231]
Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.9 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.10
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.9 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp Tue Aug 3 18:44:33 2021
@@ -3,4 +3,4 @@ d_c99_bool_strict_syshdr.c(53): error: c
d_c99_bool_strict_syshdr.c(87): error: operands of '=' have incompatible types (_Bool != int) [107]
d_c99_bool_strict_syshdr.c(162): error: return value type mismatch (_Bool) and (int) [211]
d_c99_bool_strict_syshdr.c(175): error: operand of '!' must be bool, not 'int' [330]
-d_c99_bool_strict_syshdr.c(175): warning: function str_equal_bad expects to return value [214]
+d_c99_bool_strict_syshdr.c(175): warning: function 'str_equal_bad' expects to return value [214]
Index: src/tests/usr.bin/xlint/lint1/d_fold_test.exp
diff -u src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.4 src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.5
--- src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.4 Fri Apr 9 20:12:00 2021
+++ src/tests/usr.bin/xlint/lint1/d_fold_test.exp Tue Aug 3 18:44:33 2021
@@ -10,5 +10,5 @@ d_fold_test.c(66): warning: argument 's'
d_fold_test.c(67): error: controlling expressions must have scalar type [204]
d_fold_test.c(67): warning: argument 's' unused in function 'do_while_struct' [231]
d_fold_test.c(70): error: first operand must have scalar type, op ? : [170]
-d_fold_test.c(70): warning: function conditional_struct expects to return value [214]
+d_fold_test.c(70): warning: function 'conditional_struct' expects to return value [214]
d_fold_test.c(70): warning: argument 's' unused in function 'conditional_struct' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_096.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_096.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_096.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_096.exp:1.4 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_096.exp Tue Aug 3 18:44:33 2021
@@ -1,3 +1,3 @@
msg_096.c(21): error: cannot dereference non-pointer type [96]
-msg_096.c(21): warning: function unary_asterisk expects to return value [214]
+msg_096.c(21): warning: function 'unary_asterisk' expects to return value [214]
msg_096.c(19): warning: argument 'i' unused in function 'unary_asterisk' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_109.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_109.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_109.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_109.exp:1.4 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_109.exp Tue Aug 3 18:44:33 2021
@@ -1,3 +1,3 @@
msg_109.c(9): error: void type illegal in expression [109]
-msg_109.c(9): warning: function example expects to return value [214]
+msg_109.c(9): warning: function 'example' expects to return value [214]
msg_109.c(7): warning: argument 'arg' unused in function 'example' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_170.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_170.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_170.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_170.exp:1.4 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_170.exp Tue Aug 3 18:44:33 2021
@@ -1,3 +1,3 @@
msg_170.c(13): error: first operand must have scalar type, op ? : [170]
-msg_170.c(13): warning: function example expects to return value [214]
+msg_170.c(13): warning: function 'example' expects to return value [214]
msg_170.c(11): warning: argument 'num' unused in function 'example' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_343.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_343.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_343.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_343.exp:1.4 Thu Jul 15 21:00:05 2021
+++ src/tests/usr.bin/xlint/lint1/msg_343.exp Tue Aug 3 18:44:33 2021
@@ -3,6 +3,6 @@ msg_343.c(12): error: syntax error '3' [
msg_343.c(27): error: static array size is a C11 extension [343]
msg_343.c(34): error: syntax error '3' [249]
msg_343.c(38): error: cannot dereference non-pointer type [96]
-msg_343.c(38): warning: function returns_volatile_int_array expects to return value [214]
+msg_343.c(38): warning: function 'returns_volatile_int_array' expects to return value [214]
msg_343.c(47): error: syntax error ']' [249]
msg_343.c(47): error: static array size is a C11 extension [343]
Index: src/tests/usr.bin/xlint/lint1/expr_cast.c
diff -u src/tests/usr.bin/xlint/lint1/expr_cast.c:1.2 src/tests/usr.bin/xlint/lint1/expr_cast.c:1.3
--- src/tests/usr.bin/xlint/lint1/expr_cast.c:1.2 Tue Aug 3 18:38:02 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.c Tue Aug 3 18:44:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: expr_cast.c,v 1.2 2021/08/03 18:38:02 rillig Exp $ */
+/* $NetBSD: expr_cast.c,v 1.3 2021/08/03 18:44:33 rillig Exp $ */
# 3 "expr_cast.c"
/*
@@ -28,6 +28,6 @@ cast(void)
};
/* expect+2: error: invalid cast from 'struct S' to 'struct S' [147] */
- /* expect+1: warning: function cast expects to return value [214] */
+ /* expect+1: warning: function 'cast' expects to return value [214] */
return (struct S)local;
}
Index: src/tests/usr.bin/xlint/lint1/expr_cast.exp
diff -u src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.2 src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.3
--- src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.2 Tue Aug 3 18:38:02 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.exp Tue Aug 3 18:44:33 2021
@@ -1,2 +1,2 @@
expr_cast.c(32): error: invalid cast from 'struct S' to 'struct S' [147]
-expr_cast.c(32): warning: function cast expects to return value [214]
+expr_cast.c(32): warning: function 'cast' expects to return value [214]
Index: src/tests/usr.bin/xlint/lint1/msg_126.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_126.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_126.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_126.exp:1.5 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_126.exp Tue Aug 3 18:44:33 2021
@@ -1,5 +1,5 @@
msg_126.c(9): error: incompatible types 'pointer to void' and 'double' in conditional [126]
-msg_126.c(9): warning: function max expects to return value [214]
+msg_126.c(9): warning: function 'max' expects to return value [214]
msg_126.c(7): warning: argument 'cond' unused in function 'max' [231]
msg_126.c(7): warning: argument 'ptr' unused in function 'max' [231]
msg_126.c(7): warning: argument 'dbl' unused in function 'max' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_204.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_204.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_204.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_204.exp:1.5 Fri Apr 9 20:12:01 2021
+++ src/tests/usr.bin/xlint/lint1/msg_204.exp Tue Aug 3 18:44:33 2021
@@ -10,5 +10,5 @@ msg_204.c(94): warning: argument 's' unu
msg_204.c(95): error: controlling expressions must have scalar type [204]
msg_204.c(95): warning: argument 's' unused in function 'do_while_struct' [231]
msg_204.c(101): error: first operand must have scalar type, op ? : [170]
-msg_204.c(101): warning: function conditional_struct expects to return value [214]
+msg_204.c(101): warning: function 'conditional_struct' expects to return value [214]
msg_204.c(101): warning: argument 's' unused in function 'conditional_struct' [231]
Index: src/tests/usr.bin/xlint/lint1/msg_214.c
diff -u src/tests/usr.bin/xlint/lint1/msg_214.c:1.3 src/tests/usr.bin/xlint/lint1/msg_214.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_214.c:1.3 Tue Aug 3 18:38:02 2021
+++ src/tests/usr.bin/xlint/lint1/msg_214.c Tue Aug 3 18:44:33 2021
@@ -1,12 +1,11 @@
-/* $NetBSD: msg_214.c,v 1.3 2021/08/03 18:38:02 rillig Exp $ */
+/* $NetBSD: msg_214.c,v 1.4 2021/08/03 18:44:33 rillig Exp $ */
# 3 "msg_214.c"
-// Test for message: function %s expects to return value [214]
+// Test for message: function '%s' expects to return value [214]
int
int_function(void)
{
- /* TODO: add quotes around '%s' */
- /* expect+1: warning: function int_function expects to return value [214] */
+ /* expect+1: warning: function 'int_function' expects to return value [214] */
return;
}
Index: src/tests/usr.bin/xlint/lint1/msg_214.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_214.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_214.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_214.exp:1.3 Tue Aug 3 18:38:02 2021
+++ src/tests/usr.bin/xlint/lint1/msg_214.exp Tue Aug 3 18:44:33 2021
@@ -1 +1 @@
-msg_214.c(11): warning: function int_function expects to return value [214]
+msg_214.c(10): warning: function 'int_function' expects to return value [214]
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.132 src/usr.bin/xlint/lint1/err.c:1.133
--- src/usr.bin/xlint/lint1/err.c:1.132 Sat Jul 31 19:07:52 2021
+++ src/usr.bin/xlint/lint1/err.c Tue Aug 3 18:44:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.132 2021/07/31 19:07:52 rillig Exp $ */
+/* $NetBSD: err.c,v 1.133 2021/08/03 18:44: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.132 2021/07/31 19:07:52 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.133 2021/08/03 18:44:33 rillig Exp $");
#endif
#include <sys/types.h>
@@ -268,7 +268,7 @@ const char *const msgs[] = {
"return value type mismatch (%s) and (%s)", /* 211 */
"cannot return incomplete type", /* 212 */
"void function %s cannot return value", /* 213 */
- "function %s expects to return value", /* 214 */
+ "function '%s' expects to return value", /* 214 */
"function '%s' implicitly declared to return int", /* 215 */
"function %s has return (e); and return;", /* 216 */
"function %s falls off bottom without returning value", /* 217 */
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.118 src/usr.bin/xlint/lint1/func.c:1.119
--- src/usr.bin/xlint/lint1/func.c:1.118 Sun Aug 1 06:40:37 2021
+++ src/usr.bin/xlint/lint1/func.c Tue Aug 3 18:44:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.118 2021/08/01 06:40:37 rillig Exp $ */
+/* $NetBSD: func.c,v 1.119 2021/08/03 18:44:33 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.118 2021/08/01 06:40:37 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.119 2021/08/03 18:44:33 rillig Exp $");
#endif
#include <stdlib.h>
@@ -1080,7 +1080,7 @@ do_return(tnode_t *tn)
* is explicitly declared.
*/
if (!funcsym->s_return_type_implicit_int)
- /* function %s expects to return value */
+ /* function '%s' expects to return value */
warning(214, funcsym->s_name);
}
