diff options
| author |   Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-13 15:43:17 -0700 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2019-05-14 16:42:31 +0900 |
| commit | 567fce1e10e77b39203504ad36a273d447ec031a (patch) | |
| tree | e6d3924c59ca8f03b9238607881e450a080111e4 | |
| parent | Git 2.22-rc0 (diff) | |
| download | git-567fce1e10e77b39203504ad36a273d447ec031a.tar.xz git-567fce1e10e77b39203504ad36a273d447ec031a.zip | |
parse-options: adjust `parse_opt_unknown_cb()`s declared return type
In f41179f16ba2 (parse-options: avoid magic return codes, 2019-01-27),
the signature of the low-level parse-opt callback function was changed
to return an `enum`.
And while the implementations were changed, one declaration was left
unchanged, still claiming to return `int`.
This can potentially lead to problems, as compilers are free to choose
any integral type for an `enum` as long as it can represent all declared
values.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | parse-options.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h index bd00cf00490..cd756833a99 100644 --- a/parse-options.h +++ b/parse-options.h @@ -286,7 +286,9 @@ int parse_opt_commit(const struct option *, const char *, int); int parse_opt_tertiary(const struct option *, const char *, int); int parse_opt_string_list(const struct option *, const char *, int); int parse_opt_noop_cb(const struct option *, const char *, int); -int parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, const struct option *, const char *, int); +enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, + const struct option *, + const char *, int); int parse_opt_passthru(const struct option *, const char *, int); int parse_opt_passthru_argv(const struct option *, const char *, int); |