undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/flockfile-stdio'

Browse Source 
Code clean-up.

* jk/flockfile-stdio:
  config: move flockfile() closer to unlocked functions
This commit is contained in:
Junio C Hamano 2018-04-25 13:28:52 +09:00
commit 5d8da91e70
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.c
View File

@ -1426,6 +1426,7 @@ static int do_config_from_file(config_fn_t fn,
void *data)
{
struct config_source top;
int ret;
top.u.file = f;
top.origin_type = origin_type;
@ -1436,7 +1437,10 @@ static int do_config_from_file(config_fn_t fn,
top.do_ungetc = config_file_ungetc;
top.do_ftell = config_file_ftell;
return do_config_from(&top, fn, data);
flockfile(f);
ret = do_config_from(&top, fn, data);
funlockfile(f);
return ret;
}
static int git_config_from_stdin(config_fn_t fn, void *data)
@ -1451,9 +1455,7 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
f = fopen_or_warn(filename, "r");
if (f) {
flockfile(f);
ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, filename, f, data);
funlockfile(f);
fclose(f);
}
return ret;