aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
-rw-r--r--cgit.c1
-rw-r--r--cgit.h32
-rw-r--r--ui-blob.c1
-rw-r--r--ui-commit.c1
-rw-r--r--ui-diff.c1
-rw-r--r--ui-log.c1
-rw-r--r--ui-patch.c1
-rw-r--r--ui-refs.c1
-rw-r--r--ui-repolist.c1
-rw-r--r--ui-shared.h36
-rw-r--r--ui-snapshot.c1
-rw-r--r--ui-tag.c1
-rw-r--r--ui-tree.c1
13 files changed, 32 insertions, 47 deletions
diff --git a/cgit.c b/cgit.c
index dbb023e..79e0e43 100644
--- a/cgit.c
+++ b/cgit.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "cmd.h"
-#include "ui-shared.h"
static int cgit_prepare_cache(struct cacheitem *item)
{
diff --git a/cgit.h b/cgit.h
index c1a231d..1b23369 100644
--- a/cgit.h
+++ b/cgit.h
@@ -237,8 +237,40 @@ extern int cache_cancel_lock(struct cacheitem *item);
extern int cache_exist(struct cacheitem *item);
extern int cache_expired(struct cacheitem *item);
+extern char *cgit_repourl(const char *reponame);
+extern char *cgit_fileurl(const char *reponame, const char *pagename,
+ const char *filename, const char *query);
+extern char *cgit_pageurl(const char *reponame, const char *pagename,
+ const char *query);
+
extern const char *cgit_repobasename(const char *reponame);
+extern void cgit_tree_link(char *name, char *title, char *class, char *head,
+ char *rev, char *path);
+extern void cgit_log_link(char *name, char *title, char *class, char *head,
+ char *rev, char *path, int ofs, char *grep,
+ char *pattern);
+extern void cgit_commit_link(char *name, char *title, char *class, char *head,
+ char *rev);
+extern void cgit_refs_link(char *name, char *title, char *class, char *head,
+ char *rev, char *path);
+extern void cgit_snapshot_link(char *name, char *title, char *class,
+ char *head, char *rev, char *archivename);
+extern void cgit_diff_link(char *name, char *title, char *class, char *head,
+ char *new_rev, char *old_rev, char *path);
+
+extern void cgit_object_link(struct object *obj);
+
+extern void cgit_print_error(char *msg);
+extern void cgit_print_date(time_t secs, char *format);
+extern void cgit_print_age(time_t t, time_t max_relative, char *format);
+extern void cgit_print_http_headers(struct cgit_context *ctx);
+extern void cgit_print_docstart(struct cgit_context *ctx);
+extern void cgit_print_docend();
+extern void cgit_print_pageheader(struct cgit_context *ctx);
+extern void cgit_print_filemode(unsigned short mode);
+extern void cgit_print_snapshot_links(const char *repo, const char *head,
+ const char *hex, int snapshots);
extern int cgit_parse_snapshots_mask(const char *str);
#endif /* CGIT_H */
diff --git a/ui-blob.c b/ui-blob.c
index 11589db..3b29132 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
void cgit_print_blob(const char *hex, char *path)
{
diff --git a/ui-commit.c b/ui-commit.c
index 8019e36..ed25824 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
static int files, slots;
static int total_adds, total_rems, max_changes;
diff --git a/ui-diff.c b/ui-diff.c
index 2a22009..5c3bc98 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
unsigned char old_rev_sha1[20];
unsigned char new_rev_sha1[20];
diff --git a/ui-log.c b/ui-log.c
index 60c9269..e1d324d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
int files, add_lines, rem_lines;
diff --git a/ui-patch.c b/ui-patch.c
index 36bfae4..68ebb15 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
static void print_line(char *line, int len)
{
diff --git a/ui-refs.c b/ui-refs.c
index 12533cd..fc82ca7 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
static int header;
diff --git a/ui-repolist.c b/ui-repolist.c
index eeeaf3d..ad9b1bc 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -10,7 +10,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
time_t read_agefile(char *path)
{
diff --git a/ui-shared.h b/ui-shared.h
deleted file mode 100644
index 94de884..0000000
--- a/ui-shared.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef UI_SHARED_H
-#define UI_SHARED_H
-
-extern char *cgit_repourl(const char *reponame);
-extern char *cgit_fileurl(const char *reponame, const char *pagename,
- const char *filename, const char *query);
-extern char *cgit_pageurl(const char *reponame, const char *pagename,
- const char *query);
-
-extern void cgit_tree_link(char *name, char *title, char *class, char *head,
- char *rev, char *path);
-extern void cgit_log_link(char *name, char *title, char *class, char *head,
- char *rev, char *path, int ofs, char *grep,
- char *pattern);
-extern void cgit_commit_link(char *name, char *title, char *class, char *head,
- char *rev);
-extern void cgit_refs_link(char *name, char *title, char *class, char *head,
- char *rev, char *path);
-extern void cgit_snapshot_link(char *name, char *title, char *class,
- char *head, char *rev, char *archivename);
-extern void cgit_diff_link(char *name, char *title, char *class, char *head,
- char *new_rev, char *old_rev, char *path);
-extern void cgit_object_link(struct object *obj);
-
-extern void cgit_print_error(char *msg);
-extern void cgit_print_date(time_t secs, char *format);
-extern void cgit_print_age(time_t t, time_t max_relative, char *format);
-extern void cgit_print_http_headers(struct cgit_context *ctx);
-extern void cgit_print_docstart(struct cgit_context *ctx);
-extern void cgit_print_docend();
-extern void cgit_print_pageheader(struct cgit_context *ctx);
-extern void cgit_print_filemode(unsigned short mode);
-extern void cgit_print_snapshot_links(const char *repo, const char *head,
- const char *hex, int snapshots);
-
-#endif /* UI_SHARED_H */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 966a140..512fcd2 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
{
diff --git a/ui-tag.c b/ui-tag.c
index ab2c66d..2998d02 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
static void print_tag_content(char *buf)
{
diff --git a/ui-tree.c b/ui-tree.c
index 9be3140..7912784 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -8,7 +8,6 @@
#include "cgit.h"
#include "html.h"
-#include "ui-shared.h"
char *curr_rev;
char *match_path;