[src/trunk]: src/usr.bin/make make(1): remove unnecessary VPR_ERR_SILENT

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bcb210d5ed8
branches:  trunk
changeset: 948337:6bcb210d5ed8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 27 14:02:12 2020 +0000

description:
make(1): remove unnecessary VPR_ERR_SILENT

diffstat:

 usr.bin/make/nonints.h |   5 +----
 usr.bin/make/var.c     |  10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r 94e3478bbaff -r 6bcb210d5ed8 usr.bin/make/nonints.h
--- a/usr.bin/make/nonints.h    Sun Dec 27 13:15:43 2020 +0000
+++ b/usr.bin/make/nonints.h    Sun Dec 27 14:02:12 2020 +0000
@@ -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 @@
        /* 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.
diff -r 94e3478bbaff -r 6bcb210d5ed8 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Dec 27 13:15:43 2020 +0000
+++ b/usr.bin/make/var.c        Sun Dec 27 14:02:12 2020 +0000
@@ -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 @@
                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,