summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2008-03-27 23:09:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-27 23:09:11 (UTC)
commit20a33548b9a87a6eb23162ee5d137daa46d78613 (patch) (side-by-side diff)
tree9c4ca364df64dcce640a531c7f515ee48bc99387 /cgit.c
parentee4056bd2c902a12dea67874368863fe60ea5a5f (diff)
downloadcgit-20a33548b9a87a6eb23162ee5d137daa46d78613.zip
cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.gz
cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.bz2
Move function for configfile parsing into configfile.[ch]
This is a generic function which wanted its own little object file. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index 73b1f02..1f46e0d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -8,8 +8,9 @@
#include "cgit.h"
#include "cache.h"
#include "cmd.h"
+#include "configfile.h"
#include "ui-shared.h"
const char *cgit_version = CGIT_VERSION;
@@ -102,9 +103,9 @@ void config_cb(const char *name, const char *value)
ctx.repo->readme = xstrdup(value);
else
ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
} else if (!strcmp(name, "include"))
- cgit_read_config(value, config_cb);
+ parse_configfile(value, config_cb);
}
static void querystring_cb(const char *name, const char *value)
{
@@ -435,9 +436,9 @@ int main(int argc, const char **argv)
cgit_repolist.length = 0;
cgit_repolist.count = 0;
cgit_repolist.repos = NULL;
- cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+ parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
config_cb);
if (getenv("SCRIPT_NAME"))
ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
if (getenv("QUERY_STRING"))