Commit d0868646397ca624500f4f0fcd0715f51909e898
2019-06-21T11:43:09
config: use `git_config_file` in favor of `struct config_file`
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
diff --git a/src/config_file.c b/src/config_file.c
index 27b9cc5..013791c 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -44,7 +44,7 @@ typedef struct {
git_filebuf locked_buf;
git_buf locked_content;
- struct config_file file;
+ git_config_file file;
} diskfile_backend;
typedef struct {
@@ -95,9 +95,9 @@ static git_config_entries *diskfile_entries_take(diskfile_header *h)
return entries;
}
-static void config_file_clear(struct config_file *file)
+static void config_file_clear(git_config_file *file)
{
- struct config_file *include;
+ git_config_file *include;
uint32_t i;
if (file == NULL)
@@ -133,7 +133,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
return res;
}
-static int config_is_modified(int *modified, struct config_file *file)
+static int config_is_modified(int *modified, git_config_file *file)
{
git_config_file *include;
git_buf buf = GIT_BUF_INIT;
@@ -659,7 +659,7 @@ static char *escape_value(const char *ptr)
static int parse_include(git_config_parser *reader,
diskfile_parse_state *parse_data, const char *file)
{
- struct config_file *include;
+ git_config_file *include;
git_buf path = GIT_BUF_INIT;
char *dir;
int result;
diff --git a/src/config_parse.h b/src/config_parse.h
index 81a13fc..322ab65 100644
--- a/src/config_parse.h
+++ b/src/config_parse.h
@@ -22,7 +22,7 @@ typedef struct config_file {
} git_config_file;
typedef struct {
- struct config_file *file;
+ git_config_file *file;
git_parse_ctx ctx;
} git_config_parser;