summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2020-02-09 15:57:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-10 17:44:58 (GMT)
commitc84078573e9dc4b817d8270268583251eed7cff9 (patch)
tree944e4477906436375256ea23d5fcaea46d7d93db
parentf904f9025f070b17a440d019b53e1d70fca3a269 (diff)
downloadgit-c84078573e9dc4b817d8270268583251eed7cff9.zip
git-c84078573e9dc4b817d8270268583251eed7cff9.tar.gz
git-c84078573e9dc4b817d8270268583251eed7cff9.tar.bz2
parse-options: const parse_options_concat() parameters
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--parse-options-cb.c3
-rw-r--r--parse-options.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c
index db6f666..7d56681 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 fdc0c1c..1d60205 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);