Use skip_prefix() to get rid of magic constants

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 2e87999b11b8f10fdbeab0c9b2b20e22b7b46184..08f3f1da4b40d4b294f4c453e1b77bdd7d1828df 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -55,6 +55,8 @@ static void repo_config(const char *name, const char *value)
 
 static int gitconfig_config(const char *key, const char *value, void *cb)
 {
+       const char *name;
+
        if (!strcmp(key, "gitweb.owner"))
                config_fn(repo, "owner", value);
        else if (!strcmp(key, "gitweb.description"))
@@ -63,8 +65,8 @@ static int gitconfig_config(const char *key, const char *value, void *cb)
                config_fn(repo, "section", value);
        else if (!strcmp(key, "gitweb.homepage"))
                config_fn(repo, "homepage", value);
-       else if (starts_with(key, "cgit."))
-               config_fn(repo, key + 5, value);
+       else if (skip_prefix(key, "cgit.", &name))
+               config_fn(repo, name, value);
 
        return 0;
 }
@@ -246,7 +248,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
                        projectsfile, strerror(errno), errno);
                return;
        }
-       while (strbuf_getline(&line, projects, '\n') != EOF) {
+       while (strbuf_getline(&line, projects) != EOF) {
                if (!line.len)
                        continue;
                strbuf_insert(&line, 0, "/", 1);