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>

diff --git a/parse-options-cb.c b/parse-options-cb.c
index c2062ae742a62ecf73dc44507650308be6479126..012e048856db51083b7950295711c102a778d52a 100644 (file)
--- 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;
 }