From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 11/20] builtin/commit-graph.c: let parse-options parse subcommands
Date: Fri, 19 Aug 2022 19:53:08 +0200 [thread overview]
Message-ID: <220819.8635ds6run.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <20220819160411.1791200-12-szeder.dev@gmail.com>
On Fri, Aug 19 2022, SZEDER Gábor wrote:
> 'git commit-graph' parses its subcommands with an if-else if
> statement. parse-options has just learned to parse subcommands, so
> let's use that facility instead, with the benefits of shorter code,
> handling missing or unknown subcommands, and listing subcommands for
> Bash completion.
>
> Note that the functions implementing each subcommand only accept the
> 'argc' and '**argv' parameters, so add a (unused) '*prefix' parameter
> to make them match the type expected by parse-options, and thus avoid
> casting function pointers.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
> builtin/commit-graph.c | 30 +++++++++++++-----------------
> t/t5318-commit-graph.sh | 4 ++--
> 2 files changed, 15 insertions(+), 19 deletions(-)
>
> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
> index 51c4040ea6..1eb5492cbd 100644
> --- a/builtin/commit-graph.c
> +++ b/builtin/commit-graph.c
> @@ -58,7 +58,7 @@ static struct option *add_common_options(struct option *to)
> return parse_options_concat(common_opts, to);
> }
>
> -static int graph_verify(int argc, const char **argv)
> +static int graph_verify(int argc, const char **argv, const char *prefix)
> {
> struct commit_graph *graph = NULL;
> struct object_directory *odb = NULL;
> @@ -190,7 +190,7 @@ static int git_commit_graph_write_config(const char *var, const char *value,
> return 0;
> }
>
> -static int graph_write(int argc, const char **argv)
> +static int graph_write(int argc, const char **argv, const char *prefix)
> {
> struct string_list pack_indexes = STRING_LIST_INIT_DUP;
> struct strbuf buf = STRBUF_INIT;
> @@ -307,26 +307,22 @@ static int graph_write(int argc, const char **argv)
>
> int cmd_commit_graph(int argc, const char **argv, const char *prefix)
> {
> - struct option *builtin_commit_graph_options = common_opts;
> + parse_opt_subcommand_fn *fn = NULL;
> + struct option builtin_commit_graph_options[] = {
> + OPT_SUBCOMMAND("verify", &fn, graph_verify),
> + OPT_SUBCOMMAND("write", &fn, graph_write),
> + OPT_END(),
> + };
> + struct option *options = parse_options_concat(builtin_commit_graph_options, common_opts);
This looks like it'll leak if...
>
> git_config(git_default_config, NULL);
> - argc = parse_options(argc, argv, prefix,
> - builtin_commit_graph_options,
> - builtin_commit_graph_usage,
> - PARSE_OPT_STOP_AT_NON_OPTION);
> - if (!argc)
> - goto usage;
We take this goto..
> + argc = parse_options(argc, argv, prefix, options,
> + builtin_commit_graph_usage, 0);
> + FREE_AND_NULL(options);
Why FREE_AND_NULL() over free()?
>
> - error(_("unrecognized subcommand: %s"), argv[0]);
> -usage:
> - usage_with_options(builtin_commit_graph_usage,
> - builtin_commit_graph_options);
> + return fn(argc, argv, prefix);
The leak seems easily solved, let's just do the free() at the end?
next prev parent reply other threads:[~2022-08-19 18:08 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 12:38 [PATCH 00/20] parse-options: handle subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 01/20] git.c: update NO_PARSEOPT markings SZEDER Gábor
2022-07-25 14:31 ` Ævar Arnfjörð Bjarmason
2022-08-02 17:37 ` SZEDER Gábor
2022-08-02 21:00 ` Junio C Hamano
2022-08-03 13:11 ` Ævar Arnfjörð Bjarmason
2022-08-03 21:34 ` SZEDER Gábor
2022-08-04 7:47 ` Ævar Arnfjörð Bjarmason
2022-08-11 21:35 ` Junio C Hamano
2022-08-12 15:28 ` SZEDER Gábor
2022-08-12 16:46 ` Junio C Hamano
2022-07-26 19:55 ` SZEDER Gábor
2022-07-25 12:38 ` [PATCH 02/20] t3301-notes.sh: check that default operation mode doesn't take arguments SZEDER Gábor
2022-07-25 12:38 ` [PATCH 03/20] t5505-remote.sh: check the behavior without a subcommand SZEDER Gábor
2022-07-25 14:37 ` Ævar Arnfjörð Bjarmason
2022-07-25 12:38 ` [PATCH 04/20] t0040-parse-options: test parse_options() with various 'parse_opt_flags' SZEDER Gábor
2022-07-25 14:38 ` Ævar Arnfjörð Bjarmason
2022-08-12 15:04 ` SZEDER Gábor
2022-07-25 12:38 ` [PATCH 05/20] api-parse-options.txt: fix description of OPT_CMDMODE SZEDER Gábor
2022-07-25 12:38 ` [PATCH 06/20] parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options SZEDER Gábor
2022-07-25 12:38 ` [PATCH 07/20] parse-options: clarify the limitations of PARSE_OPT_NODASH SZEDER Gábor
2022-07-25 12:38 ` [PATCH 08/20] parse-options: drop leading space from '--git-completion-helper' output SZEDER Gábor
2022-07-25 12:38 ` [PATCH 09/20] parse-options: add support for parsing subcommands SZEDER Gábor
2022-07-25 14:43 ` Ævar Arnfjörð Bjarmason
2022-07-25 19:29 ` SZEDER Gábor
2022-07-25 19:41 ` Ævar Arnfjörð Bjarmason
2022-07-25 21:02 ` SZEDER Gábor
2022-08-12 15:15 ` SZEDER Gábor
2022-07-25 17:37 ` Junio C Hamano
2022-07-25 12:38 ` [PATCH 10/20] builtin/bundle.c: let parse-options parse subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 11/20] builtin/commit-graph.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 12/20] builtin/gc.c: let parse-options parse 'git maintenance's subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 13/20] builtin/hook.c: let parse-option parse subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 14/20] builtin/multi-pack-index.c: let parse-options " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 15/20] builtin/notes.c: " SZEDER Gábor
2022-07-25 16:49 ` Junio C Hamano
2022-07-25 12:38 ` [PATCH 16/20] builtin/reflog.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 17/20] builtin/remote.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 18/20] builtin/sparse-checkout.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 19/20] builtin/stash.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 20/20] builtin/worktree.c: " SZEDER Gábor
2022-07-25 13:15 ` [PATCH 00/20] parse-options: handle subcommands Derrick Stolee
2022-07-25 16:00 ` SZEDER Gábor
2022-07-25 16:08 ` Derrick Stolee
2022-07-25 17:13 ` Ævar Arnfjörð Bjarmason
2022-07-25 17:56 ` Junio C Hamano
2022-07-26 15:42 ` Johannes Schindelin
2022-07-26 18:02 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:03 ` [PATCH v2 " SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 01/20] git.c: update NO_PARSEOPT markings SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 02/20] t3301-notes.sh: check that default operation mode doesn't take arguments SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 03/20] t5505-remote.sh: check the behavior without a subcommand SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 04/20] t0040-parse-options: test parse_options() with various 'parse_opt_flags' SZEDER Gábor
2022-08-19 17:23 ` Ævar Arnfjörð Bjarmason
2022-08-20 11:14 ` SZEDER Gábor
2022-08-19 18:18 ` Junio C Hamano
2022-08-20 10:31 ` SZEDER Gábor
2022-08-20 21:27 ` Junio C Hamano
2022-08-19 16:03 ` [PATCH v2 05/20] api-parse-options.txt: fix description of OPT_CMDMODE SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 06/20] parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 07/20] parse-options: clarify the limitations of PARSE_OPT_NODASH SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 08/20] parse-options: drop leading space from '--git-completion-helper' output SZEDER Gábor
2022-08-19 17:30 ` Ævar Arnfjörð Bjarmason
2022-08-19 18:35 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 09/20] parse-options: add support for parsing subcommands SZEDER Gábor
2022-08-19 17:33 ` Ævar Arnfjörð Bjarmason
2022-08-19 19:03 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 10/20] builtin/bundle.c: let parse-options parse subcommands SZEDER Gábor
2022-08-19 17:50 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 11/20] builtin/commit-graph.c: " SZEDER Gábor
2022-08-19 17:53 ` Ævar Arnfjörð Bjarmason [this message]
2022-08-19 17:56 ` Ævar Arnfjörð Bjarmason
2022-08-19 18:22 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 12/20] builtin/gc.c: let parse-options parse 'git maintenance's subcommands SZEDER Gábor
2022-08-19 20:59 ` Junio C Hamano
2022-08-19 16:04 ` [PATCH v2 13/20] builtin/hook.c: let parse-options parse subcommands SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 14/20] builtin/multi-pack-index.c: " SZEDER Gábor
2022-08-19 17:57 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 15/20] builtin/notes.c: " SZEDER Gábor
2022-08-19 18:01 ` Ævar Arnfjörð Bjarmason
2022-08-21 17:56 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 16/20] builtin/reflog.c: " SZEDER Gábor
2022-08-19 18:08 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 17/20] builtin/remote.c: " SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 18/20] builtin/sparse-checkout.c: " SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 19/20] builtin/stash.c: " SZEDER Gábor
2022-08-19 19:06 ` Ævar Arnfjörð Bjarmason
2022-08-20 10:27 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 20/20] builtin/worktree.c: " SZEDER Gábor
2022-09-05 18:50 ` [PATCH 0/5] parse-options: minor cleanups for handling subcommands SZEDER Gábor
2022-09-05 18:50 ` [PATCH 1/5] t0040-parse-options: remove leftover debugging SZEDER Gábor
2022-09-05 18:50 ` [PATCH 2/5] test-parse-options.c: don't use for loop initial declaration SZEDER Gábor
2022-09-05 18:50 ` [PATCH 3/5] test-parse-options.c: fix style of comparison with zero SZEDER Gábor
2022-09-05 18:50 ` [PATCH 4/5] notes: simplify default operation mode arguments check SZEDER Gábor
2022-09-05 18:50 ` [PATCH 5/5] notes, remote: show unknown subcommands between `' SZEDER Gábor
2022-09-07 19:12 ` [PATCH 0/5] parse-options: minor cleanups for handling subcommands Junio C Hamano
2022-09-07 21:22 ` SZEDER Gábor
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=220819.8635ds6run.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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).