Merge branch 'ab/parse-options-cleanup'

[thirdparty/git.git] / parse-options.c

diff --git a/parse-options.c b/parse-options.c
index 9a0484c883145b2f056172d84f8a549b65a4bb3e..629e79634973a6474054b888cff8be4383086a2a 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -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)
@@ -860,11 +861,11 @@ int parse_options_end(struct parse_opt_ctx_t *ctx)
        return ctx->cpidx + ctx->argc;
 }
 
-enum parse_opt_result parse_options(int argc, const char **argv,
-                                   const char *prefix,
-                                   const struct option *options,
-                                   const char * const usagestr[],
-                                   enum parse_opt_flags flags)
+int parse_options(int argc, const char **argv,
+                 const char *prefix,
+                 const struct option *options,
+                 const char * const usagestr[],
+                 enum parse_opt_flags flags)
 {
        struct parse_opt_ctx_t ctx;
        struct option *real_options;