Commit 56a7a264e9560708f857ccae72cb709dd332a218
2017-05-31T14:50:40
config_file: remove unused backend field from parse data The backend passed to `config_read` is never actually used anymore, so we can remove it from the function and the `parse_data` structure.
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
diff --git a/src/config_file.c b/src/config_file.c
index 32bce1e..79aea5c 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -118,7 +118,7 @@ typedef struct {
diskfile_backend *snapshot_from;
} diskfile_readonly_backend;
-static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth);
+static int config_read(git_strmap *values, struct reader *reader, 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);
@@ -307,7 +307,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level)
if (res == GIT_ENOTFOUND)
return 0;
- if (res < 0 || (res = config_read(b->header.values->values, b, &reader, level, 0)) < 0) {
+ if (res < 0 || (res = config_read(b->header.values->values, &reader, level, 0)) < 0) {
refcounted_strmap_free(b->header.values);
b->header.values = NULL;
}
@@ -327,7 +327,7 @@ static int config__refresh(diskfile_backend *b, struct reader *reader, refcounte
goto out;
}
- if ((error = config_read(values->values, b, reader, b->level, 0)) < 0)
+ if ((error = config_read(values->values, reader, b->level, 0)) < 0)
goto out;
git_mutex_unlock(&b->header.values_mutex);
@@ -1569,7 +1569,6 @@ static int config_parse(
struct parse_data {
git_strmap *values;
- diskfile_backend *cfg_file;
git_config_level_t level;
int depth;
};
@@ -1645,7 +1644,7 @@ static int read_on_variable(
&r.buffer, include->path, &include->checksum, NULL);
if (result == 0) {
- result = config_read(parse_data->values, parse_data->cfg_file, &r, parse_data->level, parse_data->depth+1);
+ result = config_read(parse_data->values, &r, parse_data->level, parse_data->depth+1);
} else if (result == GIT_ENOTFOUND) {
giterr_clear();
result = 0;
@@ -1657,7 +1656,7 @@ static int read_on_variable(
return result;
}
-static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth)
+static int config_read(git_strmap *values, struct reader *reader, git_config_level_t level, int depth)
{
struct parse_data parse_data;
@@ -1675,7 +1674,6 @@ static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct re
return 0;
parse_data.values = values;
- parse_data.cfg_file = cfg_file;
parse_data.level = level;
parse_data.depth = depth;