global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-08 08:12:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/parse-options-cleanup' into next

Browse Source 
Change the type of an internal function to return an enum (instead
of int) and replace -2 that was used to signal an error with -1.

* ab/parse-options-cleanup:
  parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
This commit is contained in:
Junio C Hamano
2021-12-08 16:53:36 -08:00
parent ab3ff50ce2 68611f512c
commit f9a2ceb9f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
parse-options.c
View File

@@ -404,8 +404,9 @@ is_abbreviated:
return PARSE_OPT_UNKNOWN;
}
static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
const struct option *options)
static enum parse_opt_result parse_nodash_opt(struct parse_opt_ctx_t *p,
const char *arg,
const struct option *options)
{
const struct option *all_opts = options;
@@ -415,7 +416,7 @@ static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
if (options->short_name == arg[0] && arg[1] == '\0')
return get_value(p, options, all_opts, OPT_SHORT);
}
return -2;
return PARSE_OPT_ERROR;
}
static void check_typos(const char *arg, const struct option *options)