From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 18 Jul 2022 12:28:20 +0000 (+0930)
Subject: Makefile: add -Wshadow=local, fix configurator!
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=172a3affa2afe06a08646e9bec593ec5a6e73fff;p=ccan

Makefile: add -Wshadow=local, fix configurator!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/Makefile b/Makefile
index d53e89f4..875e99f2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all::
 
 # Our flags for building
 WARN_CFLAGS := -Wall -Wstrict-prototypes -Wold-style-definition -Wundef \
- -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wwrite-strings
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wshadow=local
 DEP_CFLAGS = -MMD -MP -MF$(@:%=%.d) -MT$@
 CCAN_CFLAGS := -g3 -ggdb $(WARN_CFLAGS) -DCCAN_STR_DEBUG=1 -I. $(CFLAGS)
 CFLAGS_FORCE_C_SOURCE := -x c
diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 57779f29..f830cbca 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -797,12 +797,12 @@ static bool run_test(const char *cmd, const char *wrapper, struct test *test)
 		/* We run INSIDE_MAIN tests for sanity checking. */
 		if (strstr(test->style, "EXECUTE")
 		    || strstr(test->style, "INSIDE_MAIN")) {
-			char *cmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
+			char *runcmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
 
-			strcpy(cmd, wrapper);
-			strcat(cmd, " ." DIR_SEP OUTPUT_FILE);
-			output = run(cmd, &status);
-			free(cmd);
+			strcpy(runcmd, wrapper);
+			strcat(runcmd, " ." DIR_SEP OUTPUT_FILE);
+			output = run(runcmd, &status);
+			free(runcmd);
 			if (!strstr(test->style, "EXECUTE") && status != 0)
 				c12r_errx(EXIT_BAD_TEST,
 					  "Test for %s failed with %i:\n%s",