summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2016-05-24 08:11:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-01 17:10:16 (GMT)
commit7243f5f3507abe3d083ec18e44bc7cb464fa06f4 (patch)
treef4862cb5e49e9defb54a57c22d6d24b2040715bd /builtin/apply.c
parent70e1d53df17bc8fa81f3583a50f76753a8bac154 (diff)
downloadgit-7243f5f3507abe3d083ec18e44bc7cb464fa06f4.zip
git-7243f5f3507abe3d083ec18e44bc7cb464fa06f4.tar.gz
git-7243f5f3507abe3d083ec18e44bc7cb464fa06f4.tar.bz2
builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
To libify the apply functionality the 'applied_after_fixing_ws' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 619b8fb..91b6283 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -64,6 +64,7 @@ struct apply_state {
const char *whitespace_option;
int whitespace_error;
int squelch_whitespace_errors;
+ int applied_after_fixing_ws;
};
static int newfd = -1;
@@ -79,7 +80,6 @@ static enum ws_error_action {
die_on_ws_error,
correct_ws_error
} ws_error_action = warn_on_ws_error;
-static int applied_after_fixing_ws;
static enum ws_ignore {
ignore_ws_none,
@@ -2862,7 +2862,7 @@ static int apply_one_fragment(struct apply_state *state,
strbuf_add(&newlines, patch + 1, plen);
}
else {
- ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
+ ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);
}
add_line_info(&postimage, newlines.buf + start, newlines.len - start,
(first == '+' ? 0 : LINE_COMMON));
@@ -4806,11 +4806,11 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
"%d lines add whitespace errors.",
state.whitespace_error),
state.whitespace_error);
- if (applied_after_fixing_ws && state.apply)
+ if (state.applied_after_fixing_ws && state.apply)
warning("%d line%s applied after"
" fixing whitespace errors.",
- applied_after_fixing_ws,
- applied_after_fixing_ws == 1 ? "" : "s");
+ state.applied_after_fixing_ws,
+ state.applied_after_fixing_ws == 1 ? "" : "s");
else if (state.whitespace_error)
warning(Q_("%d line adds whitespace errors.",
"%d lines add whitespace errors.",