diff options
author | Patrick Steinhardt <ps@pks.im> | 2019-07-21 14:41:21 +0200 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2019-07-21 14:41:21 +0200 |
commit | 28d11b59edea9864f1095ece7a81ab61a8fe52b5 (patch) | |
tree | 8180bfe241eb26bc1e1f0b3c4ce83d0719830e40 | |
parent | 82b1d1da2b899461493e95a6bd12d156936f5d7a (diff) | |
download | libgit2-28d11b59edea9864f1095ece7a81ab61a8fe52b5.tar.gz |
config_file: consistently use `GIT_CONTAINER_OF`
-rw-r--r-- | src/config_file.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/config_file.c b/src/config_file.c index 51a3e93e2..a15dba0f2 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -121,8 +121,8 @@ static void config_file_clear(diskfile *file) static int config_open(git_config_backend *cfg, git_config_level_t level, const git_repository *repo) { + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); int res; - diskfile_backend *b = (diskfile_backend *)cfg; b->header.level = level; b->header.repo = repo; @@ -179,7 +179,7 @@ out: static int config_set_entries(git_config_backend *cfg, git_config_entries *entries) { - diskfile_backend *b = (diskfile_backend *)cfg; + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); git_config_entries *old = NULL; diskfile *include; int error; @@ -252,7 +252,7 @@ out: static void backend_free(git_config_backend *_backend) { - diskfile_backend *backend = (diskfile_backend *)_backend; + diskfile_backend *backend = GIT_CONTAINER_OF(_backend, diskfile_backend, header.parent); if (backend == NULL) return; @@ -285,7 +285,7 @@ out: static int config_set(git_config_backend *cfg, const char *name, const char *value) { - diskfile_backend *b = (diskfile_backend *)cfg; + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); git_config_entries *entries; git_config_entry *existing; char *key, *esc_value = NULL; @@ -337,7 +337,7 @@ static void free_diskfile_entry(git_config_entry *entry) */ static int config_get(git_config_backend *cfg, const char *key, git_config_entry **out) { - diskfile_header *h = (diskfile_header *)cfg; + diskfile_header *h = GIT_CONTAINER_OF(cfg, diskfile_header, parent); git_config_entries *entries = NULL; git_config_entry *entry; int error = 0; @@ -363,7 +363,7 @@ static int config_get(git_config_backend *cfg, const char *key, git_config_entry static int config_set_multivar( git_config_backend *cfg, const char *name, const char *regexp, const char *value) { - diskfile_backend *b = (diskfile_backend *)cfg; + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); char *key; p_regex_t preg; int result; @@ -393,7 +393,7 @@ out: static int config_delete(git_config_backend *cfg, const char *name) { - diskfile_backend *b = (diskfile_backend *)cfg; + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); git_config_entries *entries = NULL; git_config_entry *entry; char *key = NULL; @@ -423,7 +423,7 @@ out: static int config_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp) { - diskfile_backend *b = (diskfile_backend *)cfg; + diskfile_backend *b = GIT_CONTAINER_OF(cfg, diskfile_backend, header.parent); git_config_entries *entries = NULL; git_config_entry *entry = NULL; p_regex_t preg = { 0 }; @@ -462,7 +462,7 @@ out: static int config_lock(git_config_backend *_cfg) { - diskfile_backend *cfg = (diskfile_backend *) _cfg; + diskfile_backend *cfg = GIT_CONTAINER_OF(_cfg, diskfile_backend, header.parent); int error; if ((error = git_filebuf_open(&cfg->locked_buf, cfg->file.path, 0, GIT_CONFIG_FILE_MODE)) < 0) @@ -481,7 +481,7 @@ static int config_lock(git_config_backend *_cfg) static int config_unlock(git_config_backend *_cfg, int success) { - diskfile_backend *cfg = (diskfile_backend *) _cfg; + diskfile_backend *cfg = GIT_CONTAINER_OF(_cfg, diskfile_backend, header.parent); int error = 0; if (success) { @@ -581,7 +581,7 @@ static int config_unlock_readonly(git_config_backend *_cfg, int success) static void backend_readonly_free(git_config_backend *_backend) { - diskfile_backend *backend = (diskfile_backend *)_backend; + diskfile_backend *backend = GIT_CONTAINER_OF(_backend, diskfile_backend, header.parent); if (backend == NULL) return; @@ -593,7 +593,7 @@ static void backend_readonly_free(git_config_backend *_backend) static int config_readonly_open(git_config_backend *cfg, git_config_level_t level, const git_repository *repo) { - diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg; + diskfile_readonly_backend *b = GIT_CONTAINER_OF(cfg, diskfile_readonly_backend, header.parent); diskfile_backend *src = b->snapshot_from; diskfile_header *src_header = &src->header; git_config_entries *entries; @@ -623,7 +623,7 @@ static int config_snapshot(git_config_backend **out, git_config_backend *in) backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION; git_mutex_init(&backend->header.values_mutex); - backend->snapshot_from = (diskfile_backend *) in; + backend->snapshot_from = GIT_CONTAINER_OF(in, diskfile_backend, header.parent); backend->header.parent.readonly = 1; backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION; @@ -638,7 +638,7 @@ static int config_snapshot(git_config_backend **out, git_config_backend *in) backend->header.parent.unlock = config_unlock_readonly; backend->header.parent.free = backend_readonly_free; - *out = (git_config_backend *)backend; + *out = &backend->header.parent; return 0; } |