[PATCH 58/83] builtin/apply: libify parse_ignorewhitespace_option()

[Christian Couder]

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 builtin/apply.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 8d96f70..2f89922 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -57,20 +57,20 @@ static int parse_whitespace_option(struct apply_state 
*state, const char *option
        return error(_("unrecognized whitespace option '%s'"), option);
 }
 
-static void parse_ignorewhitespace_option(struct apply_state *state,
-                                         const char *option)
+static int parse_ignorewhitespace_option(struct apply_state *state,
+                                        const char *option)
 {
        if (!option || !strcmp(option, "no") ||
            !strcmp(option, "false") || !strcmp(option, "never") ||
            !strcmp(option, "none")) {
                state->ws_ignore_action = ignore_ws_none;
-               return;
+               return 0;
        }
        if (!strcmp(option, "change")) {
                state->ws_ignore_action = ignore_ws_change;
-               return;
+               return 0;
        }
-       die(_("unrecognized whitespace ignore option '%s'"), option);
+       return error(_("unrecognized whitespace ignore option '%s'"), option);
 }
 
 static void set_default_whitespace_mode(struct apply_state *state)
@@ -4605,8 +4605,8 @@ static void init_apply_state(struct apply_state *state, 
const char *prefix)
        git_apply_config();
        if (apply_default_whitespace && parse_whitespace_option(state, 
apply_default_whitespace))
                exit(1);
-       if (apply_default_ignorewhitespace)
-               parse_ignorewhitespace_option(state, 
apply_default_ignorewhitespace);
+       if (apply_default_ignorewhitespace && 
parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
+               exit(1);
 }
 
 static void check_apply_state(struct apply_state *state, int force_apply)
-- 
2.8.1.300.g5fed0c0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html