Skip to content

Commit 56a7a26

Browse files
committed
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 parent 3a7f7a6 commit 56a7a26

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/config_file.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ typedef struct {
118118
diskfile_backend *snapshot_from;
119119
} diskfile_readonly_backend;
120120

121-
static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth);
121+
static int config_read(git_strmap *values, struct reader *reader, git_config_level_t level, int depth);
122122
static int config_write(diskfile_backend *cfg, const char *key, const regex_t *preg, const char *value);
123123
static char *escape_value(const char *ptr);
124124

@@ -307,7 +307,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level)
307307
if (res == GIT_ENOTFOUND)
308308
return 0;
309309

310-
if (res < 0 || (res = config_read(b->header.values->values, b, &reader, level, 0)) < 0) {
310+
if (res < 0 || (res = config_read(b->header.values->values, &reader, level, 0)) < 0) {
311311
refcounted_strmap_free(b->header.values);
312312
b->header.values = NULL;
313313
}
@@ -327,7 +327,7 @@ static int config__refresh(diskfile_backend *b, struct reader *reader, refcounte
327327
goto out;
328328
}
329329

330-
if ((error = config_read(values->values, b, reader, b->level, 0)) < 0)
330+
if ((error = config_read(values->values, reader, b->level, 0)) < 0)
331331
goto out;
332332

333333
git_mutex_unlock(&b->header.values_mutex);
@@ -1569,7 +1569,6 @@ static int config_parse(
15691569

15701570
struct parse_data {
15711571
git_strmap *values;
1572-
diskfile_backend *cfg_file;
15731572
git_config_level_t level;
15741573
int depth;
15751574
};
@@ -1645,7 +1644,7 @@ static int read_on_variable(
16451644
&r.buffer, include->path, &include->checksum, NULL);
16461645

16471646
if (result == 0) {
1648-
result = config_read(parse_data->values, parse_data->cfg_file, &r, parse_data->level, parse_data->depth+1);
1647+
result = config_read(parse_data->values, &r, parse_data->level, parse_data->depth+1);
16491648
} else if (result == GIT_ENOTFOUND) {
16501649
giterr_clear();
16511650
result = 0;
@@ -1657,7 +1656,7 @@ static int read_on_variable(
16571656
return result;
16581657
}
16591658

1660-
static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth)
1659+
static int config_read(git_strmap *values, struct reader *reader, git_config_level_t level, int depth)
16611660
{
16621661
struct parse_data parse_data;
16631662

@@ -1675,7 +1674,6 @@ static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct re
16751674
return 0;
16761675

16771676
parse_data.values = values;
1678-
parse_data.cfg_file = cfg_file;
16791677
parse_data.level = level;
16801678
parse_data.depth = depth;
16811679

0 commit comments

Comments
 (0)