mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/parse-options-concat'

Browse Source 
Users of the parse_options_concat() API function need to allocate
extra slots in advance and fill them with OPT_END() when they want
to decide the set of supported options dynamically, which makes the
code error-prone and hard to read.  This has been corrected by tweaking
the API to allocate and return a new copy of "struct option" array.

* jk/parse-options-concat:
  parse_options: allocate a new array when concatenating
This commit is contained in:
Junio C Hamano
2016-08-03 15:10:25 -07:00
parent cf27c7996e 023ff39b29
commit d083d420b7
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parse-options-cb.c
View File

@ -117,19 +117,24 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
return 0;
}
int parse_options_concat(struct option *dst, size_t dst_size, struct option *src)
struct option *parse_options_concat(struct option *a, struct option *b)
{
int i, j;
struct option *ret;
size_t i, a_len = 0, b_len = 0;
for (i = 0; i < dst_size; i++)
if (dst[i].type == OPTION_END)
break;
for (j = 0; i < dst_size; i++, j++) {
dst[i] = src[j];
if (src[j].type == OPTION_END)
return 0;
}
return -1;
for (i = 0; a[i].type != OPTION_END; i++)
a_len++;
for (i = 0; b[i].type != OPTION_END; i++)
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 */
return ret;
}
int parse_opt_string_list(const struct option *opt, const char *arg, int unset)