Re: [PATCH] builtin/config.c: compilation fix
- From
Kyle J. McKay <mackyle@gmail.com>
- Date
- Aug 9, 2013, 05:38 UTC
- Message-ID
- <866829AC-DD63-462B-B12F-BF868D0ED5C0@gmail.com>
- In-Reply-To
- <7vli4b79x3.fsf@alter.siamese.dyndns.org>
On Aug 8, 2013, at 21:41, Junio C Hamano wrote:
Show 46 quoted lines
> 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 []".
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> builtin/config.c | 2 +-
> test-urlmatch-normalization.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/config.c b/builtin/config.c
> index c046f54..ae199e9 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 2603899..78c8b3a 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;
>
> --
> 1.8.3.3-1049-g890a991
>Looks good to me except that there seems to be a missing part of the patch. Did you also mean to include:
diff --git a/test-urlmatch-normalization.c b/test-urlmatch- normalization.c index 2603899b..39017c20 100644 --- a/test-urlmatch-normalization.c +++ b/test-urlmatch-normalization.c @@ -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); That's not terribly important here since we know the string will never contain any '%' characters, but the comment on the patch led me to believe that test-urlmatch-normalization would also get the die() change.