Browse Source

builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()

A previous change has move the whitespace_option variable from cmd_apply
into 'struct apply_state', so that we can now avoid passing it separately
to set_default_whitespace_mode().

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 9 years ago committed by Junio C Hamano
parent
commit
8bcba3d0d6
  1. 9
      builtin/apply.c

9
builtin/apply.c

@ -132,10 +132,9 @@ static void parse_ignorewhitespace_option(const char *option) @@ -132,10 +132,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);
}

@ -4785,11 +4784,11 @@ int cmd_apply(int argc, const char **argv, const char *prefix) @@ -4785,11 +4784,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) {

Loading…
Cancel
Save