aboutsummaryrefslogtreecommitdiffstats
path: root/scan-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 08f3f1d..6a2f65a 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -10,6 +10,7 @@
10#include "scan-tree.h" 10#include "scan-tree.h"
11#include "configfile.h" 11#include "configfile.h"
12#include "html.h" 12#include "html.h"
13#include <config.h>
13 14
14/* return 1 if path contains a objects/ directory and a HEAD file */ 15/* return 1 if path contains a objects/ directory and a HEAD file */
15static int is_git_dir(const char *path) 16static int is_git_dir(const char *path)
@@ -48,7 +49,7 @@ out:
48static struct cgit_repo *repo; 49static struct cgit_repo *repo;
49static repo_config_fn config_fn; 50static repo_config_fn config_fn;
50 51
51static void repo_config(const char *name, const char *value) 52static void scan_tree_repo_config(const char *name, const char *value)
52{ 53{
53 config_fn(repo, name, value); 54 config_fn(repo, name, value);
54} 55}
@@ -178,7 +179,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
178 179
179 strbuf_addstr(path, "cgitrc"); 180 strbuf_addstr(path, "cgitrc");
180 if (!stat(path->buf, &st)) 181 if (!stat(path->buf, &st))
181 parse_configfile(path->buf, &repo_config); 182 parse_configfile(path->buf, &scan_tree_repo_config);
182 183
183 strbuf_release(&rel); 184 strbuf_release(&rel);
184} 185}