Merge branch 'ab/parse-options-cleanup'
Last minute fix to the update already in 'master'.
* ab/parse-options-cleanup:
parse-options.[ch]: revert use of "enum" for parse_options()
diff --git a/parse-options.c b/parse-options.c
index 9a0484c..fc5b43f 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -860,11 +860,11 @@
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;
diff --git a/parse-options.h b/parse-options.h
index bdea052..275fb44 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -213,11 +213,10 @@
* untouched and parse_options() returns the number of options
* processed.
*/
-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);
NORETURN void usage_with_options(const char * const *usagestr,
const struct option *options);
