From: Jonathan Nieder Date: Tue, 30 Nov 2010 03:04:41 GMT Subject: [PATCH 2/6] parse-options: do not infer PARSE_OPT_NOARG from option type Message-ID: <20101130030441.GC5326@burratino> In-Reply-To: <20101130025223.GA5326@burratino> From: Stephen Boyd Simplify the "takes no value" error path by relying on PARSE_OPT_NOARG being set correctly. That is: - if the PARSE_OPT_NOARG flag is set, reject --opt=value regardless of the option type; - if the PARSE_OPT_NOARG flag is unset, accept --opt=value regardless of the option type. This way, the accepted usage more closely matches the usage advertised with --help-all. No functional change intended, since the NOARG flag is only used with "boolean-only" option types in existing parse_options callers. Signed-off-by: Jonathan Nieder --- parse-options.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/parse-options.c b/parse-options.c index 1806bb3..bc92d69 100644 --- a/parse-options.c +++ b/parse-options.c @@ -77,23 +77,8 @@ static int get_value(struct parse_opt_ctx_t *p, return opterror(opt, "takes no value", flags); if (unset && (opt->flags & PARSE_OPT_NONEG)) return opterror(opt, "isn't available", flags); - - if (!(flags & OPT_SHORT) && p->opt) { - switch (opt->type) { - case OPTION_CALLBACK: - if (!(opt->flags & PARSE_OPT_NOARG)) - break; - /* FALLTHROUGH */ - case OPTION_BOOLEAN: - case OPTION_BIT: - case OPTION_NEGBIT: - case OPTION_SET_INT: - case OPTION_SET_PTR: - return opterror(opt, "takes no value", flags); - default: - break; - } - } + if (!(flags & OPT_SHORT) && p->opt && (opt->flags & PARSE_OPT_NOARG)) + return opterror(opt, "takes no value", flags); switch (opt->type) { case OPTION_BIT: -- 1.7.2.3