diff options
| author |  René Scharfe <l.s.r@web.de> | 2020-02-09 16:55:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-10 09:42:43 -0800 |
| commit | a277d0a67f0324deb58abbeb0c5a2b3abbcde340 (patch) | |
| tree | 1d5ddfb6936780d3b99e925c598d523cf82232d3 | |
| parent | Git 2.25 (diff) | |
| download | tgif-a277d0a67f0324deb58abbeb0c5a2b3abbcde340.tar.xz | |
parse-options: use COPY_ARRAY in parse_options_concat()
Use COPY_ARRAY to copy whole arrays instead of iterating through the
elements. That's shorter, simpler and bit more efficient.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | parse-options-cb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c index c2062ae742..012e048856 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -188,11 +188,8 @@ struct option *parse_options_concat(struct option *a, struct option *b) b_len++; ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1)); - for (i = 0; i < a_len; i++) - ret[i] = a[i]; - for (i = 0; i < b_len; i++) - ret[a_len + i] = b[i]; - ret[a_len + b_len] = b[b_len]; /* final OPTION_END */ + COPY_ARRAY(ret, a, a_len); + COPY_ARRAY(ret + a_len, b, b_len + 1); /* + 1 for final OPTION_END */ return ret; } |