[PATCH 1/4] Remove context parameter from cgit_print_*()
Lukas Fleischer
cgit at cryptocrack.de
Wed Jan 15 22:37:04 CET 2014
Drop the context parameter from the following functions (and all static
helpers used by them) and use the global context instead:
* cgit_print_http_headers()
* cgit_print_docstart()
* cgit_print_pageheader()
Fix all invocations of these functions accordingly.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
cgit.c | 36 +++----
cmd.c | 2 +-
ui-atom.c | 2 +-
ui-blob.c | 2 +-
ui-clone.c | 6 +-
ui-diff.c | 2 +-
ui-patch.c | 2 +-
ui-plain.c | 4 +-
ui-repolist.c | 6 +-
ui-shared.c | 297 +++++++++++++++++++++++++++++-----------------------------
ui-shared.h | 6 +-
ui-snapshot.c | 8 +-
12 files changed, 186 insertions(+), 187 deletions(-)
diff --git a/cgit.c b/cgit.c
index f3fe56b..512ef56 100644
--- a/cgit.c
+++ b/cgit.c
@@ -548,9 +548,9 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
ctx->page.title = fmtalloc("%s - %s", ctx->cfg.root_title,
"config error");
ctx->repo = NULL;
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
cgit_print_error("Failed to open %s: %s", name,
rc ? strerror(rc) : "Not a valid git repository");
cgit_print_docend();
@@ -567,9 +567,9 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
}
if (!ctx->qry.head) {
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
cgit_print_error("Repository seems to be empty");
cgit_print_docend();
return 1;
@@ -580,9 +580,9 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
ctx->qry.head = ctx->repo->defbranch;
ctx->page.status = 404;
ctx->page.statusmsg = "Not found";
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
cgit_print_error("Invalid branch: %s", tmp);
cgit_print_docend();
return 1;
@@ -603,9 +603,9 @@ static void process_request(void *cbdata)
ctx->page.title = "cgit error";
ctx->page.status = 404;
ctx->page.statusmsg = "Not found";
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
cgit_print_error("Invalid request");
cgit_print_docend();
return;
@@ -623,9 +623,9 @@ static void process_request(void *cbdata)
ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
if (cmd->want_repo && !ctx->repo) {
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
cgit_print_error("No repository selected");
cgit_print_docend();
return;
@@ -635,9 +635,9 @@ static void process_request(void *cbdata)
return;
if (cmd->want_layout) {
- cgit_print_http_headers(ctx);
- cgit_print_docstart(ctx);
- cgit_print_pageheader(ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
}
cmd->fn(ctx);
diff --git a/cmd.c b/cmd.c
index 420b3b1..3022452 100644
--- a/cmd.c
+++ b/cmd.c
@@ -81,7 +81,7 @@ static void ls_cache_fn(struct cgit_context *ctx)
{
ctx->page.mimetype = "text/plain";
ctx->page.filename = "ls-cache.txt";
- cgit_print_http_headers(ctx);
+ cgit_print_http_headers();
cache_ls(ctx->cfg.cache_root);
}
diff --git a/ui-atom.c b/ui-atom.c
index 838f220..b22d745 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -108,7 +108,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
host = cgit_hosturl();
ctx.page.mimetype = "text/xml";
ctx.page.charset = "utf-8";
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
html("<title>");
html_txt(ctx.repo->name);
diff --git a/ui-blob.c b/ui-blob.c
index 608926e..9c99519 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -164,6 +164,6 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
ctx.page.mimetype = "text/plain";
}
ctx.page.filename = path;
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
html_raw(buf, size);
}
diff --git a/ui-clone.c b/ui-clone.c
index 9d0d6ad..09e2b46 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -36,7 +36,7 @@ static void print_pack_info(struct cgit_context *ctx)
ctx->page.mimetype = "text/plain";
ctx->page.filename = "objects/info/packs";
- cgit_print_http_headers(ctx);
+ cgit_print_http_headers();
ofs = strlen(ctx->repo->path) + strlen("/objects/pack/");
prepare_packed_git();
for (pack = packed_git; pack; pack = pack->next)
@@ -65,7 +65,7 @@ static void send_file(struct cgit_context *ctx, char *path)
ctx->page.filename = path;
if (prefixcmp(ctx->repo->path, path))
ctx->page.filename += strlen(ctx->repo->path) + 1;
- cgit_print_http_headers(ctx);
+ cgit_print_http_headers();
html_include(path);
}
@@ -76,7 +76,7 @@ void cgit_clone_info(struct cgit_context *ctx)
ctx->page.mimetype = "text/plain";
ctx->page.filename = "info/refs";
- cgit_print_http_headers(ctx);
+ cgit_print_http_headers();
for_each_ref(print_ref_info, ctx);
}
diff --git a/ui-diff.c b/ui-diff.c
index 5ccd03e..71273aa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -407,7 +407,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
diff_setup_done(&diffopt);
ctx.page.mimetype = "text/plain";
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
if (old_tree_sha1) {
diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
&diffopt);
diff --git a/ui-patch.c b/ui-patch.c
index 3086608..6878a46 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -59,7 +59,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
patchname = fmt("%s.patch", rev_range);
ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname;
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
if (ctx.cfg.noplainemail) {
rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
diff --git a/ui-plain.c b/ui-plain.c
index 68e0387..8909d30 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -103,7 +103,7 @@ static int print_object(const unsigned char *sha1, const char *path)
ctx.page.filename = path;
ctx.page.size = size;
ctx.page.etag = sha1_to_hex(sha1);
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
html_raw(buf, size);
/* If we allocated this, then casting away const is safe. */
if (freemime)
@@ -128,7 +128,7 @@ static void print_dir(const unsigned char *sha1, const char *base,
fullpath = buildpath(base, baselen, path);
slash = (fullpath[0] == '/' ? "" : "/");
ctx.page.etag = sha1_to_hex(sha1);
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
htmlf("<html><head><title>%s", slash);
html_txt(fullpath);
htmlf("</title></head>\n<body>\n<h2>%s", slash);
diff --git a/ui-repolist.c b/ui-repolist.c
index f9cb21a..92e80cf 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -259,9 +259,9 @@ void cgit_print_repolist()
++columns;
ctx.page.title = ctx.cfg.root_title;
- cgit_print_http_headers(&ctx);
- cgit_print_docstart(&ctx);
- cgit_print_pageheader(&ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
if (ctx.cfg.index_header)
html_include(ctx.cfg.index_header);
diff --git a/ui-shared.c b/ui-shared.c
index abe15cd..1f596b4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -428,59 +428,58 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
reporevlink("stats", name, title, class, head, NULL, path);
}
-static void cgit_self_link(char *name, const char *title, const char *class,
- struct cgit_context *ctx)
-{
- if (!strcmp(ctx->qry.page, "repolist"))
- cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
- ctx->qry.ofs);
- else if (!strcmp(ctx->qry.page, "summary"))
- cgit_summary_link(name, title, class, ctx->qry.head);
- else if (!strcmp(ctx->qry.page, "tag"))
- cgit_tag_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
- else if (!strcmp(ctx->qry.page, "tree"))
- cgit_tree_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "plain"))
- cgit_plain_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "log"))
- cgit_log_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, ctx->qry.ofs,
- ctx->qry.grep, ctx->qry.search,
- ctx->qry.showmsg);
- else if (!strcmp(ctx->qry.page, "commit"))
- cgit_commit_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, 0);
- else if (!strcmp(ctx->qry.page, "patch"))
- cgit_patch_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "refs"))
- cgit_refs_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "snapshot"))
- cgit_snapshot_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "diff"))
- cgit_diff_link(name, title, class, ctx->qry.head,
- ctx->qry.sha1, ctx->qry.sha2,
- ctx->qry.path, 0);
- else if (!strcmp(ctx->qry.page, "stats"))
- cgit_stats_link(name, title, class, ctx->qry.head,
- ctx->qry.path);
+static void cgit_self_link(char *name, const char *title, const char *class)
+{
+ if (!strcmp(ctx.qry.page, "repolist"))
+ cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
+ ctx.qry.ofs);
+ else if (!strcmp(ctx.qry.page, "summary"))
+ cgit_summary_link(name, title, class, ctx.qry.head);
+ else if (!strcmp(ctx.qry.page, "tag"))
+ cgit_tag_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL);
+ else if (!strcmp(ctx.qry.page, "tree"))
+ cgit_tree_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "plain"))
+ cgit_plain_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "log"))
+ cgit_log_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path, ctx.qry.ofs,
+ ctx.qry.grep, ctx.qry.search,
+ ctx.qry.showmsg);
+ else if (!strcmp(ctx.qry.page, "commit"))
+ cgit_commit_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path, 0);
+ else if (!strcmp(ctx.qry.page, "patch"))
+ cgit_patch_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "refs"))
+ cgit_refs_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "snapshot"))
+ cgit_snapshot_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "diff"))
+ cgit_diff_link(name, title, class, ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.sha2,
+ ctx.qry.path, 0);
+ else if (!strcmp(ctx.qry.page, "stats"))
+ cgit_stats_link(name, title, class, ctx.qry.head,
+ ctx.qry.path);
else {
/* Don't known how to make link for this page */
- repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+ repolink(title, class, ctx.qry.page, ctx.qry.head, ctx.qry.path);
html("><!-- cgit_self_link() doesn't know how to make link for page '");
- html_txt(ctx->qry.page);
+ html_txt(ctx.qry.page);
html("' -->");
html_txt(name);
html("</a>");
@@ -624,37 +623,37 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
secs * 1.0 / TM_YEAR);
}
-void cgit_print_http_headers(struct cgit_context *ctx)
+void cgit_print_http_headers(void)
{
- if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
+ if (ctx.env.no_http && !strcmp(ctx.env.no_http, "1"))
return;
- if (ctx->page.status)
- htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
- if (ctx->page.mimetype && ctx->page.charset)
- htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
- ctx->page.charset);
- else if (ctx->page.mimetype)
- htmlf("Content-Type: %s\n", ctx->page.mimetype);
- if (ctx->page.size)
- htmlf("Content-Length: %zd\n", ctx->page.size);
- if (ctx->page.filename)
+ if (ctx.page.status)
+ htmlf("Status: %d %s\n", ctx.page.status, ctx.page.statusmsg);
+ if (ctx.page.mimetype && ctx.page.charset)
+ htmlf("Content-Type: %s; charset=%s\n", ctx.page.mimetype,
+ ctx.page.charset);
+ else if (ctx.page.mimetype)
+ htmlf("Content-Type: %s\n", ctx.page.mimetype);
+ if (ctx.page.size)
+ htmlf("Content-Length: %zd\n", ctx.page.size);
+ if (ctx.page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n",
- ctx->page.filename);
- htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
- htmlf("Expires: %s\n", http_date(ctx->page.expires));
- if (ctx->page.etag)
- htmlf("ETag: \"%s\"\n", ctx->page.etag);
+ ctx.page.filename);
+ htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
+ htmlf("Expires: %s\n", http_date(ctx.page.expires));
+ if (ctx.page.etag)
+ htmlf("ETag: \"%s\"\n", ctx.page.etag);
html("\n");
- if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+ if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
exit(0);
}
-void cgit_print_docstart(struct cgit_context *ctx)
+void cgit_print_docstart(void)
{
- if (ctx->cfg.embedded) {
- if (ctx->cfg.header)
- html_include(ctx->cfg.header);
+ if (ctx.cfg.embedded) {
+ if (ctx.cfg.header)
+ html_include(ctx.cfg.header);
return;
}
@@ -663,37 +662,37 @@ void cgit_print_docstart(struct cgit_context *ctx)
html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
html("<head>\n");
html("<title>");
- html_txt(ctx->page.title);
+ html_txt(ctx.page.title);
html("</title>\n");
htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
- if (ctx->cfg.robots && *ctx->cfg.robots)
- htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
+ if (ctx.cfg.robots && *ctx.cfg.robots)
+ htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
html("<link rel='stylesheet' type='text/css' href='");
- html_attr(ctx->cfg.css);
+ html_attr(ctx.cfg.css);
html("'/>\n");
- if (ctx->cfg.favicon) {
+ if (ctx.cfg.favicon) {
html("<link rel='shortcut icon' href='");
- html_attr(ctx->cfg.favicon);
+ html_attr(ctx.cfg.favicon);
html("'/>\n");
}
- if (host && ctx->repo && ctx->qry.head) {
+ if (host && ctx.repo && ctx.qry.head) {
struct strbuf sb = STRBUF_INIT;
- strbuf_addf(&sb, "h=%s", ctx->qry.head);
+ strbuf_addf(&sb, "h=%s", ctx.qry.head);
html("<link rel='alternate' title='Atom feed' href='");
html(cgit_httpscheme());
html_attr(cgit_hosturl());
- html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
+ html_attr(cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
sb.buf));
html("' type='application/atom+xml'/>\n");
strbuf_release(&sb);
}
- if (ctx->cfg.head_include)
- html_include(ctx->cfg.head_include);
+ if (ctx.cfg.head_include)
+ html_include(ctx.cfg.head_include);
html("</head>\n");
html("<body>\n");
- if (ctx->cfg.header)
- html_include(ctx->cfg.header);
+ if (ctx.cfg.header)
+ html_include(ctx.cfg.header);
}
void cgit_print_docend()
@@ -757,47 +756,47 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
}
}
-static const char *hc(struct cgit_context *ctx, const char *page)
+static const char *hc(const char *page)
{
- return strcmp(ctx->qry.page, page) ? NULL : "active";
+ return strcmp(ctx.qry.page, page) ? NULL : "active";
}
-static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+static void cgit_print_path_crumbs(char *path)
{
- char *old_path = ctx->qry.path;
+ char *old_path = ctx.qry.path;
char *p = path, *q, *end = path + strlen(path);
- ctx->qry.path = NULL;
- cgit_self_link("root", NULL, NULL, ctx);
- ctx->qry.path = p = path;
+ ctx.qry.path = NULL;
+ cgit_self_link("root", NULL, NULL);
+ ctx.qry.path = p = path;
while (p < end) {
if (!(q = strchr(p, '/')))
q = end;
*q = '\0';
html_txt("/");
- cgit_self_link(p, NULL, NULL, ctx);
+ cgit_self_link(p, NULL, NULL);
if (q < end)
*q = '/';
p = q + 1;
}
- ctx->qry.path = old_path;
+ ctx.qry.path = old_path;
}
-static void print_header(struct cgit_context *ctx)
+static void print_header(void)
{
char *logo = NULL, *logo_link = NULL;
html("<table id='header'>\n");
html("<tr>\n");
- if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
- logo = ctx->repo->logo;
+ if (ctx.repo && ctx.repo->logo && *ctx.repo->logo)
+ logo = ctx.repo->logo;
else
- logo = ctx->cfg.logo;
- if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
- logo_link = ctx->repo->logo_link;
+ logo = ctx.cfg.logo;
+ if (ctx.repo && ctx.repo->logo_link && *ctx.repo->logo_link)
+ logo_link = ctx.repo->logo_link;
else
- logo_link = ctx->cfg.logo_link;
+ logo_link = ctx.cfg.logo_link;
if (logo && *logo) {
html("<td class='logo' rowspan='2'><a href='");
if (logo_link && *logo_link)
@@ -810,102 +809,102 @@ static void print_header(struct cgit_context *ctx)
}
html("<td class='main'>");
- if (ctx->repo) {
+ if (ctx.repo) {
cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
html(" : ");
- cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
+ cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
html("</td><td class='form'>");
html("<form method='get' action=''>\n");
- cgit_add_hidden_formfields(0, 1, ctx->qry.page);
+ cgit_add_hidden_formfields(0, 1, ctx.qry.page);
html("<select name='h' onchange='this.form.submit();'>\n");
- for_each_branch_ref(print_branch_option, ctx->qry.head);
+ for_each_branch_ref(print_branch_option, ctx.qry.head);
html("</select> ");
html("<input type='submit' name='' value='switch'/>");
html("</form>");
} else
- html_txt(ctx->cfg.root_title);
+ html_txt(ctx.cfg.root_title);
html("</td></tr>\n");
html("<tr><td class='sub'>");
- if (ctx->repo) {
- html_txt(ctx->repo->desc);
+ if (ctx.repo) {
+ html_txt(ctx.repo->desc);
html("</td><td class='sub right'>");
- html_txt(ctx->repo->owner);
+ html_txt(ctx.repo->owner);
} else {
- if (ctx->cfg.root_desc)
- html_txt(ctx->cfg.root_desc);
- else if (ctx->cfg.index_info)
- html_include(ctx->cfg.index_info);
+ if (ctx.cfg.root_desc)
+ html_txt(ctx.cfg.root_desc);
+ else if (ctx.cfg.index_info)
+ html_include(ctx.cfg.index_info);
}
html("</td></tr></table>\n");
}
-void cgit_print_pageheader(struct cgit_context *ctx)
+void cgit_print_pageheader(void)
{
html("<div id='cgit'>");
- if (!ctx->cfg.noheader)
- print_header(ctx);
+ if (!ctx.cfg.noheader)
+ print_header();
html("<table class='tabs'><tr><td>\n");
- if (ctx->repo) {
- cgit_summary_link("summary", NULL, hc(ctx, "summary"),
- ctx->qry.head);
- cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
- ctx->qry.sha1, NULL);
- cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
- NULL, ctx->qry.vpath, 0, NULL, NULL,
- ctx->qry.showmsg);
- cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
- ctx->qry.sha1, ctx->qry.vpath);
- cgit_commit_link("commit", NULL, hc(ctx, "commit"),
- ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
- cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
- ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
- if (ctx->repo->max_stats)
- cgit_stats_link("stats", NULL, hc(ctx, "stats"),
- ctx->qry.head, ctx->qry.vpath);
- if (ctx->repo->readme.nr)
+ if (ctx.repo) {
+ cgit_summary_link("summary", NULL, hc("summary"),
+ ctx.qry.head);
+ cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
+ ctx.qry.sha1, NULL);
+ cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
+ NULL, ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg);
+ cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.vpath);
+ cgit_commit_link("commit", NULL, hc("commit"),
+ ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath, 0);
+ cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath, 0);
+ if (ctx.repo->max_stats)
+ cgit_stats_link("stats", NULL, hc("stats"),
+ ctx.qry.head, ctx.qry.vpath);
+ if (ctx.repo->readme.nr)
reporevlink("about", "about", NULL,
- hc(ctx, "about"), ctx->qry.head, NULL,
+ hc("about"), ctx.qry.head, NULL,
NULL);
html("</td><td class='form'>");
html("<form class='right' method='get' action='");
- if (ctx->cfg.virtual_root)
- html_url_path(cgit_fileurl(ctx->qry.repo, "log",
- ctx->qry.vpath, NULL));
+ if (ctx.cfg.virtual_root)
+ html_url_path(cgit_fileurl(ctx.qry.repo, "log",
+ ctx.qry.vpath, NULL));
html("'>\n");
cgit_add_hidden_formfields(1, 0, "log");
html("<select name='qt'>\n");
- html_option("grep", "log msg", ctx->qry.grep);
- html_option("author", "author", ctx->qry.grep);
- html_option("committer", "committer", ctx->qry.grep);
- html_option("range", "range", ctx->qry.grep);
+ html_option("grep", "log msg", ctx.qry.grep);
+ html_option("author", "author", ctx.qry.grep);
+ html_option("committer", "committer", ctx.qry.grep);
+ html_option("range", "range", ctx.qry.grep);
html("</select>\n");
html("<input class='txt' type='text' size='10' name='q' value='");
- html_attr(ctx->qry.search);
+ html_attr(ctx.qry.search);
html("'/>\n");
html("<input type='submit' value='search'/>\n");
html("</form>\n");
} else {
- site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
- if (ctx->cfg.root_readme)
- site_link("about", "about", NULL, hc(ctx, "about"),
+ site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0);
+ if (ctx.cfg.root_readme)
+ site_link("about", "about", NULL, hc("about"),
NULL, NULL, 0);
html("</td><td class='form'>");
html("<form method='get' action='");
html_attr(cgit_rooturl());
html("'>\n");
html("<input type='text' name='q' size='10' value='");
- html_attr(ctx->qry.search);
+ html_attr(ctx.qry.search);
html("'/>\n");
html("<input type='submit' value='search'/>\n");
html("</form>");
}
html("</td></tr></table>\n");
- if (ctx->qry.vpath) {
+ if (ctx.qry.vpath) {
html("<div class='path'>");
html("path: ");
- cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+ cgit_print_path_crumbs(ctx.qry.vpath);
html("</div>");
}
html("<div class='content'>");
diff --git a/ui-shared.h b/ui-shared.h
index 5987e77..66dcb1a 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -58,10 +58,10 @@ __attribute__((format (printf,1,0)))
extern void cgit_vprint_error(const char *fmt, va_list ap);
extern void cgit_print_date(time_t secs, const char *format, int local_time);
extern void cgit_print_age(time_t t, time_t max_relative, const 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_http_headers(void);
+extern void cgit_print_docstart(void);
extern void cgit_print_docend();
-extern void cgit_print_pageheader(struct cgit_context *ctx);
+extern void cgit_print_pageheader(void);
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);
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 7115ec4..582dc31 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -121,7 +121,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
}
ctx.page.mimetype = xstrdup(format->mimetype);
ctx.page.filename = xstrdup(filename);
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
format->write_func(hex, prefix);
return 0;
}
@@ -183,9 +183,9 @@ static void show_error(char *fmt, ...)
va_list ap;
ctx.page.mimetype = "text/html";
- cgit_print_http_headers(&ctx);
- cgit_print_docstart(&ctx);
- cgit_print_pageheader(&ctx);
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
va_start(ap, fmt);
cgit_vprint_error(fmt, ap);
va_end(ap);
--
1.8.5.2
More information about the CGit
mailing list