CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Oct 25 19:11:31 UTC 2020

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

Log Message:
make(1): reduce duplicate code in VarFind


To generate a diff of this commit:
cvs rdiff -u -r1.586 -r1.587 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.586 src/usr.bin/make/var.c:1.587
--- src/usr.bin/make/var.c:1.586	Sun Oct 25 17:01:05 2020
+++ src/usr.bin/make/var.c	Sun Oct 25 19:11:30 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.586 2020/10/25 17:01:05 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.587 2020/10/25 19:11:30 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
 #include    "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.586 2020/10/25 17:01:05 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.587 2020/10/25 19:11:30 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -331,6 +331,12 @@ CanonicalVarname(const char *name)
     return name;
 }
 
+static Var *
+GNode_FindVar(GNode *ctxt, const char *varname, unsigned int hash)
+{
+    return Hash_FindValueHash(&ctxt->context, varname, hash);
+}
+
 /*-
  *-----------------------------------------------------------------------
  * VarFind --
@@ -369,18 +375,18 @@ VarFind(const char *name, GNode *ctxt, V
      * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
      * depending on the FIND_* flags in 'flags'
      */
-    var = Hash_FindValueHash(&ctxt->context, name, nameHash);
+    var = GNode_FindVar(ctxt, name, nameHash);
 
     if (var == NULL && (flags & FIND_CMD) && ctxt != VAR_CMD)
-	var = Hash_FindValueHash(&VAR_CMD->context, name, nameHash);
+	var = GNode_FindVar(VAR_CMD, name, nameHash);
 
     if (!checkEnvFirst && var == NULL && (flags & FIND_GLOBAL) &&
 	ctxt != VAR_GLOBAL)
     {
-	var = Hash_FindValueHash(&VAR_GLOBAL->context, name, nameHash);
+	var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	if (var == NULL && ctxt != VAR_INTERNAL) {
 	    /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
-	    var = Hash_FindValueHash(&VAR_INTERNAL->context, name, nameHash);
+	    var = GNode_FindVar(VAR_INTERNAL, name, nameHash);
 	}
     }
 
@@ -393,9 +399,9 @@ VarFind(const char *name, GNode *ctxt, V
 	}
 
 	if (checkEnvFirst && (flags & FIND_GLOBAL) && ctxt != VAR_GLOBAL) {
-	    var = Hash_FindValueHash(&VAR_GLOBAL->context, name, nameHash);
+	    var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	    if (var == NULL && ctxt != VAR_INTERNAL)
-		var = Hash_FindValueHash(&VAR_INTERNAL->context, name, nameHash);
+		var = GNode_FindVar(VAR_INTERNAL, name, nameHash);
 	    return var;
 	}