Skip to content

G
git2
Commit c2749849 by Patrick Steinhardt
Options

config_file: rename function names 

As with the predecessing commit, this commit renames backend functions
of the configuration file backend. This helps to clearly separate
functionality and also to be able to see from backtraces which backend
is currently in use.
parent b30b04a9
Showing with 63 additions and 58 deletions
src/config_file.c
...@@ -60,9 +60,9 @@ typedef struct { ...@@ -60,9 +60,9 @@ typedef struct {
unsigned int depth; unsigned int depth;
} config_file_parse_data; } config_file_parse_data;
static int config_read(git_config_entries *entries, const git_repository *repo, config_file *file, git_config_level_t level, int depth); static int config_file_read(git_config_entries *entries, const git_repository *repo, config_file *file, git_config_level_t level, int depth);
static int config_read_buffer(git_config_entries *entries, const git_repository *repo, config_file *file, git_config_level_t level, int depth, const char *buf, size_t buflen); static int config_file_read_buffer(git_config_entries *entries, const git_repository *repo, config_file *file, git_config_level_t level, int depth, const char *buf, size_t buflen);
static int config_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char *value); static int config_file_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char *value);
static char *escape_value(const char *ptr); static char *escape_value(const char *ptr);
/** /**
...@@ -70,7 +70,7 @@ static char *escape_value(const char *ptr); ...@@ -70,7 +70,7 @@ static char *escape_value(const char *ptr);
* refcount. This is its own function to make sure we use the mutex to * refcount. This is its own function to make sure we use the mutex to
* avoid the map pointer from changing under us. * avoid the map pointer from changing under us.
*/ */
static git_config_entries *diskfile_entries_take(config_file_backend *b) static git_config_entries *config_file_entries_take(config_file_backend *b)
{ {
git_config_entries *entries; git_config_entries *entries;
...@@ -103,7 +103,7 @@ static void config_file_clear(config_file *file) ...@@ -103,7 +103,7 @@ static void config_file_clear(config_file *file)
git__free(file->path); git__free(file->path);
} }
static int config_open(git_config_backend *cfg, git_config_level_t level, const git_repository *repo) static int config_file_open(git_config_backend *cfg, git_config_level_t level, const git_repository *repo)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
int res; int res;
...@@ -117,7 +117,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const ...@@ -117,7 +117,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
if (!git_path_exists(b->file.path)) if (!git_path_exists(b->file.path))
return 0; return 0;
if (res < 0 || (res = config_read(b->entries, repo, &b->file, level, 0)) < 0) { if (res < 0 || (res = config_file_read(b->entries, repo, &b->file, level, 0)) < 0) {
git_config_entries_free(b->entries); git_config_entries_free(b->entries);
b->entries = NULL; b->entries = NULL;
} }
...@@ -125,7 +125,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const ...@@ -125,7 +125,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
return res; return res;
} }
static int config_is_modified(int *modified, config_file *file) static int config_file_is_modified(int *modified, config_file *file)
{ {
config_file *include; config_file *include;
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
...@@ -151,7 +151,7 @@ static int config_is_modified(int *modified, config_file *file) ...@@ -151,7 +151,7 @@ static int config_is_modified(int *modified, config_file *file)
check_includes: check_includes:
git_array_foreach(file->includes, i, include) { git_array_foreach(file->includes, i, include) {
if ((error = config_is_modified(modified, include)) < 0 || *modified) if ((error = config_file_is_modified(modified, include)) < 0 || *modified)
goto out; goto out;
} }
...@@ -161,7 +161,7 @@ out: ...@@ -161,7 +161,7 @@ out:
return error; return error;
} }
static int config_set_entries(git_config_backend *cfg, git_config_entries *entries) static int config_file_set_entries(git_config_backend *cfg, git_config_entries *entries)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *old = NULL; git_config_entries *old = NULL;
...@@ -193,16 +193,16 @@ out: ...@@ -193,16 +193,16 @@ out:
return error; return error;
} }
static int config_refresh_from_buffer(git_config_backend *cfg, const char *buf, size_t buflen) static int config_file_refresh_from_buffer(git_config_backend *cfg, const char *buf, size_t buflen)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
int error; int error;
if ((error = git_config_entries_new(&entries)) < 0 || if ((error = git_config_entries_new(&entries)) < 0 ||
(error = config_read_buffer(entries, b->repo, &b->file, (error = config_file_read_buffer(entries, b->repo, &b->file,
b->level, 0, buf, buflen)) < 0 || b->level, 0, buf, buflen)) < 0 ||
(error = config_set_entries(cfg, entries)) < 0) (error = config_file_set_entries(cfg, entries)) < 0)
goto out; goto out;
entries = NULL; entries = NULL;
...@@ -211,7 +211,7 @@ out: ...@@ -211,7 +211,7 @@ out:
return error; return error;
} }
static int config_refresh(git_config_backend *cfg) static int config_file_refresh(git_config_backend *cfg)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
...@@ -220,15 +220,15 @@ static int config_refresh(git_config_backend *cfg) ...@@ -220,15 +220,15 @@ static int config_refresh(git_config_backend *cfg)
if (cfg->readonly) if (cfg->readonly)
return 0; return 0;
if ((error = config_is_modified(&modified, &b->file)) < 0 && error != GIT_ENOTFOUND) if ((error = config_file_is_modified(&modified, &b->file)) < 0 && error != GIT_ENOTFOUND)
goto out; goto out;
if (!modified) if (!modified)
return 0; return 0;
if ((error = git_config_entries_new(&entries)) < 0 || if ((error = git_config_entries_new(&entries)) < 0 ||
(error = config_read(entries, b->repo, &b->file, b->level, 0)) < 0 || (error = config_file_read(entries, b->repo, &b->file, b->level, 0)) < 0 ||
(error = config_set_entries(cfg, entries)) < 0) (error = config_file_set_entries(cfg, entries)) < 0)
goto out; goto out;
entries = NULL; entries = NULL;
...@@ -238,7 +238,7 @@ out: ...@@ -238,7 +238,7 @@ out:
return (error == GIT_ENOTFOUND) ? 0 : error; return (error == GIT_ENOTFOUND) ? 0 : error;
} }
static void backend_free(git_config_backend *_backend) static void config_file_free(git_config_backend *_backend)
{ {
config_file_backend *backend = GIT_CONTAINER_OF(_backend, config_file_backend, parent); config_file_backend *backend = GIT_CONTAINER_OF(_backend, config_file_backend, parent);
...@@ -251,7 +251,7 @@ static void backend_free(git_config_backend *_backend) ...@@ -251,7 +251,7 @@ static void backend_free(git_config_backend *_backend)
git__free(backend); git__free(backend);
} }
static int config_iterator_new( static int config_file_iterator(
git_config_iterator **iter, git_config_iterator **iter,
struct git_config_backend *backend) struct git_config_backend *backend)
{ {
...@@ -259,7 +259,7 @@ static int config_iterator_new( ...@@ -259,7 +259,7 @@ static int config_iterator_new(
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
int error; int error;
if ((error = config_refresh(backend)) < 0 || if ((error = config_file_refresh(backend)) < 0 ||
(error = git_config_entries_dup(&entries, b->entries)) < 0 || (error = git_config_entries_dup(&entries, b->entries)) < 0 ||
(error = git_config_entries_iterator_new(iter, entries)) < 0) (error = git_config_entries_iterator_new(iter, entries)) < 0)
goto out; goto out;
...@@ -270,7 +270,12 @@ out: ...@@ -270,7 +270,12 @@ out:
return error; return error;
} }
static int config_set(git_config_backend *cfg, const char *name, const char *value) static int config_file_snapshot(git_config_backend **out, git_config_backend *backend)
{
return git_config_backend_snapshot(out, backend);
}
static int config_file_set(git_config_backend *cfg, const char *name, const char *value)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries; git_config_entries *entries;
...@@ -281,7 +286,7 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val ...@@ -281,7 +286,7 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val
if ((error = git_config__normalize_name(name, &key)) < 0) if ((error = git_config__normalize_name(name, &key)) < 0)
return error; return error;
if ((entries = diskfile_entries_take(b)) == NULL) if ((entries = config_file_entries_take(b)) == NULL)
return -1; return -1;
/* Check whether we'd be modifying an included or multivar key */ /* Check whether we'd be modifying an included or multivar key */
...@@ -302,7 +307,7 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val ...@@ -302,7 +307,7 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val
GIT_ERROR_CHECK_ALLOC(esc_value); GIT_ERROR_CHECK_ALLOC(esc_value);
} }
if ((error = config_write(b, name, key, NULL, esc_value)) < 0) if ((error = config_file_write(b, name, key, NULL, esc_value)) < 0)
goto out; goto out;
out: out:
...@@ -313,7 +318,7 @@ out: ...@@ -313,7 +318,7 @@ out:
} }
/* release the map containing the entry as an equivalent to freeing it */ /* release the map containing the entry as an equivalent to freeing it */
static void free_diskfile_entry(git_config_entry *entry) static void config_file_entry_free(git_config_entry *entry)
{ {
git_config_entries *entries = (git_config_entries *) entry->payload; git_config_entries *entries = (git_config_entries *) entry->payload;
git_config_entries_free(entries); git_config_entries_free(entries);
...@@ -322,17 +327,17 @@ static void free_diskfile_entry(git_config_entry *entry) ...@@ -322,17 +327,17 @@ static void free_diskfile_entry(git_config_entry *entry)
/* /*
* Internal function that actually gets the value in string form * Internal function that actually gets the value in string form
*/ */
static int config_get(git_config_backend *cfg, const char *key, git_config_entry **out) static int config_file_get(git_config_backend *cfg, const char *key, git_config_entry **out)
{ {
config_file_backend *h = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *h = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
git_config_entry *entry; git_config_entry *entry;
int error = 0; int error = 0;
if (!h->parent.readonly && ((error = config_refresh(cfg)) < 0)) if (!h->parent.readonly && ((error = config_file_refresh(cfg)) < 0))
return error; return error;
if ((entries = diskfile_entries_take(h)) == NULL) if ((entries = config_file_entries_take(h)) == NULL)
return -1; return -1;
if ((error = (git_config_entries_get(&entry, entries, key))) < 0) { if ((error = (git_config_entries_get(&entry, entries, key))) < 0) {
...@@ -340,14 +345,14 @@ static int config_get(git_config_backend *cfg, const char *key, git_config_entry ...@@ -340,14 +345,14 @@ static int config_get(git_config_backend *cfg, const char *key, git_config_entry
return error; return error;
} }
entry->free = free_diskfile_entry; entry->free = config_file_entry_free;
entry->payload = entries; entry->payload = entries;
*out = entry; *out = entry;
return 0; return 0;
} }
static int config_set_multivar( static int config_file_set_multivar(
git_config_backend *cfg, const char *name, const char *regexp, const char *value) git_config_backend *cfg, const char *name, const char *regexp, const char *value)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
...@@ -363,8 +368,8 @@ static int config_set_multivar( ...@@ -363,8 +368,8 @@ static int config_set_multivar(
if ((result = git_regexp_compile(&preg, regexp, 0)) < 0) if ((result = git_regexp_compile(&preg, regexp, 0)) < 0)
goto out; goto out;
/* If we do have it, set call config_write() and reload */ /* If we do have it, set call config_file_write() and reload */
if ((result = config_write(b, name, key, &preg, value)) < 0) if ((result = config_file_write(b, name, key, &preg, value)) < 0)
goto out; goto out;
out: out:
...@@ -374,7 +379,7 @@ out: ...@@ -374,7 +379,7 @@ out:
return result; return result;
} }
static int config_delete(git_config_backend *cfg, const char *name) static int config_file_delete(git_config_backend *cfg, const char *name)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
...@@ -385,7 +390,7 @@ static int config_delete(git_config_backend *cfg, const char *name) ...@@ -385,7 +390,7 @@ static int config_delete(git_config_backend *cfg, const char *name)
if ((error = git_config__normalize_name(name, &key)) < 0) if ((error = git_config__normalize_name(name, &key)) < 0)
goto out; goto out;
if ((entries = diskfile_entries_take(b)) == NULL) if ((entries = config_file_entries_take(b)) == NULL)
goto out; goto out;
/* Check whether we'd be modifying an included or multivar key */ /* Check whether we'd be modifying an included or multivar key */
...@@ -395,7 +400,7 @@ static int config_delete(git_config_backend *cfg, const char *name) ...@@ -395,7 +400,7 @@ static int config_delete(git_config_backend *cfg, const char *name)
goto out; goto out;
} }
if ((error = config_write(b, name, entry->name, NULL, NULL)) < 0) if ((error = config_file_write(b, name, entry->name, NULL, NULL)) < 0)
goto out; goto out;
out: out:
...@@ -404,7 +409,7 @@ out: ...@@ -404,7 +409,7 @@ out:
return error; return error;
} }
static int config_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp) static int config_file_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp)
{ {
config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent); config_file_backend *b = GIT_CONTAINER_OF(cfg, config_file_backend, parent);
git_config_entries *entries = NULL; git_config_entries *entries = NULL;
...@@ -416,7 +421,7 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con ...@@ -416,7 +421,7 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con
if ((result = git_config__normalize_name(name, &key)) < 0) if ((result = git_config__normalize_name(name, &key)) < 0)
goto out; goto out;
if ((entries = diskfile_entries_take(b)) == NULL) { if ((entries = config_file_entries_take(b)) == NULL) {
result = -1; result = -1;
goto out; goto out;
} }
...@@ -430,7 +435,7 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con ...@@ -430,7 +435,7 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con
if ((result = git_regexp_compile(&preg, regexp, 0)) < 0) if ((result = git_regexp_compile(&preg, regexp, 0)) < 0)
goto out; goto out;
if ((result = config_write(b, name, key, &preg, NULL)) < 0) if ((result = config_file_write(b, name, key, &preg, NULL)) < 0)
goto out; goto out;
out: out:
...@@ -440,7 +445,7 @@ out: ...@@ -440,7 +445,7 @@ out:
return result; return result;
} }
static int config_lock(git_config_backend *_cfg) static int config_file_lock(git_config_backend *_cfg)
{ {
config_file_backend *cfg = GIT_CONTAINER_OF(_cfg, config_file_backend, parent); config_file_backend *cfg = GIT_CONTAINER_OF(_cfg, config_file_backend, parent);
int error; int error;
...@@ -459,7 +464,7 @@ static int config_lock(git_config_backend *_cfg) ...@@ -459,7 +464,7 @@ static int config_lock(git_config_backend *_cfg)
} }
static int config_unlock(git_config_backend *_cfg, int success) static int config_file_unlock(git_config_backend *_cfg, int success)
{ {
config_file_backend *cfg = GIT_CONTAINER_OF(_cfg, config_file_backend, parent); config_file_backend *cfg = GIT_CONTAINER_OF(_cfg, config_file_backend, parent);
int error = 0; int error = 0;
...@@ -490,17 +495,17 @@ int git_config_backend_from_file(git_config_backend **out, const char *path) ...@@ -490,17 +495,17 @@ int git_config_backend_from_file(git_config_backend **out, const char *path)
GIT_ERROR_CHECK_ALLOC(backend->file.path); GIT_ERROR_CHECK_ALLOC(backend->file.path);
git_array_init(backend->file.includes); git_array_init(backend->file.includes);
backend->parent.open = config_open; backend->parent.open = config_file_open;
backend->parent.get = config_get; backend->parent.get = config_file_get;
backend->parent.set = config_set; backend->parent.set = config_file_set;
backend->parent.set_multivar = config_set_multivar; backend->parent.set_multivar = config_file_set_multivar;
backend->parent.del = config_delete; backend->parent.del = config_file_delete;
backend->parent.del_multivar = config_delete_multivar; backend->parent.del_multivar = config_file_delete_multivar;
backend->parent.iterator = config_iterator_new; backend->parent.iterator = config_file_iterator;
backend->parent.snapshot = git_config_backend_snapshot; backend->parent.snapshot = config_file_snapshot;
backend->parent.lock = config_lock; backend->parent.lock = config_file_lock;
backend->parent.unlock = config_unlock; backend->parent.unlock = config_file_unlock;
backend->parent.free = backend_free; backend->parent.free = config_file_free;
*out = (git_config_backend *)backend; *out = (git_config_backend *)backend;
...@@ -574,8 +579,8 @@ static int parse_include(config_file_parse_data *parse_data, const char *file) ...@@ -574,8 +579,8 @@ static int parse_include(config_file_parse_data *parse_data, const char *file)
git_array_init(include->includes); git_array_init(include->includes);
include->path = git_buf_detach(&path); include->path = git_buf_detach(&path);
result = config_read(parse_data->entries, parse_data->repo, result = config_file_read(parse_data->entries, parse_data->repo, include,
include, parse_data->level, parse_data->depth+1); parse_data->level, parse_data->depth+1);
if (result == GIT_ENOTFOUND) { if (result == GIT_ENOTFOUND) {
git_error_clear(); git_error_clear();
...@@ -793,7 +798,7 @@ static int read_on_variable( ...@@ -793,7 +798,7 @@ static int read_on_variable(
return result; return result;
} }
static int config_read_buffer( static int config_file_read_buffer(
git_config_entries *entries, git_config_entries *entries,
const git_repository *repo, const git_repository *repo,
config_file *file, config_file *file,
...@@ -833,7 +838,7 @@ out: ...@@ -833,7 +838,7 @@ out:
return error; return error;
} }
static int config_read( static int config_file_read(
git_config_entries *entries, git_config_entries *entries,
const git_repository *repo, const git_repository *repo,
config_file *file, config_file *file,
...@@ -856,8 +861,8 @@ static int config_read( ...@@ -856,8 +861,8 @@ static int config_read(
if ((error = git_hash_buf(&file->checksum, contents.ptr, contents.size)) < 0) if ((error = git_hash_buf(&file->checksum, contents.ptr, contents.size)) < 0)
goto out; goto out;
if ((error = config_read_buffer(entries, repo, file, level, depth, if ((error = config_file_read_buffer(entries, repo, file, level, depth,
contents.ptr, contents.size)) < 0) contents.ptr, contents.size)) < 0)
goto out; goto out;
out: out:
...@@ -1088,7 +1093,7 @@ static int write_on_eof( ...@@ -1088,7 +1093,7 @@ static int write_on_eof(
/* /*
* This is pretty much the parsing, except we write out anything we don't have * This is pretty much the parsing, except we write out anything we don't have
*/ */
static int config_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char* value) static int config_file_write(config_file_backend *cfg, const char *orig_key, const char *key, const git_regexp *preg, const char* value)
{ {
char *orig_section = NULL, *section = NULL, *orig_name, *name, *ldot; char *orig_section = NULL, *section = NULL, *orig_name, *name, *ldot;
...@@ -1149,7 +1154,7 @@ static int config_write(config_file_backend *cfg, const char *orig_key, const ch ...@@ -1149,7 +1154,7 @@ static int config_write(config_file_backend *cfg, const char *orig_key, const ch
if ((error = git_filebuf_commit(&file)) < 0) if ((error = git_filebuf_commit(&file)) < 0)
goto done; goto done;
if ((error = config_refresh_from_buffer(&cfg->parent, buf.ptr, buf.size)) < 0) if ((error = config_file_refresh_from_buffer(&cfg->parent, buf.ptr, buf.size)) < 0)
goto done; goto done;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment