Commit 0172dc91 authored by Rusty Russell's avatar Rusty Russell

ccanlint: fix usage of unused main parameters in other cases where we add main()

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent c3a934d2
...@@ -359,7 +359,8 @@ static char *strip_comment(const void *ctx, const char *orig_line) ...@@ -359,7 +359,8 @@ static char *strip_comment(const void *ctx, const char *orig_line)
static char *mangle(struct manifest *m, char **lines) static char *mangle(struct manifest *m, char **lines)
{ {
char *ret, *use_funcs = NULL, *why; char *ret, *use_funcs = NULL, *why;
bool in_function = false, fake_function = false, has_main = false; bool in_function = false, fake_function = false, has_main = false,
fake_main = false;
unsigned int i; unsigned int i;
ret = tal_fmt(m, ret = tal_fmt(m,
...@@ -393,6 +394,7 @@ static char *mangle(struct manifest *m, char **lines) ...@@ -393,6 +394,7 @@ static char *mangle(struct manifest *m, char **lines)
fake_function = true; fake_function = true;
in_function = true; in_function = true;
has_main = true; has_main = true;
fake_main = true;
} else } else
tal_append_fmt(&ret, tal_append_fmt(&ret,
"/* The example %s, so didn't wrap in main() */\n", "/* The example %s, so didn't wrap in main() */\n",
...@@ -429,6 +431,7 @@ static char *mangle(struct manifest *m, char **lines) ...@@ -429,6 +431,7 @@ static char *mangle(struct manifest *m, char **lines)
/* This implies we start a function here. */ /* This implies we start a function here. */
start_main(&ret, why); start_main(&ret, why);
has_main = true; has_main = true;
fake_main = true;
fake_function = true; fake_function = true;
in_function = true; in_function = true;
} }
...@@ -444,6 +447,7 @@ static char *mangle(struct manifest *m, char **lines) ...@@ -444,6 +447,7 @@ static char *mangle(struct manifest *m, char **lines)
"/* Need a main to link successfully. */\n" "/* Need a main to link successfully. */\n"
"int main(int argc, char *argv[])\n{\n"); "int main(int argc, char *argv[])\n{\n");
fake_function = true; fake_function = true;
fake_main = true;
} }
if (use_funcs) { if (use_funcs) {
...@@ -460,7 +464,7 @@ static char *mangle(struct manifest *m, char **lines) ...@@ -460,7 +464,7 @@ static char *mangle(struct manifest *m, char **lines)
tal_append_fmt(&ret, " %s\n", use_funcs); tal_append_fmt(&ret, " %s\n", use_funcs);
} }
if (!has_main) if (fake_main)
ret = tal_strcat(m, take(ret), ret = tal_strcat(m, take(ret),
"(void)argc; (void)argv;\n"); "(void)argc; (void)argv;\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment