diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-27 07:35:27 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-27 16:28:18 -0800 |
| commit | f41179f16ba2fc16e31be81518536008afe2e278 (patch) | |
| tree | 4a602c0e5688814a2d6823649595f64e5f3588db /builtin/merge.c | |
| parent | parse-options: stop abusing 'callback' for lowlevel callbacks (diff) | |
| download | tgif-f41179f16ba2fc16e31be81518536008afe2e278.tar.xz | |
parse-options: avoid magic return codes
Give names to these magic negative numbers. Make parse_opt_ll_cb
return an enum to make clear it can actually control parse_options()
with different return values (parse_opt_cb can too, but nobody needs
it).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 07839b0bb8..de64d7850e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -112,8 +112,9 @@ static int option_parse_message(const struct option *opt, return 0; } -static int option_read_message(struct parse_opt_ctx_t *ctx, - const struct option *opt, int unset) +static enum parse_opt_result option_read_message(struct parse_opt_ctx_t *ctx, + const struct option *opt, + int unset) { struct strbuf *buf = opt->value; const char *arg; |