diff options
| author |  René Scharfe <l.s.r@web.de> | 2020-02-09 16:57:56 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-10 09:44:58 -0800 |
| commit | c84078573e9dc4b817d8270268583251eed7cff9 (patch) | |
| tree | 944e4477906436375256ea23d5fcaea46d7d93db | |
| parent | parse-options: factor out parse_options_count() (diff) | |
| download | tgif-c84078573e9dc4b817d8270268583251eed7cff9.tar.xz | |
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.c | 3 | ||||
| -rw-r--r-- | 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); |