Module Name: src
Committed By: rillig
Date: Thu Dec 9 20:13:10 UTC 2021
Modified Files:
src/usr.bin/make: cond.c parse.c suff.c var.c
src/usr.bin/make/unit-tests: directive-else.exp directive-endif.exp
directive-for-null.exp lint.exp var-eval-short.exp
varmod-loop-delete.exp varmod-loop-varname.exp
Log Message:
make: remove period from end of error messages and warnings
The majority of the existing error messages and warnings does not
include a period at the end. Follow this style consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/usr.bin/make/cond.c
cvs rdiff -u -r1.571 -r1.572 src/usr.bin/make/parse.c
cvs rdiff -u -r1.355 -r1.356 src/usr.bin/make/suff.c
cvs rdiff -u -r1.968 -r1.969 src/usr.bin/make/var.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/directive-else.exp \
src/usr.bin/make/unit-tests/varmod-loop-varname.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-endif.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/directive-for-null.exp \
src/usr.bin/make/unit-tests/varmod-loop-delete.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/lint.exp
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/var-eval-short.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.281 src/usr.bin/make/cond.c:1.282
--- src/usr.bin/make/cond.c:1.281 Sun Dec 5 10:11:31 2021
+++ src/usr.bin/make/cond.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.281 2021/12/05 10:11:31 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.281 2021/12/05 10:11:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.282 2021/12/09 20:13:09 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -1211,7 +1211,7 @@ Cond_EvalLine(const char *line)
if (IsEndif(p)) { /* It is an '.endif'. */
if (p[5] != '\0') {
Parse_Error(PARSE_FATAL,
- "The .endif directive does not take arguments.");
+ "The .endif directive does not take arguments");
}
if (cond_depth == cond_min_depth) {
@@ -1242,8 +1242,8 @@ Cond_EvalLine(const char *line)
if (p[2] != '\0')
Parse_Error(PARSE_FATAL,
- "The .else directive "
- "does not take arguments.");
+ "The .else directive "
+ "does not take arguments");
if (cond_depth == cond_min_depth) {
Parse_Error(PARSE_FATAL, "if-less else");
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.571 src/usr.bin/make/parse.c:1.572
--- src/usr.bin/make/parse.c:1.571 Tue Dec 7 23:56:06 2021
+++ src/usr.bin/make/parse.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.571 2021/12/07 23:56:06 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.572 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.571 2021/12/07 23:56:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.572 2021/12/09 20:13:09 rillig Exp $");
/* types and constants */
@@ -2895,7 +2895,7 @@ ParseForLoop(const char *line)
line = ParseGetLine(GLM_FOR_BODY);
if (line == NULL) {
Parse_Error(PARSE_FATAL,
- "Unexpected end of file in for loop.");
+ "Unexpected end of file in .for loop");
break;
}
} while (For_Accum(line));
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.355 src/usr.bin/make/suff.c:1.356
--- src/usr.bin/make/suff.c:1.355 Sun Nov 28 22:48:06 2021
+++ src/usr.bin/make/suff.c Thu Dec 9 20:13:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.355 2021/11/28 22:48:06 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.356 2021/12/09 20:13:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.355 2021/11/28 22:48:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.356 2021/12/09 20:13:09 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -2072,7 +2072,7 @@ Suff_SetNull(const char *name)
Suffix *suff = FindSuffixByName(name);
if (suff == NULL) {
Parse_Error(PARSE_WARNING,
- "Desired null suffix %s not defined.",
+ "Desired null suffix %s not defined",
name);
return;
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.968 src/usr.bin/make/var.c:1.969
--- src/usr.bin/make/var.c:1.968 Tue Dec 7 21:47:21 2021
+++ src/usr.bin/make/var.c Thu Dec 9 20:13:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.968 2021/12/07 21:47:21 rillig Exp $ */
+/* $NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.968 2021/12/07 21:47:21 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.969 2021/12/09 20:13:10 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -498,7 +498,7 @@ Var_Delete(GNode *scope, const char *var
v = he->value;
if (v->inUse) {
Parse_Error(PARSE_FATAL,
- "Cannot delete variable \"%s\" while it is used.",
+ "Cannot delete variable \"%s\" while it is used",
v->name.str);
return;
}
@@ -2449,7 +2449,7 @@ ApplyModifier_Loop(const char **pp, ModC
if (strchr(args.var, '$') != NULL) {
Parse_Error(PARSE_FATAL,
"In the :@ modifier of \"%s\", the variable name \"%s\" "
- "must not contain a dollar.",
+ "must not contain a dollar",
expr->name, args.var);
return AMR_CLEANUP;
}
Index: src/usr.bin/make/unit-tests/directive-else.exp
diff -u src/usr.bin/make/unit-tests/directive-else.exp:1.4 src/usr.bin/make/unit-tests/directive-else.exp:1.5
--- src/usr.bin/make/unit-tests/directive-else.exp:1.4 Mon Dec 14 22:17:11 2020
+++ src/usr.bin/make/unit-tests/directive-else.exp Thu Dec 9 20:13:10 2021
@@ -1,11 +1,11 @@
-make: "directive-else.mk" line 14: The .else directive does not take arguments.
+make: "directive-else.mk" line 14: The .else directive does not take arguments
make: "directive-else.mk" line 15: ok
make: "directive-else.mk" line 19: ok
-make: "directive-else.mk" line 21: The .else directive does not take arguments.
+make: "directive-else.mk" line 21: The .else directive does not take arguments
make: "directive-else.mk" line 26: if-less else
make: "directive-else.mk" line 32: ok
make: "directive-else.mk" line 33: warning: extra else
-make: "directive-else.mk" line 45: The .else directive does not take arguments.
+make: "directive-else.mk" line 45: The .else directive does not take arguments
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-loop-varname.exp
diff -u src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.4 src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.5
--- src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.4 Sun Dec 5 15:01:04 2021
+++ src/usr.bin/make/unit-tests/varmod-loop-varname.exp Thu Dec 9 20:13:10 2021
@@ -1,10 +1,10 @@
-make: "varmod-loop-varname.mk" line 16: In the :@ modifier of "", the variable name "${:Ubar:S,b,v,}" must not contain a dollar.
+make: "varmod-loop-varname.mk" line 16: In the :@ modifier of "", the variable name "${:Ubar:S,b,v,}" must not contain a dollar
make: "varmod-loop-varname.mk" line 16: Malformed conditional (${:Uone two three:@${:Ubar:S,b,v,}@+${var}+@} != "+one+ +two+ +three+")
-make: "varmod-loop-varname.mk" line 85: In the :@ modifier of "1 2 3", the variable name "v$" must not contain a dollar.
+make: "varmod-loop-varname.mk" line 85: In the :@ modifier of "1 2 3", the variable name "v$" must not contain a dollar
make: "varmod-loop-varname.mk" line 85: Malformed conditional (${1 2 3:L:@v$@($v)@} != "(1) (2) (3)")
-make: "varmod-loop-varname.mk" line 90: In the :@ modifier of "1 2 3", the variable name "v$$" must not contain a dollar.
+make: "varmod-loop-varname.mk" line 90: In the :@ modifier of "1 2 3", the variable name "v$$" must not contain a dollar
make: "varmod-loop-varname.mk" line 90: Malformed conditional (${1 2 3:L:@v$$@($v)@} != "() () ()")
-make: "varmod-loop-varname.mk" line 95: In the :@ modifier of "1 2 3", the variable name "v$$$" must not contain a dollar.
+make: "varmod-loop-varname.mk" line 95: In the :@ modifier of "1 2 3", the variable name "v$$$" must not contain a dollar
make: "varmod-loop-varname.mk" line 95: Malformed conditional (${1 2 3:L:@v$$$@($v)@} != "() () ()")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
Index: src/usr.bin/make/unit-tests/directive-endif.exp
diff -u src/usr.bin/make/unit-tests/directive-endif.exp:1.3 src/usr.bin/make/unit-tests/directive-endif.exp:1.4
--- src/usr.bin/make/unit-tests/directive-endif.exp:1.3 Mon Dec 14 21:56:17 2020
+++ src/usr.bin/make/unit-tests/directive-endif.exp Thu Dec 9 20:13:10 2021
@@ -1,7 +1,7 @@
-make: "directive-endif.mk" line 18: The .endif directive does not take arguments.
-make: "directive-endif.mk" line 23: The .endif directive does not take arguments.
-make: "directive-endif.mk" line 33: The .endif directive does not take arguments.
-make: "directive-endif.mk" line 39: The .endif directive does not take arguments.
+make: "directive-endif.mk" line 18: The .endif directive does not take arguments
+make: "directive-endif.mk" line 23: The .endif directive does not take arguments
+make: "directive-endif.mk" line 33: The .endif directive does not take arguments
+make: "directive-endif.mk" line 39: The .endif directive does not take arguments
make: "directive-endif.mk" line 45: Unknown directive "endifx"
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
Index: src/usr.bin/make/unit-tests/directive-for-null.exp
diff -u src/usr.bin/make/unit-tests/directive-for-null.exp:1.1 src/usr.bin/make/unit-tests/directive-for-null.exp:1.2
--- src/usr.bin/make/unit-tests/directive-for-null.exp:1.1 Sat Dec 19 16:00:17 2020
+++ src/usr.bin/make/unit-tests/directive-for-null.exp Thu Dec 9 20:13:10 2021
@@ -1,5 +1,5 @@
make: "(stdin)" line 2: Zero byte read from file
-make: "(stdin)" line 2: Unexpected end of file in for loop.
+make: "(stdin)" line 2: Unexpected end of file in .for loop
make: "(stdin)" line 3: Zero byte read from file
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
Index: src/usr.bin/make/unit-tests/varmod-loop-delete.exp
diff -u src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.1 src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.2
--- src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.1 Sun Dec 5 15:20:13 2021
+++ src/usr.bin/make/unit-tests/varmod-loop-delete.exp Thu Dec 9 20:13:10 2021
@@ -1,4 +1,4 @@
-make: "varmod-loop-delete.mk" line 19: Cannot delete variable "VAR" while it is used.
+make: "varmod-loop-delete.mk" line 19: Cannot delete variable "VAR" while it is used
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/lint.exp
diff -u src/usr.bin/make/unit-tests/lint.exp:1.2 src/usr.bin/make/unit-tests/lint.exp:1.3
--- src/usr.bin/make/unit-tests/lint.exp:1.2 Sun Nov 1 00:24:57 2020
+++ src/usr.bin/make/unit-tests/lint.exp Thu Dec 9 20:13:10 2021
@@ -1,4 +1,4 @@
-make: In the :@ modifier of "VAR", the variable name "${:Ubar:S,b,v,}" must not contain a dollar.
+make: In the :@ modifier of "VAR", the variable name "${:Ubar:S,b,v,}" must not contain a dollar
y@:Q}
xvaluey
exit status 2
Index: src/usr.bin/make/unit-tests/var-eval-short.exp
diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.14 src/usr.bin/make/unit-tests/var-eval-short.exp:1.15
--- src/usr.bin/make/unit-tests/var-eval-short.exp:1.14 Tue Sep 7 20:41:58 2021
+++ src/usr.bin/make/unit-tests/var-eval-short.exp Thu Dec 9 20:13:10 2021
@@ -1,4 +1,4 @@
-make: "var-eval-short.mk" line 41: In the :@ modifier of "", the variable name "${FAIL}" must not contain a dollar.
+make: "var-eval-short.mk" line 41: In the :@ modifier of "", the variable name "${FAIL}" must not contain a dollar
make: "var-eval-short.mk" line 41: Malformed conditional (0 && ${:Uword:@${FAIL}@expr@})
make: "var-eval-short.mk" line 81: Invalid time value: ${FAIL}}
make: "var-eval-short.mk" line 81: Malformed conditional (0 && ${:Uword:gmtime=${FAIL}})
