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()
This commit is contained in:
commit
84c99b2023
@ -860,11 +860,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;
|
||||
|
@ -213,11 +213,10 @@ struct option {
|
||||
* 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);
|
||||
|
Loading…
Reference in New Issue
Block a user