submodule-config: don't shadow `cache`

Lots of internal functions in submodule-confic.c have a first parameter
`struct submodule_cache *cache`, which currently always refers to the
global variable `cache` in the file. To avoid confusion rename the
global `cache` variable.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule-config.c b/submodule-config.c
index fe8ceabf3009db672d4d2dc5121123961c298212..967bba232a523e6e5bf123ef749c54ab81d113a2 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -30,7 +30,7 @@ enum lookup_type {
        lookup_path
 };
 
        lookup_path
 };
 

-static struct submodule_cache cache;
+static struct submodule_cache the_submodule_cache;

 static int is_cache_init;
 
 static int config_path_cmp(const struct submodule_entry *a,
 static int is_cache_init;
 
 static int config_path_cmp(const struct submodule_entry *a,


@@ -458,14 +458,14 @@ static void ensure_cache_init(void)
        if (is_cache_init)
                return;
 
        if (is_cache_init)
                return;
 

-       cache_init(&cache);
+       cache_init(&the_submodule_cache);

        is_cache_init = 1;
 }
 
 int parse_submodule_config_option(const char *var, const char *value)
 {
        struct parse_config_parameter parameter;
        is_cache_init = 1;
 }
 
 int parse_submodule_config_option(const char *var, const char *value)
 {
        struct parse_config_parameter parameter;

-       parameter.cache = &cache;
+       parameter.cache = &the_submodule_cache;

        parameter.commit_sha1 = NULL;
        parameter.gitmodules_sha1 = null_sha1;
        parameter.overwrite = 1;
        parameter.commit_sha1 = NULL;
        parameter.gitmodules_sha1 = null_sha1;
        parameter.overwrite = 1;


@@ -478,18 +478,18 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
                const char *name)
 {
        ensure_cache_init();
                const char *name)
 {
        ensure_cache_init();

-       return config_from_name(&cache, commit_sha1, name);
+       return config_from_name(&the_submodule_cache, commit_sha1, name);

 }
 
 const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
                const char *path)
 {
        ensure_cache_init();
 }
 
 const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
                const char *path)
 {
        ensure_cache_init();

-       return config_from_path(&cache, commit_sha1, path);
+       return config_from_path(&the_submodule_cache, commit_sha1, path);

 }
 
 void submodule_free(void)
 {
 }
 
 void submodule_free(void)
 {

-       cache_free(&cache);
+       cache_free(&the_submodule_cache);

        is_cache_init = 0;
 }
        is_cache_init = 0;
 }