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

To libify the apply functionality the 'has_include' 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>

diff --git a/builtin/apply.c b/builtin/apply.c
index 0e3de17d053cd48f8e0e64e0f6fb3d004848951e..ebbc7111f8917ec1b94fa472346b74c58339e6f6 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -55,6 +55,7 @@ struct apply_state {
 
        /* Exclude and include path parameters */
        struct string_list limit_by_name;
+       int has_include;
 };
 
 static int newfd = -1;
@@ -1961,7 +1962,6 @@ static void prefix_patch(struct apply_state *state, struct patch *p)
  * include/exclude
  */
 
-static int has_include;
 static void add_name_limit(struct apply_state *state,
                           const char *name,
                           int exclude)
@@ -1997,7 +1997,7 @@ static int use_patch(struct apply_state *state, struct patch *p)
         * not used.  Otherwise, we saw bunch of exclude rules (or none)
         * and such a path is used.
         */
-       return !has_include;
+       return !state->has_include;
 }
 
 
@@ -4534,7 +4534,7 @@ static int option_parse_include(const struct option *opt,
 {
        struct apply_state *state = opt->value;
        add_name_limit(state, arg, 0);
-       has_include = 1;
+       state->has_include = 1;
        return 0;
 }