Commit d0868646 by Patrick Steinhardt

config: use `git_config_file` in favor of `struct config_file`

parent 8ee3d39a
...@@ -44,7 +44,7 @@ typedef struct { ...@@ -44,7 +44,7 @@ typedef struct {
git_filebuf locked_buf; git_filebuf locked_buf;
git_buf locked_content; git_buf locked_content;
struct config_file file; git_config_file file;
} diskfile_backend; } diskfile_backend;
typedef struct { typedef struct {
...@@ -95,9 +95,9 @@ static git_config_entries *diskfile_entries_take(diskfile_header *h) ...@@ -95,9 +95,9 @@ static git_config_entries *diskfile_entries_take(diskfile_header *h)
return entries; 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; uint32_t i;
if (file == NULL) if (file == NULL)
...@@ -133,7 +133,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const ...@@ -133,7 +133,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, struct config_file *file) static int config_is_modified(int *modified, git_config_file *file)
{ {
git_config_file *include; git_config_file *include;
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
...@@ -659,7 +659,7 @@ static char *escape_value(const char *ptr) ...@@ -659,7 +659,7 @@ static char *escape_value(const char *ptr)
static int parse_include(git_config_parser *reader, static int parse_include(git_config_parser *reader,
diskfile_parse_state *parse_data, const char *file) diskfile_parse_state *parse_data, const char *file)
{ {
struct config_file *include; git_config_file *include;
git_buf path = GIT_BUF_INIT; git_buf path = GIT_BUF_INIT;
char *dir; char *dir;
int result; int result;
......
...@@ -22,7 +22,7 @@ typedef struct config_file { ...@@ -22,7 +22,7 @@ typedef struct config_file {
} git_config_file; } git_config_file;
typedef struct { typedef struct {
struct config_file *file; git_config_file *file;
git_parse_ctx ctx; git_parse_ctx ctx;
} git_config_parser; } git_config_parser;
......
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