aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-06-10 01:09:25 +0200
committerLars Hjemli <hjemli@gmail.com>2010-06-19 10:40:22 +0200
commit0e34c6d1ef32ea8f69019272fe72dbf2aeaba392 (patch)
treebf9bab4a08119d97071c2c7f324acab9f4e0c5f7
parentc3f23d4571c06c979eddbd4c973163ba76c7e50f (diff)
downloadcgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.tar.gz
cgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.tar.bz2
cgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.zip
ui-shared: Remove needless cgit_get_cmd() call, and refactor hc() accordingly
The call to cgit_get_cmd() and the following fallback handling (to "summary" or "repoindex") in cgit_print_pageheader() is unnecessary, since the same fallback handling was already done when ctx.qry.page was set when cgit_get_cmd() was called from process_request() in cgit.c. As such, hc() can also be rewritten to simply compare the given 'page' string against ctx.qry.page. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-shared.c31
1 files changed, 12 insertions, 19 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 7d7fff0..137e469 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -645,11 +645,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
}
}
-const char *fallback_cmd = "repolist";
-
-char *hc(struct cgit_cmd *cmd, const char *page)
+static const char *hc(struct cgit_context *ctx, const char *page)
{
- return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
+ return strcmp(ctx->qry.page, page) ? NULL : "active";
}
static void print_header(struct cgit_context *ctx)
@@ -701,35 +699,30 @@ static void print_header(struct cgit_context *ctx)
void cgit_print_pageheader(struct cgit_context *ctx)
{
- struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
- if (!cmd && ctx->repo)
- fallback_cmd = "summary";
-
html("<div id='cgit'>");
if (!ctx->cfg.noheader)
print_header(ctx);
html("<table class='tabs'><tr><td>\n");
if (ctx->repo) {
- cgit_summary_link("summary", NULL, hc(cmd, "summary"),
+ cgit_summary_link("summary", NULL, hc(ctx, "summary"),
ctx->qry.head);
- cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
+ cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
ctx->qry.sha1, NULL);
- cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
+ cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
- cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
+ cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
ctx->qry.sha1, NULL);
- cgit_commit_link("commit", NULL, hc(cmd, "commit"),
+ cgit_commit_link("commit", NULL, hc(ctx, "commit"),
ctx->qry.head, ctx->qry.sha1, 0);
- cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
+ cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
if (ctx->repo->max_stats)
- cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+ cgit_stats_link("stats", NULL, hc(ctx, "stats"),
ctx->qry.head, NULL);
if (ctx->repo->readme)
reporevlink("about", "about", NULL,
- hc(cmd, "about"), ctx->qry.head, NULL,
+ hc(ctx, "about"), ctx->qry.head, NULL,
NULL);
html("</td><td class='form'>");
html("<form class='right' method='get' action='");
@@ -749,9 +742,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
html("<input type='submit' value='search'/>\n");
html("</form>\n");
} else {
- site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+ site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
if (ctx->cfg.root_readme)
- site_link("about", "about", NULL, hc(cmd, "about"),
+ site_link("about", "about", NULL, hc(ctx, "about"),
NULL, 0);
html("</td><td class='form'>");
html("<form method='get' action='");