Commit 8a8ea1db12eeeefe2dc3e192f597df9892588f6a
2018-02-28T18:14:52
Merge pull request #4552 from libgit2/cmn/config-header-common Cast less blindly between configuration objects
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
diff --git a/src/config_file.c b/src/config_file.c
index 792a3de..aa9e83b 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -86,14 +86,13 @@ typedef struct {
/* mutex to coordinate accessing the values */
git_mutex values_mutex;
refcounted_strmap *values;
+ const git_repository *repo;
+ git_config_level_t level;
} diskfile_header;
typedef struct {
diskfile_header header;
- git_config_level_t level;
- const git_repository *repo;
-
git_array_t(git_config_parser) readers;
bool locked;
@@ -270,8 +269,8 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
int res;
diskfile_backend *b = (diskfile_backend *)cfg;
- b->level = level;
- b->repo = repo;
+ b->header.level = level;
+ b->header.repo = repo;
if ((res = refcounted_strmap_alloc(&b->header.values)) < 0)
return res;
@@ -327,6 +326,9 @@ static int config_refresh(git_config_backend *cfg)
int error, modified;
uint32_t i;
+ if (b->header.parent.readonly)
+ return config_error_readonly();
+
error = config_is_modified(&modified, &b->file);
if (error < 0 && error != GIT_ENOTFOUND)
goto out;
@@ -343,7 +345,7 @@ static int config_refresh(git_config_backend *cfg)
}
git_array_clear(b->file.includes);
- if ((error = config_read(values->values, b->repo, &b->file, b->level, 0)) < 0)
+ if ((error = config_read(values->values, b->header.repo, &b->file, b->header.level, 0)) < 0)
goto out;
if ((error = git_mutex_lock(&b->header.values_mutex)) < 0) {
@@ -417,13 +419,13 @@ static int config_iterator_new(
diskfile_header *h;
git_config_file_iter *it;
git_config_backend *snapshot;
- diskfile_backend *b = (diskfile_backend *) backend;
+ diskfile_header *bh = (diskfile_header *) backend;
int error;
if ((error = config_snapshot(&snapshot, backend)) < 0)
return error;
- if ((error = snapshot->open(snapshot, b->level, b->repo)) < 0)
+ if ((error = snapshot->open(snapshot, bh->level, bh->repo)) < 0)
return error;
it = git__calloc(1, sizeof(git_config_file_iter));