[PATCH 3/4] parse-options: const parse_options_concat() parameters
- From
René Scharfe <l.s.r@web.de>
- Date
- Feb 9, 2020, 15:57 UTC
- Message-ID
- <2f8eeca8-bada-d67d-9c96-bf10f97a794e@web.de>
- In-Reply-To
- <11b82734-f61c-5e73-2d0c-22208c06d495@web.de>
Document the fact that the function doesn't modify the two option arrays passed to it by adding the keyword const to each parameter.
Signed-off-by: René Scharfe <l.s.r@web.de> --- parse-options-cb.c | 3 ++- parse-options.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/parse-options-cb.c b/parse-options-cb.c index db6f666ef7..7d56681130 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -181,7 +181,8 @@ struct option *parse_options_dup(const struct option *o) return opts; } -struct option *parse_options_concat(struct option *a, struct option *b) +struct option *parse_options_concat(const struct option *a, + const struct option *b) { struct option *ret; size_t a_len = parse_options_count(a); diff --git a/parse-options.h b/parse-options.h index fdc0c1cb97..1d60205881 100644 --- a/parse-options.h +++ b/parse-options.h @@ -281,7 +281,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, int parse_options_end(struct parse_opt_ctx_t *ctx); struct option *parse_options_dup(const struct option *a); -struct option *parse_options_concat(struct option *a, struct option *b); +struct option *parse_options_concat(const struct option *a, const struct option *b); /*----- some often used options -----*/ int parse_opt_abbrev_cb(const struct option *, const char *, int); -- 2.25.0