[src/trunk]: src/usr.bin/make make(1): rename local variable in ApplyModifier...

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

details:   https://anonhg.NetBSD.org/src/rev/89e8aa6b287b
branches:  trunk
changeset: 957330:89e8aa6b287b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Nov 24 21:42:28 2020 +0000

description:
make(1): rename local variable in ApplyModifier_Assign

diffstat:

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

diffs (68 lines):

diff -r 14bdbe7755dc -r 89e8aa6b287b usr.bin/make/var.c
--- a/usr.bin/make/var.c        Tue Nov 24 20:17:17 2020 +0000
+++ b/usr.bin/make/var.c        Tue Nov 24 21:42:28 2020 +0000
@@ -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 @@
 static ApplyModifierResult
 ApplyModifier_Assign(const char **pp, ApplyModifiersState *st)
 {
-    GNode *v_ctxt;
+    GNode *ctxt;
     char delim;
     char *val;
     VarParseResult res;
@@ -2972,11 +2972,11 @@
        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 @@
     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 @@
            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 @@
                break;
            /* FALLTHROUGH */
        default:
-           Var_Set(st->var->name, val, v_ctxt);
+           Var_Set(st->var->name, val, ctxt);
            break;
        }
     }