builtin/apply: move 'p_value_known' global into 'struct apply_state'

diff --git a/builtin/apply.c b/builtin/apply.c
index 843fafd629df28355cd286eac33989ab5608ab15..e1b68d4cb75da74f2d567133534514d19cde9302 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -52,6 +52,7 @@ struct apply_state {
        const char *patch_input_file;
        int line_termination;
        int p_value;
+       int p_value_known;
        unsigned int p_context;
 
        /* Exclude and include path parameters */
@@ -61,8 +62,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
@@ -875,14 +874,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)) {
@@ -4588,7 +4587,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;
 }