From: Junio C Hamano <gitster@pobox.com>
To: "Hariom Verma via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Hariom Verma <hariom18599@gmail.com>
Subject: Re: [PATCH v2 2/3] pretty.c: capture invalid trailer argument
Date: Fri, 29 Jan 2021 16:01:31 -0800 [thread overview]
Message-ID: <xmqqsg6jqomc.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <245e48eb6835cae4e61f65af780b766d990d4b5f.1611954543.git.gitgitgadget@gmail.com> (Hariom Verma via GitGitGadget's message of "Fri, 29 Jan 2021 21:09:02 +0000")
"Hariom Verma via GitGitGadget" <gitgitgadget@gmail.com> writes:
> + size_t invalid_arg_len = strcspn(*arg, ",)");
> + *invalid_arg = xstrndup(*arg, invalid_arg_len);
> + return 1;
How about doing this only when invalid_arg is not NULL, i.e.
} else if (!match_placeholder_bool_arg(....) &&
...
!match_placeholder_bool_arg(....)) {
if (invalid_arg) {
size_t len = strcspn(*arg, ",)");
*invalid_arg = xstrndup(*arg, len);
}
return -1;
}
Note that I just used 'len'; when the scope of a variable is so
short, it is clear the length of what thing it refers to from the
context, and there is no point in using a variable name that long.
In any case, by doing so, the callers that are not interested in the
report can just pass NULL, which means ...
> @@ -1464,12 +1472,13 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
> struct strbuf sepbuf = STRBUF_INIT;
> struct strbuf kvsepbuf = STRBUF_INIT;
> size_t ret = 0;
> + char *unused = NULL;
... this will become unneeded, and ...
> opts.no_divider = 1;
>
> if (*arg == ':') {
> arg++;
> - if (format_set_trailers_options(&opts, &filter_list, &sepbuf, &kvsepbuf, &arg))
> + if (format_set_trailers_options(&opts, &filter_list, &sepbuf, &kvsepbuf, &arg, &unused))
> goto trailer_out;
... this will pass NULL, and ...
> }
> if (*arg == ')') {
> @@ -1479,6 +1488,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
> trailer_out:
> string_list_clear(&filter_list, 0);
> strbuf_release(&sepbuf);
> + free((char *)unused);
... this will become unneeded.
> return ret;
> }
>
> diff --git a/pretty.h b/pretty.h
> index 7369cf7e148..d902cdd70a9 100644
> --- a/pretty.h
> +++ b/pretty.h
> @@ -151,6 +151,7 @@ int format_set_trailers_options(struct process_trailer_options *opts,
> struct string_list *filter_list,
> struct strbuf *sepbuf,
> struct strbuf *kvsepbuf,
> - const char **arg);
> + const char **arg,
> + char **invalid_arg);
>
> #endif /* PRETTY_H */
next prev parent reply other threads:[~2021-01-30 0:03 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 19:48 [PATCH 0/2] Unify trailers formatting logic for pretty.c and ref-filter.c Hariom Verma via GitGitGadget
2020-09-05 19:48 ` [PATCH 1/2] pretty.c: refactor trailer logic to `format_set_trailers_options()` Hariom Verma via GitGitGadget
2020-09-05 21:59 ` René Scharfe
2020-09-05 19:48 ` [PATCH 2/2] ref-filter: using pretty.c logic for trailers Hariom Verma via GitGitGadget
2021-01-29 21:09 ` [PATCH v2 0/3] Unify trailers formatting logic for pretty.c and ref-filter.c Hariom Verma via GitGitGadget
2021-01-29 21:09 ` [PATCH v2 1/3] pretty.c: refactor trailer logic to `format_set_trailers_options()` Hariom Verma via GitGitGadget
2021-01-29 23:49 ` Junio C Hamano
2021-01-29 21:09 ` [PATCH v2 2/3] pretty.c: capture invalid trailer argument Hariom Verma via GitGitGadget
2021-01-29 22:28 ` Christian Couder
2021-01-30 19:16 ` Hariom verma
2021-01-30 0:01 ` Junio C Hamano [this message]
2021-01-30 19:00 ` Hariom verma
2021-01-30 0:07 ` Junio C Hamano
2021-01-30 19:06 ` Hariom verma
2021-01-29 21:09 ` [PATCH v2 3/3] ref-filter: use pretty.c logic for trailers Hariom Verma via GitGitGadget
2021-01-30 20:45 ` Ævar Arnfjörð Bjarmason
2021-02-04 18:46 ` Hariom verma
2021-02-04 20:53 ` Ævar Arnfjörð Bjarmason
2021-01-30 1:17 ` [PATCH v2 0/3] Unify trailers formatting logic for pretty.c and ref-filter.c Junio C Hamano
2021-01-30 1:28 ` Junio C Hamano
2021-01-30 19:15 ` Hariom verma
2021-01-30 20:20 ` Junio C Hamano
2021-02-06 9:15 ` [PATCH v3 " Hariom Verma via GitGitGadget
2021-02-06 9:15 ` [PATCH v3 1/3] pretty.c: refactor trailer logic to `format_set_trailers_options()` Hariom Verma via GitGitGadget
2021-02-06 9:15 ` [PATCH v3 2/3] pretty.c: capture invalid trailer argument Hariom Verma via GitGitGadget
2021-02-06 9:15 ` [PATCH v3 3/3] ref-filter: use pretty.c logic for trailers Hariom Verma via GitGitGadget
2021-02-07 5:45 ` Junio C Hamano
2021-02-07 12:06 ` Hariom verma
2021-02-07 18:19 ` Junio C Hamano
2021-02-07 19:38 ` Hariom verma
2021-02-07 20:09 ` Junio C Hamano
2021-02-08 17:07 ` Hariom verma
2021-02-08 18:29 ` Junio C Hamano
[not found] ` <xmqqlfby5o9h.fsf@gitster.c.googlers.com>
2021-02-08 23:43 ` brian m. carlson
2021-02-09 3:04 ` brian m. carlson
2021-02-09 20:54 ` Junio C Hamano
2021-02-07 3:33 ` [PATCH v3 0/3] Unify trailers formatting logic for pretty.c and ref-filter.c Junio C Hamano
2021-02-07 5:06 ` Junio C Hamano
2021-02-13 1:52 ` [PATCH v4 0/4] " Hariom Verma via GitGitGadget
2021-02-13 1:52 ` [PATCH v4 1/4] t6300: use function to test trailer options Hariom Verma via GitGitGadget
2021-02-13 1:52 ` [PATCH v4 2/4] pretty.c: refactor trailer logic to `format_set_trailers_options()` Hariom Verma via GitGitGadget
2021-02-13 1:52 ` [PATCH v4 3/4] pretty.c: capture invalid trailer argument Hariom Verma via GitGitGadget
2021-02-13 1:52 ` [PATCH v4 4/4] ref-filter: use pretty.c logic for trailers Hariom Verma via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsg6jqomc.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=hariom18599@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).