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

config: use a snapshot for the iterator

Browse Source
This commit is contained in:
Carlos Martín Nieto 2014-03-31 08:32:45 +02:00
parent bd95f836f5
commit 0500a1ef4e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config_file.c
View File

@ -113,6 +113,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
static char *escape_value(const char *ptr); static char *escape_value(const char *ptr);
int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in); int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in);
static int config_snapshot(git_config_backend **out, git_config_backend *in);
static void set_parse_error(struct reader *reader, int col, const char *error_str) static void set_parse_error(struct reader *reader, int col, const char *error_str)
{ {
@ -326,6 +327,7 @@ static void backend_free(git_config_backend *_backend)
static void config_iterator_free( static void config_iterator_free(
git_config_iterator* iter) git_config_iterator* iter)
{ {
iter->backend->free(iter->backend);
git__free(iter); git__free(iter);
} }
@ -360,15 +362,27 @@ static int config_iterator_new(
git_config_iterator **iter, git_config_iterator **iter,
struct git_config_backend* backend) struct git_config_backend* backend)
{ {
diskfile_header *h = (diskfile_header *)backend; diskfile_header *h;
git_config_file_iter *it = git__calloc(1, sizeof(git_config_file_iter)); git_config_file_iter *it;
git_config_backend *snapshot;
diskfile_backend *b = (diskfile_backend *) backend;
int error;
if ((error = config_snapshot(&snapshot, backend)) < 0)
return error;
if ((error = snapshot->open(snapshot, b->level)) < 0)
return error;
it = git__calloc(1, sizeof(git_config_file_iter));
GITERR_CHECK_ALLOC(it); GITERR_CHECK_ALLOC(it);
h = (diskfile_header *)snapshot;
/* strmap_begin() is currently a macro returning 0 */ /* strmap_begin() is currently a macro returning 0 */
GIT_UNUSED(h); GIT_UNUSED(h);
it->parent.backend = backend; it->parent.backend = snapshot;
it->iter = git_strmap_begin(h->values); it->iter = git_strmap_begin(h->values);
it->next_var = NULL; it->next_var = NULL;