Browse Source

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>
maint
René Scharfe 5 years ago committed by Junio C Hamano
parent
commit
a277d0a67f
  1. 7
      parse-options-cb.c

7
parse-options-cb.c

@ -188,11 +188,8 @@ struct option *parse_options_concat(struct option *a, struct option *b) @@ -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;
}

Loading…
Cancel
Save