From: Christian Couder Date: Sun, 24 Apr 2016 13:33:23 GMT Subject: [PATCH 23/83] builtin/apply: move 'line_termination' global into 'struct apply_state' Message-ID: <1461504863-15946-24-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 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index c45e481..228595d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -59,6 +59,8 @@ struct apply_state { int update_index; int unsafe_paths; + + int line_termination; }; /* @@ -70,7 +72,6 @@ static int state_p_value = 1; static int p_value_known; static int apply = 1; static const char *fake_ancestor; -static int line_termination = '\n'; static unsigned int p_context = UINT_MAX; static const char * const apply_usage[] = { N_("git apply [] [...]"), @@ -3993,7 +3994,8 @@ static void stat_patch_list(struct patch *patch) print_stat_summary(stdout, files, adds, dels); } -static void numstat_patch_list(struct patch *patch) +static void numstat_patch_list(struct apply_state *state, + struct patch *patch) { for ( ; patch; patch = patch->next) { const char *name; @@ -4002,7 +4004,7 @@ static void numstat_patch_list(struct patch *patch) printf("-\t-\t"); else printf("%d\t%d\t", patch->lines_added, patch->lines_deleted); - write_name_quoted(name, stdout, line_termination); + write_name_quoted(name, stdout, state->line_termination); } } @@ -4506,7 +4508,7 @@ static int apply_patch(struct apply_state *state, stat_patch_list(list); if (state->numstat) - numstat_patch_list(list); + numstat_patch_list(state, list); if (state->summary) summary_patch_list(list); @@ -4622,7 +4624,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor, N_("build a temporary index based on embedded index information")), /* Think twice before adding "--nul" synonym to this */ - OPT_SET_INT('z', NULL, &line_termination, + OPT_SET_INT('z', NULL, &state.line_termination, N_("paths are separated with NUL character"), '\0'), OPT_INTEGER('C', NULL, &p_context, N_("ensure at least lines of context match")), @@ -4659,6 +4661,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) memset(&state, 0, sizeof(state)); state.prefix = prefix_; state.prefix_length = state.prefix ? strlen(state.prefix) : 0; + state.line_termination = '\n'; git_apply_config(); if (apply_default_whitespace) -- 2.8.1.300.g5fed0c0