From: Christian Couder Date: Sun, 24 Apr 2016 13:33:57 GMT Subject: [PATCH 57/83] builtin/apply: libify parse_whitespace_option() Message-ID: <1461504863-15946-58-git-send-email-chriscool@tuxfamily.org> In-Reply-To: <1461504863-15946-1-git-send-email-chriscool@tuxfamily.org> Signed-off-by: Christian Couder --- builtin/apply.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1c1ac7d..8d96f70 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -27,34 +27,34 @@ static const char * const apply_usage[] = { NULL }; -static void parse_whitespace_option(struct apply_state *state, const char *option) +static int parse_whitespace_option(struct apply_state *state, const char *option) { if (!option) { state->ws_error_action = warn_on_ws_error; - return; + return 0; } if (!strcmp(option, "warn")) { state->ws_error_action = warn_on_ws_error; - return; + return 0; } if (!strcmp(option, "nowarn")) { state->ws_error_action = nowarn_ws_error; - return; + return 0; } if (!strcmp(option, "error")) { state->ws_error_action = die_on_ws_error; - return; + return 0; } if (!strcmp(option, "error-all")) { state->ws_error_action = die_on_ws_error; state->squelch_whitespace_errors = 0; - return; + return 0; } if (!strcmp(option, "strip") || !strcmp(option, "fix")) { state->ws_error_action = correct_ws_error; - return; + return 0; } - die(_("unrecognized whitespace option '%s'"), option); + return error(_("unrecognized whitespace option '%s'"), option); } static void parse_ignorewhitespace_option(struct apply_state *state, @@ -4572,7 +4572,8 @@ static int option_parse_whitespace(const struct option *opt, { struct apply_state *state = opt->value; state->whitespace_option = arg; - parse_whitespace_option(state, arg); + if (parse_whitespace_option(state, arg)) + exit(1); return 0; } @@ -4602,8 +4603,8 @@ static void init_apply_state(struct apply_state *state, const char *prefix) strbuf_init(&state->root, 0); git_apply_config(); - if (apply_default_whitespace) - parse_whitespace_option(state, apply_default_whitespace); + if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) + exit(1); if (apply_default_ignorewhitespace) parse_ignorewhitespace_option(state, apply_default_ignorewhitespace); } -- 2.8.1.300.g5fed0c0