From c84078573e9dc4b817d8270268583251eed7cff9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 9 Feb 2020 16:57:56 +0100 Subject: [PATCH] parse-options: const parse_options_concat() parameters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- 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.11.4.GIT