aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 16:45:34 +0900
committerJunio C Hamano <gitster@pobox.com>2019-05-19 16:45:34 +0900
commit7a09f5f1b6b506e31d2f8e10ec09a7d2977317aa (patch)
treeccb1c224395a69f6365d735b8227ad3966993d09
parentMerge branch 'ab/sha1dc' (diff)
parentparse-options: adjust `parse_opt_unknown_cb()`s declared return type (diff)
downloadgit-7a09f5f1b6b506e31d2f8e10ec09a7d2977317aa.tar.xz
git-7a09f5f1b6b506e31d2f8e10ec09a7d2977317aa.zip
Merge branch 'js/parseopt-unknown-cb-returns-an-enum'
Code clean-up. * js/parseopt-unknown-cb-returns-an-enum: parse-options: adjust `parse_opt_unknown_cb()`s declared return type
-rw-r--r--parse-options.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/parse-options.h b/parse-options.h
index 98ea42ffd9e..ac6ba8abf9e 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -292,7 +292,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);