Move cache_prepare() to cgit

This moves some cgit-specific stuff away from cache.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cache.c b/cache.c
index 91b89a66c237d4ad2aa07be340e1eb56fd04247e..1ff1251dfb856e4e8ad2a9a15c502b13ada00f53 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -10,28 +10,6 @@
 
 const int NOLOCK = -1;
 
-void cache_prepare(struct cacheitem *item)
-{
-       if (!cgit_query_repo) {
-               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
-               item->ttl = cgit_cache_root_ttl;
-       } else if (!cgit_query_page) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
-                          cgit_query_repo));
-               item->ttl = cgit_cache_repo_ttl;
-       } else {
-               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
-                          cgit_query_repo, cgit_query_page, 
-                          cgit_querystring));
-               if (cgit_query_has_symref)
-                       item->ttl = cgit_cache_dynamic_ttl;
-               else if (cgit_query_has_sha1)
-                       item->ttl = cgit_cache_static_ttl;
-               else
-                       item->ttl = cgit_cache_repo_ttl;
-       }
-}
-
 int cache_exist(struct cacheitem *item)
 {
        if (stat(item->name, &item->st)) {

diff --git a/cgit.c b/cgit.c
index 5dcba768f0baefe15196053799c0d53b498b126e..d975570a73e361606753f641a629b05846914052 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,6 +10,28 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
+static void cgit_prepare_cache(struct cacheitem *item)
+{
+       if (!cgit_query_repo) {
+               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
+               item->ttl = cgit_cache_root_ttl;
+       } else if (!cgit_query_page) {
+               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
+                          cgit_query_repo));
+               item->ttl = cgit_cache_repo_ttl;
+       } else {
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
+                          cgit_query_repo, cgit_query_page, 
+                          cgit_querystring));
+               if (cgit_query_has_symref)
+                       item->ttl = cgit_cache_dynamic_ttl;
+               else if (cgit_query_has_sha1)
+                       item->ttl = cgit_cache_static_ttl;
+               else
+                       item->ttl = cgit_cache_repo_ttl;
+       }
+}
+
 static void cgit_print_repo_page(struct cacheitem *item)
 {
        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
@@ -63,7 +85,6 @@ static void cgit_check_cache(struct cacheitem *item)
 {
        int i = 0;
 
-       cache_prepare(item);
  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",
@@ -152,8 +173,8 @@ int main(int argc, const char **argv)
        cgit_parse_args(argc, argv);
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 
+       cgit_prepare_cache(&item);
        if (cgit_nocache) {
-               cache_prepare(&item);
                item.fd = STDOUT_FILENO;
                cgit_fill_cache(&item);
        } else {

diff --git a/cgit.h b/cgit.h
index eb8f08c1876a64f48473ebad243fd46e4f10bd61..f915c860411ad9a1b3abeba86f935e2a9ce2b936 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -87,7 +87,6 @@ extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 
-extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);