Commits

Anonymous committed 3a2f2bb

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>

Comments (0)

Files changed (1)

 	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, '.');
 
 	/*
 	 * 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"
 			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);
 				st.st_size - copy_begin);
 
 		munmap(contents, st.st_size);
-		unlink(config_file);
+		unlink(config_filename);
 	}
 
 	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;
 	}