Message ID | 2002108a30246824f8017da1dea344c1a96f7de2.1565362851.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | trace2: clean up formatting in perf target format | expand |
"Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > +/* > + * Legacy function to append each argv value, quoted as necessasry, > + * with whitespace before each value. This results in a leading > + * space in the result. > + */ > void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) > +{ > + if (argv[0]) > + strbuf_addch(dst, ' '); > + sq_append_quote_argv_pretty(dst, argv); Micronit (not worth a reroll): if !argv[0], there is no need to call append, either.
On 8/9/2019 1:54 PM, Junio C Hamano wrote: > "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > >> +/* >> + * Legacy function to append each argv value, quoted as necessasry, >> + * with whitespace before each value. This results in a leading >> + * space in the result. >> + */ >> void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) >> +{ >> + if (argv[0]) >> + strbuf_addch(dst, ' '); >> + sq_append_quote_argv_pretty(dst, argv); > > Micronit (not worth a reroll): if !argv[0], there is no need to call > append, either. > good catch. thanks!
diff --git a/quote.c b/quote.c index 7f2aa6faa4..c8ba6b397a 100644 --- a/quote.c +++ b/quote.c @@ -84,12 +84,28 @@ void sq_quote_argv(struct strbuf *dst, const char **argv) } } +/* + * Legacy function to append each argv value, quoted as necessasry, + * with whitespace before each value. This results in a leading + * space in the result. + */ void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) +{ + if (argv[0]) + strbuf_addch(dst, ' '); + sq_append_quote_argv_pretty(dst, argv); +} + +/* + * Append each argv value, quoted as necessary, with whitespace between them. + */ +void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv) { int i; for (i = 0; argv[i]; i++) { - strbuf_addch(dst, ' '); + if (i > 0) + strbuf_addch(dst, ' '); sq_quote_buf_pretty(dst, argv[i]); } } diff --git a/quote.h b/quote.h index fb08dc085c..ca8ee3144a 100644 --- a/quote.h +++ b/quote.h @@ -40,6 +40,7 @@ void sq_quotef(struct strbuf *, const char *fmt, ...); */ void sq_quote_buf_pretty(struct strbuf *, const char *src); void sq_quote_argv_pretty(struct strbuf *, const char **argv); +void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv); /* This unwraps what sq_quote() produces in place, but returns * NULL if the input does not look like what sq_quote would have