Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make: remove unsatisfiable condition in VarSubs...



details:   https://anonhg.NetBSD.org/src/rev/0421c1bd6eea
branches:  trunk
changeset: 359815:0421c1bd6eea
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Jan 24 20:54:54 2022 +0000

description:
make: remove unsatisfiable condition in VarSubstExpr

At that point, emode can have only 2 values, none of which is
VARE_UNDEFERR.

No binary change since GCC had figured this out all the time, it just
didn't reveal this little secret.

diffstat:

 usr.bin/make/var.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 903390a95cb3 -r 0421c1bd6eea usr.bin/make/var.c
--- a/usr.bin/make/var.c        Mon Jan 24 20:49:55 2022 +0000
+++ b/usr.bin/make/var.c        Mon Jan 24 20:54:54 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $        */
+/*     $NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -4626,7 +4626,7 @@
        if (val.str == var_Error || val.str == varUndefined) {
                if (!VarEvalMode_ShouldKeepUndef(emode)) {
                        p = nested_p;
-               } else if (emode == VARE_UNDEFERR || val.str == var_Error) {
+               } else if (val.str == var_Error) {
 
                        /*
                         * XXX: This condition is wrong.  If val == var_Error,



Home | Main Index | Thread Index | Old Index