CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Fri Oct 30 07:47:11 UTC 2020

Modified Files:
        src/usr.bin/make: var.c

Log Message:
make(1): remove redundant evaluations in VarFind


To generate a diff of this commit:
cvs rdiff -u -r1.596 -r1.597 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/var.c
diff -u src/usr.bin/make/var.c:1.596 src/usr.bin/make/var.c:1.597
--- src/usr.bin/make/var.c:1.596	Fri Oct 30 07:37:30 2020
+++ src/usr.bin/make/var.c	Fri Oct 30 07:47:11 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.596 2020/10/30 07:37:30 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.597 2020/10/30 07:47:11 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
 #include    "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.596 2020/10/30 07:37:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.597 2020/10/30 07:47:11 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -377,11 +377,13 @@ VarFind(const char *name, GNode *ctxt, B
      * depending on the FIND_* flags in 'flags'
      */
     var = GNode_FindVar(ctxt, name, nameHash);
+    if (!elsewhere)
+        return var;
 
-    if (var == NULL && elsewhere && ctxt != VAR_CMDLINE)
+    if (var == NULL && ctxt != VAR_CMDLINE)
 	var = GNode_FindVar(VAR_CMDLINE, name, nameHash);
 
-    if (!opts.checkEnvFirst && var == NULL && elsewhere && ctxt != VAR_GLOBAL) {
+    if (!opts.checkEnvFirst && var == NULL && ctxt != VAR_GLOBAL) {
 	var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	if (var == NULL && ctxt != VAR_INTERNAL) {
 	    /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
@@ -389,7 +391,7 @@ VarFind(const char *name, GNode *ctxt, B
 	}
     }
 
-    if (var == NULL && elsewhere) {
+    if (var == NULL) {
 	char *env;
 
 	if ((env = getenv(name)) != NULL) {
@@ -397,7 +399,7 @@ VarFind(const char *name, GNode *ctxt, B
 	    return VarNew(varname, varname, env, VAR_FROM_ENV);
 	}
 
-	if (opts.checkEnvFirst && elsewhere && ctxt != VAR_GLOBAL) {
+	if (opts.checkEnvFirst && ctxt != VAR_GLOBAL) {
 	    var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	    if (var == NULL && ctxt != VAR_INTERNAL)
 		var = GNode_FindVar(VAR_INTERNAL, name, nameHash);