builtin/config.c: compilation fix

gitster · gitster · commit 6667a6ac2074 · 2013-08-09T09:20:38.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`int main(int argc, char **argv)`
`5`	`5`	`{`
`6`		`- const char *usage = "test-urlmatch-normalization [-p \| -l] <url1> \| <url1> <url2>";`
	`6`	`+ const char usage[] = "test-urlmatch-normalization [-p \| -l] <url1> \| <url1> <url2>";`
`7`	`7`	`char url1, url2;`
`8`	`8`	`int opt_p = 0, opt_l = 0;`
`9`	`9`
`@@ -27,7 +27,7 @@ int main(int argc, char **argv)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if (argc < 2 \|\| argc > 3)`
`30`		`- die(usage);`
	`30`	`+ die("%s", usage);`
`31`	`31`
`32`	`32`	`if (argc == 2) {`
`33`	`33`	`struct url_info info;`
`@@ -42,7 +42,7 @@ int main(int argc, char **argv)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (opt_p \|\| opt_l)`
`45`		`- die(usage);`
	`45`	`+ die("%s", usage);`
`46`	`46`
`47`	`47`	`url1 = url_normalize(argv[1], NULL);`
`48`	`48`	`url2 = url_normalize(argv[2], NULL);`