kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2005-11-25 11:10:49 -08:00
parent 874fbc3323
commit 3a2f2bb354
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.c
View File

@ -398,7 +398,7 @@ int git_config_set_multivar(const char* key, const char* value,
int i; int i;
struct stat st; struct stat st;
int fd; int fd;
char* config_file = strdup(git_path("config")); char* config_filename = strdup(git_path("config"));
char* lock_file = strdup(git_path("config.lock")); char* lock_file = strdup(git_path("config.lock"));
const char* last_dot = strrchr(key, '.'); 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[] = static const char contents[] =
"#\n" "#\n"
"# This is the config file\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, contents = mmap(NULL, st.st_size, PROT_READ,
MAP_PRIVATE, in_fd, 0); MAP_PRIVATE, in_fd, 0);
close(in_fd); close(in_fd);
@ -564,12 +564,12 @@ int git_config_set_multivar(const char* key, const char* value,
st.st_size - copy_begin); st.st_size - copy_begin);


munmap(contents, st.st_size); 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"); fprintf(stderr, "Could not rename the lock file?\n");
return 4; return 4;
} }