Skip to content
Browse files

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>
  • Loading branch information...
1 parent d477096 commit 6667a6ac20747eb56eb2c03c39aceaf6aebbae3c @gitster gitster committed
Showing with 4 additions and 4 deletions.
  1. +1 −1 builtin/config.c
  2. +3 −3 test-urlmatch-normalization.c
View
2 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, '.');
View
6 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);

0 comments on commit 6667a6a

Please sign in to comment.
Something went wrong with that request. Please try again.