proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 10:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: split out the refresh step

Browse Source 
This will be used by the writing commands in a later step.
This commit is contained in:
Carlos Martín Nieto 2014-03-31 08:08:17 +02:00
parent c047317e40
commit bd95f836f5
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/config_file.c
View File

@ -254,11 +254,34 @@ static int config_open(git_config_backend *cfg, git_config_level_t level)
return res; return res;
} }
/* The meat of the refresh, as we want to use it in different places */
static int config__refresh(git_config_backend *cfg)
{
git_strmap *values = NULL;
diskfile_backend *b = (diskfile_backend *)cfg;
struct reader *reader = NULL;
int error = 0;
if ((error = git_strmap_alloc(&values)) < 0)
goto out;
reader = git_array_get(b->readers, git_array_size(b->readers) - 1);
if ((error = config_parse(values, b, reader, b->level, 0)) < 0)
goto out;
values = git__swap(b->header.values, values);
out:
free_vars(values);
git_buf_free(&reader->buffer);
return error;
}
static int config_refresh(git_config_backend *cfg) static int config_refresh(git_config_backend *cfg)
{ {
int error = 0, updated = 0, any_updated = 0; int error = 0, updated = 0, any_updated = 0;
diskfile_backend *b = (diskfile_backend *)cfg; diskfile_backend *b = (diskfile_backend *)cfg;
git_strmap *values = NULL;
struct reader *reader = NULL; struct reader *reader = NULL;
uint32_t i; uint32_t i;
@ -278,19 +301,7 @@ static int config_refresh(git_config_backend *cfg)
if (!any_updated) if (!any_updated)
return (error == GIT_ENOTFOUND) ? 0 : error; return (error == GIT_ENOTFOUND) ? 0 : error;
return config__refresh(cfg);
if ((error = git_strmap_alloc(&values)) < 0)
goto cleanup;
if ((error = config_parse(values, b, reader, b->level, 0)) < 0)
goto cleanup;
values = git__swap(b->header.values, values);
cleanup:
free_vars(values);
git_buf_free(&reader->buffer);
return error;
} }
static void backend_free(git_config_backend *_backend) static void backend_free(git_config_backend *_backend)