[PATCH 36/83] builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
From: Christian Couder <hidden>
Date: 2016-06-16 02:18:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- builtin/apply.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 64bc3e9..401e111 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c@@ -147,10 +147,9 @@ static void parse_ignorewhitespace_option(const char *option) die(_("unrecognized whitespace ignore option '%s'"), option); } -static void set_default_whitespace_mode(struct apply_state *state, - const char *whitespace_option) +static void set_default_whitespace_mode(struct apply_state *state) { - if (!whitespace_option && !apply_default_whitespace) + if (!state->whitespace_option && !apply_default_whitespace) ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); }
@@ -4790,11 +4789,11 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) if (fd < 0) die_errno(_("can't open patch '%s'"), arg); read_stdin = 0; - set_default_whitespace_mode(&state, state.whitespace_option); + set_default_whitespace_mode(&state); errs |= apply_patch(&state, fd, arg, options); close(fd); } - set_default_whitespace_mode(&state, state.whitespace_option); + set_default_whitespace_mode(&state); if (read_stdin) errs |= apply_patch(&state, 0, "<stdin>", options); if (state.whitespace_error) {
--
2.8.1.300.g5fed0c0