parse-options: simplify parse_options_dup()

Simplify parse_options_dup() by making it a trivial wrapper of
parse_options_concat() by making use of the facts that the latter
duplicates its input as well and that appending an empty set is a no-op.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2020-02-09 16:58:42 +01:00 committed by Junio C Hamano
parent c84078573e
commit 7a9f8ca805
1 changed files with 2 additions and 8 deletions

View File

@ -170,15 +170,9 @@ static size_t parse_options_count(const struct option *opt)
struct option *parse_options_dup(const struct option *o)
{
const struct option *orig = o;
struct option *opts;
size_t nr = parse_options_count(o);
struct option no_options[] = { OPT_END() };
ALLOC_ARRAY(opts, nr + 1);
COPY_ARRAY(opts, orig, nr);
memset(opts + nr, 0, sizeof(*opts));
opts[nr].type = OPTION_END;
return opts;
return parse_options_concat(o, no_options);
}
struct option *parse_options_concat(const struct option *a,