Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/403eebeb8065
branches:  trunk
changeset: 978088:403eebeb8065
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 18:27:14 2020 +0000

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

diffstat:

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

diffs (41 lines):

diff -r 7297fd846816 -r 403eebeb8065 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Nov 08 18:16:55 2020 +0000
+++ b/usr.bin/make/var.c        Sun Nov 08 18:27:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.679 2020/11/08 18:16:55 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.680 2020/11/08 18:27:14 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.679 2020/11/08 18:16:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.680 2020/11/08 18:27:14 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3945,10 +3945,10 @@
 {
     const char *p = *pp;
     const char *nested_p = p;
-    void *freeIt;
     const char *val;
-
-    (void)Var_Parse(&nested_p, ctxt, eflags, &val, &freeIt);
+    void *val_freeIt;
+
+    (void)Var_Parse(&nested_p, ctxt, eflags, &val, &val_freeIt);
     /* TODO: handle errors */
 
     if (val == var_Error || val == varUndefined) {
@@ -3984,7 +3984,7 @@
        Buf_AddStr(buf, val);
     }
 
-    free(freeIt);
+    free(val_freeIt);
 
     *pp = p;
 }



Home | Main Index | Thread Index | Old Index