From: "René Scharfe" <l.s.r@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Jeff King" <peff@peff.net>, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/4] parse-options: factor out parse_options_count()
Date: Sun, 9 Feb 2020 16:56:47 +0100 [thread overview]
Message-ID: <c729aaab-68d7-9cfa-8981-97eaa72a5ebe@web.de> (raw)
In-Reply-To: <11b82734-f61c-5e73-2d0c-22208c06d495@web.de>
Add a helper function to count the number of options (excluding the
final OPT_END()) and use it to simplify parse_options_dup() and
parse_options_concat().
Signed-off-by: René Scharfe <l.s.r@web.de>
---
parse-options-cb.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 012e048856..db6f666ef7 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -159,16 +159,20 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
return 0;
}
+static size_t parse_options_count(const struct option *opt)
+{
+ size_t n = 0;
+
+ for (; opt && opt->type != OPTION_END; opt++)
+ n++;
+ return n;
+}
+
struct option *parse_options_dup(const struct option *o)
{
const struct option *orig = o;
struct option *opts;
- int nr = 0;
-
- while (o && o->type != OPTION_END) {
- nr++;
- o++;
- }
+ size_t nr = parse_options_count(o);
ALLOC_ARRAY(opts, nr + 1);
COPY_ARRAY(opts, orig, nr);
@@ -180,12 +184,8 @@ struct option *parse_options_dup(const struct option *o)
struct option *parse_options_concat(struct option *a, struct option *b)
{
struct option *ret;
- size_t i, a_len = 0, b_len = 0;
-
- for (i = 0; a[i].type != OPTION_END; i++)
- a_len++;
- for (i = 0; b[i].type != OPTION_END; i++)
- b_len++;
+ size_t a_len = parse_options_count(a);
+ size_t b_len = parse_options_count(b);
ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1));
COPY_ARRAY(ret, a, a_len);
--
2.25.0
next prev parent reply other threads:[~2020-02-09 15:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-09 15:53 [PATCH 0/4] parse-options: simplify parse_options_concat() and parse_options_dup() René Scharfe
2020-02-09 15:55 ` [PATCH 1/4] parse-options: use COPY_ARRAY in parse_options_concat() René Scharfe
2020-02-09 15:56 ` René Scharfe [this message]
2020-02-09 17:56 ` [PATCH 2/4] parse-options: factor out parse_options_count() Eric Sunshine
2020-02-09 18:36 ` René Scharfe
2020-02-09 15:57 ` [PATCH 3/4] parse-options: const parse_options_concat() parameters René Scharfe
2020-02-09 15:58 ` [PATCH 4/4] parse-options: simplify parse_options_dup() René Scharfe
2020-02-10 17:49 ` Junio C Hamano
2020-02-10 22:25 ` [PATCH 0/4] parse-options: simplify parse_options_concat() and parse_options_dup() Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c729aaab-68d7-9cfa-8981-97eaa72a5ebe@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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.
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 NNTP newsgroup(s).