Commit 2280b388c913cbc4eee35ce99c760316206e2703
2014-04-09T13:17:51
config: share the strmap on snapshot Now that our strmap is no longer modified but replaced, we can use the same strmap for the snapshot's values and it will be freed when we don't need it anymore.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/config_file.c b/src/config_file.c
index c53ec01..c09a032 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -762,71 +762,19 @@ static void backend_readonly_free(git_config_backend *_backend)
git__free(backend);
}
-static int config_entry_dup(git_config_entry **out, git_config_entry *src)
-{
- git_config_entry *entry;
-
- entry = git__calloc(1, sizeof(git_config_entry));
- GITERR_CHECK_ALLOC(entry);
-
- entry->level = src->level;
- entry->name = git__strdup(src->name);
- GITERR_CHECK_ALLOC(entry->name);
- entry->value = git__strdup(src->value);
- GITERR_CHECK_ALLOC(entry->value);
-
- *out = entry;
-
- return 0;
-}
-
static int config_readonly_open(git_config_backend *cfg, git_config_level_t level)
{
diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg;
diskfile_backend *src = b->snapshot_from;
refcounted_strmap *src_map;
- git_strmap *src_values, *values;
- git_strmap_iter i;
- cvar_t *src_var;
- int error;
/* We're just copying data, don't care about the level */
GIT_UNUSED(level);
- if ((error = refcounted_strmap_alloc(&b->header.values)) < 0)
- return error;
-
src_map = refcounted_strmap_take(&src->header);
- src_values = src->header.values->values;
- values = b->header.values->values;
+ b->header.values = src_map;
- i = git_strmap_begin(src_values);
- while ((error = git_strmap_next((void **) &src_var, &i, src_values)) == 0) {
- do {
- git_config_entry *entry;
- cvar_t *var;
-
- var = git__calloc(1, sizeof(cvar_t));
- GITERR_CHECK_ALLOC(var);
-
- if (config_entry_dup(&entry, src_var->entry) < 0) {
- refcounted_strmap_free(b->header.values);
- refcounted_strmap_free(src_map);
- return -1;
- }
-
- var->entry = entry;
-
- error = append_entry(values, var);
- src_var = CVAR_LIST_NEXT(src_var);
- } while (src_var != NULL && error == 0);
- }
-
- if (error == GIT_ITEROVER)
- error = 0;
-
- refcounted_strmap_free(src_map);
- return error;
+ return 0;
}
int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in)