config.c: avoid shadowing global.

This is purely cosmetic, but avoid shadowing "FILE *config_file"
global in git_config_set_multivar() function.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/config.c b/config.c
index 18d59ee6e3295d66c091e32a0cef15327c94c36a..5cc853508ac3ccd29a7142a032eae9df196d79ea 100644 (file)
--- a/config.c
+++ b/config.c
@@ -398,7 +398,7 @@ int git_config_set_multivar(const char* key, const char* value,
        int i;
        struct stat st;
        int fd;
        int i;
        struct stat st;
        int fd;

-       char* config_file = strdup(git_path("config"));
+       char* config_filename = strdup(git_path("config"));

        char* lock_file = strdup(git_path("config.lock"));
        const char* last_dot = strrchr(key, '.');
 
        char* lock_file = strdup(git_path("config.lock"));
        const char* last_dot = strrchr(key, '.');
 


@@ -444,7 +444,7 @@ int git_config_set_multivar(const char* key, const char* value,
        /*
         * If .git/config does not exist yet, write a minimal version.
         */
        /*
         * If .git/config does not exist yet, write a minimal version.
         */

-       if (stat(config_file, &st)) {
+       if (stat(config_filename, &st)) {

                static const char contents[] =
                        "#\n"
                        "# This is the config file\n"
                static const char contents[] =
                        "#\n"
                        "# This is the config file\n"


@@ -523,7 +523,7 @@ int git_config_set_multivar(const char* key, const char* value,
                        return 5;
                }
 
                        return 5;
                }
 

-               in_fd = open(config_file, O_RDONLY, 0666);
+               in_fd = open(config_filename, O_RDONLY, 0666);

                contents = mmap(NULL, st.st_size, PROT_READ,
                        MAP_PRIVATE, in_fd, 0);
                close(in_fd);
                contents = mmap(NULL, st.st_size, PROT_READ,
                        MAP_PRIVATE, in_fd, 0);
                close(in_fd);


@@ -564,12 +564,12 @@ int git_config_set_multivar(const char* key, const char* value,
                                st.st_size - copy_begin);
 
                munmap(contents, st.st_size);
                                st.st_size - copy_begin);
 
                munmap(contents, st.st_size);

-               unlink(config_file);
+               unlink(config_filename);

        }
 
        close(fd);
 
        }
 
        close(fd);
 

-       if (rename(lock_file, config_file) < 0) {
+       if (rename(lock_file, config_filename) < 0) {

                fprintf(stderr, "Could not rename the lock file?\n");
                return 4;
        }
                fprintf(stderr, "Could not rename the lock file?\n");
                return 4;
        }