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

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

details:   https://anonhg.NetBSD.org/src/rev/964102f1dec0
branches:  trunk
changeset: 948692:964102f1dec0
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Dec 29 01:48:46 2020 +0000

description:
make(1): rename local variables in Var_ReexportVars

diffstat:

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

diffs (52 lines):

diff -r 741d28cc6256 -r 964102f1dec0 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Tue Dec 29 01:48:22 2020 +0000
+++ b/usr.bin/make/var.c        Tue Dec 29 01:48:46 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.774 2020/12/28 00:46:24 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.775 2020/12/29 01:48:46 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.774 2020/12/28 00:46:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.775 2020/12/29 01:48:46 rillig Exp $");
 
 typedef enum VarFlags {
        VAR_NONE        = 0,
@@ -654,7 +654,7 @@
 void
 Var_ReexportVars(void)
 {
-       char *val;
+       char *xvarnames;
 
        /*
         * Several make implementations support this sort of mechanism for
@@ -682,17 +682,17 @@
        }
 
        (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES,
-           &val);
+           &xvarnames);
        /* TODO: handle errors */
-       if (val[0] != '\0') {
-               Words words = Str_Words(val, FALSE);
+       if (xvarnames[0] != '\0') {
+               Words varnames = Str_Words(xvarnames, FALSE);
                size_t i;
 
-               for (i = 0; i < words.len; i++)
-                       ExportVar(words.words[i], VEM_ENV);
-               Words_Free(words);
+               for (i = 0; i < varnames.len; i++)
+                       ExportVar(varnames.words[i], VEM_ENV);
+               Words_Free(varnames);
        }
-       free(val);
+       free(xvarnames);
 }
 
 static void