aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Keeping2014-10-05 10:59:02 +0100
committerLukas Fleischer2014-12-13 12:38:42 +0100
commiteeddb5bc0905d4728001a111a9b1eb60ecccf9bd (patch)
treee1193c55a604584acc8e3198838b358d44a65133
parent49f607777fe3d9393574a572d72caa568ee3ca3c (diff)
downloadcgit-eeddb5bc0905d4728001a111a9b1eb60ecccf9bd.tar
cgit-eeddb5bc0905d4728001a111a9b1eb60ecccf9bd.tar.gz
cgit-eeddb5bc0905d4728001a111a9b1eb60ecccf9bd.zip
ui-shared: remove toggle_ssdiff arg to cgit_commit_link()
This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--ui-commit.c4
-rw-r--r--ui-log.c4
-rw-r--r--ui-refs.c2
-rw-r--r--ui-shared.c11
-rw-r--r--ui-shared.h3
5 files changed, 11 insertions, 13 deletions
diff --git a/ui-commit.c b/ui-commit.c
index c48bfe8..ec99264 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -67,7 +67,7 @@ void cgit_print_commit(char *hex, const char *prefix)
html("</td></tr>\n");
html("<tr><th>commit</th><td colspan='2' class='sha1'>");
tmp = sha1_to_hex(commit->object.sha1);
- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
+ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
html(" (");
cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
html(")</td></tr>\n");
@@ -96,7 +96,7 @@ void cgit_print_commit(char *hex, const char *prefix)
parent_info = cgit_parse_commit(parent);
tmp2 = parent_info->subject;
}
- cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
+ cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix);
html(" (");
cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
sha1_to_hex(p->item->object.sha1), prefix, 0);
diff --git a/ui-log.c b/ui-log.c
index bcdb666..ad2f5fc 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -90,7 +90,7 @@ void show_commit_decorations(struct commit *commit)
strncpy(buf, deco->name, sizeof(buf) - 1);
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
sha1_to_hex(commit->object.sha1),
- ctx.qry.vpath, 0);
+ ctx.qry.vpath);
}
next:
deco = deco->next;
@@ -165,7 +165,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
}
}
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
- sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
+ sha1_to_hex(commit->object.sha1), ctx.qry.vpath);
show_commit_decorations(commit);
html("</td><td>");
cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
diff --git a/ui-refs.c b/ui-refs.c
index 7e58737..d2ba48d 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -67,7 +67,7 @@ static int print_branch(struct refinfo *ref)
html("</td><td>");
if (ref->object->type == OBJ_COMMIT) {
- cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
+ cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL);
html("</td><td>");
cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs");
html_txt(info->author);
diff --git a/ui-shared.c b/ui-shared.c
index 9dde0a3..497dfd0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -328,8 +328,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
}
void cgit_commit_link(char *name, const char *title, const char *class,
- const char *head, const char *rev, const char *path,
- int toggle_ssdiff)
+ const char *head, const char *rev, const char *path)
{
if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
name[ctx.cfg.max_msg_len] = '\0';
@@ -347,7 +346,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
html_url_arg(rev);
delim = "&amp;";
}
- if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+ if (ctx.qry.ssdiff) {
html(delim);
html("ss=1");
delim = "&amp;";
@@ -463,7 +462,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
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);
+ ctx.qry.path);
else if (!strcmp(ctx.qry.page, "patch"))
cgit_patch_link(name, title, class, ctx.qry.head,
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
@@ -503,7 +502,7 @@ void cgit_object_link(struct object *obj)
shortrev[10] = '\0';
if (obj->type == OBJ_COMMIT) {
cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
- ctx.qry.head, fullrev, NULL, 0);
+ ctx.qry.head, fullrev, NULL);
return;
} else if (obj->type == OBJ_TREE)
page = "tree";
@@ -875,7 +874,7 @@ void cgit_print_pageheader(void)
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);
+ ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
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)
diff --git a/ui-shared.h b/ui-shared.h
index 3e7a91b..bb193ec 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -30,8 +30,7 @@ extern void cgit_log_link(const char *name, const char *title,
const char *pattern, int showmsg);
extern void cgit_commit_link(char *name, const char *title,
const char *class, const char *head,
- const char *rev, const char *path,
- int toggle_ssdiff);
+ const char *rev, const char *path);
extern void cgit_patch_link(const char *name, const char *title,
const char *class, const char *head,
const char *rev, const char *path);