CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Tue Nov 24 21:42:28 UTC 2020

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

Log Message:
make(1): rename local variable in ApplyModifier_Assign


To generate a diff of this commit:
cvs rdiff -u -r1.695 -r1.696 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.695 src/usr.bin/make/var.c:1.696
--- src/usr.bin/make/var.c:1.695	Mon Nov 23 23:41:11 2020
+++ src/usr.bin/make/var.c	Tue Nov 24 21:42:28 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.695 2020/11/23 23:41:11 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.696 2020/11/24 21:42:28 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.695 2020/11/23 23:41:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.696 2020/11/24 21:42:28 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2952,7 +2952,7 @@ ApplyModifier_IfElse(const char **pp, Ap
 static ApplyModifierResult
 ApplyModifier_Assign(const char **pp, ApplyModifiersState *st)
 {
-    GNode *v_ctxt;
+    GNode *ctxt;
     char delim;
     char *val;
     VarParseResult res;
@@ -2972,11 +2972,11 @@ ok:
 	return AMR_BAD;
     }
 
-    v_ctxt = st->ctxt;		/* context where v belongs */
+	ctxt = st->ctxt;		/* context where v belongs */
     if (!(st->exprFlags & VEF_UNDEF) && st->ctxt != VAR_GLOBAL) {
 	Var *gv = VarFind(st->var->name, st->ctxt, FALSE);
 	if (gv == NULL)
-	    v_ctxt = VAR_GLOBAL;
+		ctxt = VAR_GLOBAL;
 	else
 	    VarFreeEnv(gv, TRUE);
     }
@@ -3002,7 +3002,7 @@ ok:
     if (st->eflags & VARE_WANTRES) {
 	switch (op[0]) {
 	case '+':
-	    Var_Append(st->var->name, val, v_ctxt);
+	    Var_Append(st->var->name, val, ctxt);
 	    break;
 	case '!': {
 	    const char *errfmt;
@@ -3010,7 +3010,7 @@ ok:
 	    if (errfmt != NULL)
 		Error(errfmt, val);
 	    else
-		Var_Set(st->var->name, cmd_output, v_ctxt);
+		Var_Set(st->var->name, cmd_output, ctxt);
 	    free(cmd_output);
 	    break;
 	}
@@ -3019,7 +3019,7 @@ ok:
 		break;
 	    /* FALLTHROUGH */
 	default:
-	    Var_Set(st->var->name, val, v_ctxt);
+	    Var_Set(st->var->name, val, ctxt);
 	    break;
 	}
     }