Module Name: src
Committed By: rillig
Date: Sun Dec 27 14:02:12 UTC 2020
Modified Files:
src/usr.bin/make: nonints.h var.c
Log Message:
make(1): remove unnecessary VPR_ERR_SILENT
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.770 -r1.771 src/usr.bin/make/var.c
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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.184 src/usr.bin/make/nonints.h:1.185
--- src/usr.bin/make/nonints.h:1.184 Sun Dec 27 10:53:23 2020
+++ src/usr.bin/make/nonints.h Sun Dec 27 14:02:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.184 2020/12/27 10:53:23 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.185 2020/12/27 14:02:12 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -325,9 +325,6 @@ typedef enum VarParseResult {
/* Parsing or evaluating failed, with an error message. */
VPR_ERR,
- /* deprecated */
- VPR_ERR_SILENT,
-
/*
* Parsing succeeded, undefined expressions are allowed and the
* expression was still undefined after applying all modifiers.
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.770 src/usr.bin/make/var.c:1.771
--- src/usr.bin/make/var.c:1.770 Sun Dec 27 13:15:43 2020
+++ src/usr.bin/make/var.c Sun Dec 27 14:02:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.770 2020/12/27 13:15:43 rillig Exp $ */
+/* $NetBSD: var.c,v 1.771 2020/12/27 14:02:12 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.770 2020/12/27 13:15:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.771 2020/12/27 14:02:12 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -3754,10 +3754,8 @@ ValidShortVarname(char varname, const ch
return VPR_OK;
}
- if (!opts.strict) {
- /* XXX: Should rather be a parse error with error message. */
- return VPR_ERR_SILENT;
- }
+ if (!opts.strict)
+ return VPR_ERR; /* XXX: Missing error message */
if (varname == '$')
Parse_Error(PARSE_FATAL,
