diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-08 21:41:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-09 09:20:38 -0700 |
| commit | 6667a6ac20747eb56eb2c03c39aceaf6aebbae3c (patch) | |
| tree | 900e27b2629556db97b1c9bce892d2bb15b4b1c7 | |
| parent | config: "git config --get-urlmatch" parses section.<url>.key (diff) | |
| download | tgif-6667a6ac20747eb56eb2c03c39aceaf6aebbae3c.tar.xz | |
builtin/config.c: compilation fix
Do not feed a random string as the first parameter to die(); use "%s"
as the format string instead.
Do the same for test-urlmatch-normalization.c while saving a single
pointer variable by turning a "const char *" constant string into
"const char []", which is sufficient to squelch compilation warning
(the compiler can see usage[] given to die() is a constant and will
never have conversion specifiers that cause trouble). But for a
good measure, give them the same "%s" treatment as well.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/config.c | 2 | ||||
| -rw-r--r-- | test-urlmatch-normalization.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/config.c b/builtin/config.c index c046f54829..ae199e9f75 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -404,7 +404,7 @@ static int get_urlmatch(const char *var, const char *url) config.cb = &values; if (!url_normalize(url, &config.url)) - die(config.url.err); + die("%s", config.url.err); config.section = dup_downcase(var); section_tail = strchr(config.section, '.'); diff --git a/test-urlmatch-normalization.c b/test-urlmatch-normalization.c index 2603899bfe..090bf219a7 100644 --- a/test-urlmatch-normalization.c +++ b/test-urlmatch-normalization.c @@ -3,7 +3,7 @@ int main(int argc, char **argv) { - const char *usage = "test-urlmatch-normalization [-p | -l] <url1> | <url1> <url2>"; + const char usage[] = "test-urlmatch-normalization [-p | -l] <url1> | <url1> <url2>"; char *url1, *url2; int opt_p = 0, opt_l = 0; @@ -27,7 +27,7 @@ int main(int argc, char **argv) } if (argc < 2 || argc > 3) - die(usage); + die("%s", usage); if (argc == 2) { struct url_info info; @@ -42,7 +42,7 @@ int main(int argc, char **argv) } if (opt_p || opt_l) - die(usage); + die("%s", usage); url1 = url_normalize(argv[1], NULL); url2 = url_normalize(argv[2], NULL); |