From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: [PATCH 2/3] diff: let prep_parse_options() return parseopt array
Date: Wed, 30 Nov 2022 19:04:08 +0100 [thread overview]
Message-ID: <b5f611f5-86e2-6b11-20a4-a847c97b145f@web.de> (raw)
In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de>
prep_parse_options() sets the parseopts member of struct diff_options.
Let it return the pointer instead and have its caller do the assignment
instead and rename the function to get_diff_parseopts() to reflect that
change. This allows using it in other places and with other variables.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
diff.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index e01129f0ea..e469d5d2a0 100644
--- a/diff.c
+++ b/diff.c
@@ -4615,7 +4615,7 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
}
-static void prep_parse_options(struct diff_options *options);
+static struct option *get_diff_parseopts(struct diff_options *options);
void repo_diff_setup(struct repository *r, struct diff_options *options)
{
@@ -4663,7 +4663,7 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->color_moved = diff_color_moved_default;
options->color_moved_ws_handling = diff_color_moved_ws_default;
- prep_parse_options(options);
+ options->parseopts = get_diff_parseopts(options);
}
static const char diff_status_letters[] = {
@@ -5419,7 +5419,7 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns
return 0;
}
-static void prep_parse_options(struct diff_options *options)
+static struct option *get_diff_parseopts(struct diff_options *options)
{
struct option parseopts[] = {
OPT_GROUP(N_("Diff output format options")),
@@ -5689,8 +5689,7 @@ static void prep_parse_options(struct diff_options *options)
OPT_END()
};
- ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts));
- memcpy(options->parseopts, parseopts, sizeof(parseopts));
+ return parse_options_dup(parseopts);
}
struct option *add_diff_options(const struct option *parseopts,
--
2.38.1
next prev parent reply other threads:[~2022-11-30 18:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 18:01 [PATCH 0/3] diff: build parseopts array on demand René Scharfe
2022-11-30 18:03 ` [PATCH 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 14:11 ` ZheNing Hu
2022-11-30 18:04 ` René Scharfe [this message]
2022-11-30 18:04 ` [PATCH 3/3] diff: remove parseopts member of struct diff_options René Scharfe
2022-12-01 1:25 ` Junio C Hamano
2022-12-01 7:52 ` René Scharfe
2022-12-01 21:56 ` Junio C Hamano
2022-12-01 22:45 ` René Scharfe
2022-12-01 1:02 ` [PATCH 0/3] diff: build parseopts array on demand Junio C Hamano
2022-12-01 13:39 ` [PATCH v2 " René Scharfe
2022-12-01 13:42 ` [PATCH v2 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 13:43 ` [PATCH v2 2/3] diff: let prep_parse_options() return parseopt array René Scharfe
2022-12-01 13:44 ` [PATCH v2 3/3] diff: remove parseopts member from struct diff_options René Scharfe
2022-12-01 16:54 ` [PATCH v2 0/3] diff: build parseopts array on demand Ævar Arnfjörð Bjarmason
2022-12-01 19:01 ` René Scharfe
2022-12-01 19:19 ` Eric Sunshine
2022-12-01 19:43 ` René Scharfe
2022-12-01 23:00 ` Ævar Arnfjörð Bjarmason
2022-12-01 22:45 ` [PATCH v3 " René Scharfe
2022-12-01 22:49 ` [PATCH v3 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 22:51 ` [PATCH v3 2/3] diff: use add_diff_options() in diff_opt_parse() René Scharfe
2022-12-01 22:53 ` [PATCH v3 3/3] diff: remove parseopts member from struct diff_options René Scharfe
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=b5f611f5-86e2-6b11-20a4-a847c97b145f@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).