[PATCH 32/83] builtin/apply: move 'p_value_known' global into 'struct apply_state'

[Christian Couder]

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

diff --git a/builtin/apply.c b/builtin/apply.c
index 979849c..fecdb66 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -66,6 +66,7 @@ struct apply_state {
        int line_termination;
 
        int p_value;
+       int p_value_known;
        unsigned int p_context;
 
        const char *patch_input_file;
@@ -76,8 +77,6 @@ struct apply_state {
 
 static int newfd = -1;
 
-static int p_value_known;
-
 static const char * const apply_usage[] = {
        N_("git apply [<options>] [<patch>...]"),
        NULL
@@ -890,14 +889,14 @@ static void parse_traditional_patch(struct apply_state 
*state,
 
        first += 4;     /* skip "--- " */
        second += 4;    /* skip "+++ " */
-       if (!p_value_known) {
+       if (!state->p_value_known) {
                int p, q;
                p = guess_p_value(state, first);
                q = guess_p_value(state, second);
                if (p < 0) p = q;
                if (0 <= p && p == q) {
                        state->p_value = p;
-                       p_value_known = 1;
+                       state->p_value_known = 1;
                }
        }
        if (is_dev_null(first)) {
@@ -4604,7 +4603,7 @@ static int option_parse_p(const struct option *opt,
 {
        struct apply_state *state = opt->value;
        state->p_value = atoi(arg);
-       p_value_known = 1;
+       state->p_value_known = 1;
        return 0;
 }
 
-- 
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