Skip to content

Commit 68611f5

Browse files
avargitster
authored andcommitted
parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
Change the parse_nodash_opt() function to use "enum parse_opt_result". In 352e761 (parse-options.[ch]: consistently use "enum parse_opt_result", 2021-10-08) its only caller parse_options_step() started using that return type, and the get_value() which will be called and return from it uses the same enum. Let's do the same here so that this function always returns an "enum parse_opt_result" value. We could go for either PARSE_OPT_HELP (-2) or PARSE_OPT_ERROR (-1) here. The reason we ended up with "-2" is that in code added in 07fe54d (parse-opt: do not print errors on unknown options, return "-2" instead., 2008-06-23) we used that value in a meaningful way. Then in 51a9949 (parseopt: add PARSE_OPT_NODASH, 2009-05-07) the use of "-2" was seemingly copy/pasted from parse_long_opt(), which was the function immediately above the parse_nodash_opt() function added in that commit. Since we only care about whether the return value here is non-zero let's use the more generic PARSE_OPT_ERROR. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 06a199f commit 68611f5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

parse-options.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,9 @@ static enum parse_opt_result parse_long_opt(
404404
return PARSE_OPT_UNKNOWN;
405405
}
406406

407-
static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
408-
const struct option *options)
407+
static enum parse_opt_result parse_nodash_opt(struct parse_opt_ctx_t *p,
408+
const char *arg,
409+
const struct option *options)
409410
{
410411
const struct option *all_opts = options;
411412

@@ -415,7 +416,7 @@ static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
415416
if (options->short_name == arg[0] && arg[1] == '\0')
416417
return get_value(p, options, all_opts, OPT_SHORT);
417418
}
418-
return -2;
419+
return PARSE_OPT_ERROR;
419420
}
420421

421422
static void check_typos(const char *arg, const struct option *options)

0 commit comments

Comments
 (0)