CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Nov  8 18:27:14 UTC 2020

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.679 -r1.680 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.679 src/usr.bin/make/var.c:1.680
--- src/usr.bin/make/var.c:1.679	Sun Nov  8 18:16:55 2020
+++ src/usr.bin/make/var.c	Sun Nov  8 18:27:14 2020
@@ -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 @@ VarSubstNested(const char **const pp, Bu
 {
     const char *p = *pp;
     const char *nested_p = p;
-    void *freeIt;
     const char *val;
+    void *val_freeIt;
 
-    (void)Var_Parse(&nested_p, ctxt, eflags, &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 @@ VarSubstNested(const char **const pp, Bu
 	Buf_AddStr(buf, val);
     }
 
-    free(freeIt);
+    free(val_freeIt);
 
     *pp = p;
 }