diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2017-11-04 18:00:56 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2017-11-04 18:00:56 +0100 |
| commit | 1475b981a4ee82409f3e92e4949dcf4e417a9f1f (patch) | |
| tree | ad3a7ca0d6ada0a864b13552bd660e2a2105e2ae /src | |
| parent | c44b91705c4fa3c8996e4d98d3ba23b1ecc4034b (diff) | |
| download | libgit2-1475b981a4ee82409f3e92e4949dcf4e417a9f1f.tar.gz | |
config: keep the output parameter at the start of the function
Diffstat (limited to 'src')
| -rw-r--r-- | src/config_file.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/config_file.c b/src/config_file.c index ffcdca7d3..6e004ff69 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -120,7 +120,7 @@ typedef struct { diskfile_backend *snapshot_from; } diskfile_readonly_backend; -static int config_read(const git_repository *repo, git_strmap *values, struct config_file *file, git_config_level_t level, int depth); +static int config_read(git_strmap *values, const git_repository *repo, struct config_file *file, git_config_level_t level, int depth); static int config_write(diskfile_backend *cfg, const char *key, const regex_t *preg, const char *value); static char *escape_value(const char *ptr); @@ -297,7 +297,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const if (!git_path_exists(b->file.path)) return 0; - if (res < 0 || (res = config_read(repo, b->header.values->values, &b->file, level, 0)) < 0) { + if (res < 0 || (res = config_read(b->header.values->values, repo, &b->file, level, 0)) < 0) { refcounted_strmap_free(b->header.values); b->header.values = NULL; } @@ -361,7 +361,7 @@ static int config_refresh(git_config_backend *cfg) } git_array_clear(b->file.includes); - if ((error = config_read(b->repo, values->values, &b->file, b->level, 0)) < 0) + if ((error = config_read(values->values, b->repo, &b->file, b->level, 0)) < 0) goto out; if ((error = git_mutex_lock(&b->header.values_mutex)) < 0) { @@ -1601,7 +1601,7 @@ static int parse_include(struct reader *reader, git_array_init(include->includes); include->path = git_buf_detach(&path); - result = config_read(parse_data->repo, parse_data->values, + result = config_read(parse_data->values, parse_data->repo, include, parse_data->level, parse_data->depth+1); if (result == GIT_ENOTFOUND) { @@ -1766,8 +1766,9 @@ static int read_on_variable( return result; } -static int config_read(const git_repository *repo, +static int config_read( git_strmap *values, + const git_repository *repo, struct config_file *file, git_config_level_t level, int depth) |