ccan: update to get -Wshadow=local clean build.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2022-07-25 16:29:09 +09:30 committed by neil saitug
parent d4a04ba8b3
commit 6a7d40f51a
3 changed files with 10 additions and 10 deletions

View file

@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.
CCAN version: init-2541-g52b86922
CCAN version: init-2545-g7b11e744

View file

@ -594,12 +594,12 @@ bool tal_set_name_(tal_t *ctx, const char *name, bool literal)
/* Get rid of any old name */
if (prop) {
struct name *name = (struct name *)*prop;
if (is_literal(&name->hdr))
struct name *oldname = (struct name *)*prop;
if (is_literal(&oldname->hdr))
*prop = NULL;
else {
*prop = name->hdr.next;
freefn(name);
*prop = oldname->hdr.next;
freefn(oldname);
}
}

View file

@ -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",