mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 23:13:58 +01:00
Code

builtin/config.c: compilation fix

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2013-08-08 21:41:44 -07:00
parent d4770964d5
commit 6667a6ac20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/config.c
View File

@ -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, '.');

6
test-urlmatch-normalization.c
View File

@ -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);