# [PATCH] builtin/config.c: compilation fix 3 messages from 2013-08-09 to 2013-08-09. Participants: Junio C Hamano, Kyle J. McKay. Thread: https://gitlist.dev/t/34648 ## Junio C Hamano, 2013-08-09 04:41 Subject: [PATCH] builtin/config.c: compilation fix Message-ID: <7vli4b79x3.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vli4b79x3.fsf%40alter.siamese.dyndns.org ``` 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 --- 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] | "; + const char usage[] = "test-urlmatch-normalization [-p | -l] | "; char *url1, *url2; int opt_p = 0, opt_l = 0; -- 1.8.3.3-1049-g890a991 ``` ## Kyle J. McKay, 2013-08-09 05:38 Subject: Re: [PATCH] builtin/config.c: compilation fix Message-ID: <866829AC-DD63-462B-B12F-BF868D0ED5C0@gmail.com> URL: https://gitlist.dev/e/866829AC-DD63-462B-B12F-BF868D0ED5C0%40gmail.com In-Reply-To: <7vli4b79x3.fsf@alter.siamese.dyndns.org> ``` On Aug 8, 2013, at 21:41, Junio C Hamano wrote: > 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 > --- > 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] > | "; > + const char usage[] = "test-urlmatch-normalization [-p | -l] > | "; > 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. ``` ## Junio C Hamano, 2013-08-09 06:31 Subject: Re: [PATCH] builtin/config.c: compilation fix Message-ID: URL: https://gitlist.dev/e/CAPc5daVoNef%3DEVxt%2BHAnVP9vSuQdTVHC%3DCRyc7_tqygxoiZeng%40mail.gmail.com In-Reply-To: <866829AC-DD63-462B-B12F-BF868D0ED5C0@gmail.com> ``` On Thu, Aug 8, 2013 at 10:38 PM, Kyle J. McKay wrote: >> + const char usage[] = "test-urlmatch-normalization [-p | -l] > 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); > > 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. It appears that "const char usage[] = ..." is enough to convince Gcc that usage _is_ a constant and can never contain anything funky. But I agree that the usage string could be updated, and I agree that it is prudent to do the same die("%s", ...) there. ```