Add cache.h

The functions found in cache.c are only used by cgit.c, so there's no
point in rebuilding all object files when the cache interface is changed.

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

diff --git a/cache.c b/cache.c
index 7860fc75dc3f6aef61277658a87e5a14d0d5c9a1..89f7ecdcc0df88bf5cb6be3c46397b5f077e786b 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 

diff --git a/cache.h b/cache.h
new file mode 100644 (file)
index 0000000..4dcbea3
--- /dev/null
+++ b/cache.h
@@ -0,0 +1,23 @@
+/*
+ * Since git has it's own cache.h which we include,
+ * lets test on CGIT_CACHE_H to avoid confusion
+ */
+
+#ifndef CGIT_CACHE_H
+#define CGIT_CACHE_H
+
+struct cacheitem {
+       char *name;
+       struct stat st;
+       int ttl;
+       int fd;
+};
+
+extern char *cache_safe_filename(const char *unsafe);
+extern int cache_lock(struct cacheitem *item);
+extern int cache_unlock(struct cacheitem *item);
+extern int cache_cancel_lock(struct cacheitem *item);
+extern int cache_exist(struct cacheitem *item);
+extern int cache_expired(struct cacheitem *item);
+
+#endif /* CGIT_CACHE_H */

diff --git a/cgit.c b/cgit.c
index f749b6be181b85fdb9b020ef659f517b289a6b08..73b1f028e43d61ece95342f72f89e822516a5d28 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 #include "cmd.h"
 #include "ui-shared.h"
 

diff --git a/cgit.h b/cgit.h
index e82e9aabc870d1ac91225dd4a5f9dcbda6bb0cc6..f600912473bb3b7a3a626df2304b85a26336e626 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -46,13 +46,6 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
-struct cacheitem {
-       char *name;
-       struct stat st;
-       int ttl;
-       int fd;
-};
-
 struct cgit_repo {
        char *url;
        char *name;
@@ -227,13 +220,6 @@ extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
-extern char *cache_safe_filename(const char *unsafe);
-extern int cache_lock(struct cacheitem *item);
-extern int cache_unlock(struct cacheitem *item);
-extern int cache_cancel_lock(struct cacheitem *item);
-extern int cache_exist(struct cacheitem *item);
-extern int cache_expired(struct cacheitem *item);
-
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);