Re: [PATCH v2 1/7] parse-options: allow parse_options_concat(NULL, options)
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
Show 5 quoted lines
> There is currently no caller that calls this function with "a" being
> NULL. But it will be introduced shortly. It is used to construct the
> option array from scratch, e.g.
>
> struct parse_options opts = NULL;
Missing asterisk somewhere?
Show 21 quoted lines
> opts = parse_options_concat(opts, opts_1);
> opts = parse_options_concat(opts, opts_2);
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> parse-options-cb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/parse-options-cb.c b/parse-options-cb.c
> index 8c9edce52f..c609d52926 100644
> --- a/parse-options-cb.c
> +++ b/parse-options-cb.c
> @@ -126,7 +126,7 @@ struct option *parse_options_concat(struct option *a, struct option *b)
> struct option *ret;
> size_t i, a_len = 0, b_len = 0;
>
> - for (i = 0; a[i].type != OPTION_END; i++)
> + for (i = 0; a && a[i].type != OPTION_END; i++)
> a_len++;
> for (i = 0; b[i].type != OPTION_END; i++)
> b_len++;