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>

diff --git a/ui-commit.c b/ui-commit.c
index c48bfe88fb7966c763e36a37d2a654a776e517d3..ec9926480f5539334d7233c1c8b5be0ecfffbf36 100644 (file)
--- 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 bcdb6662f4c25b75cb84fd84aece92f371d63f7d..ad2f5fcd8056ee546be136041ba70cb87517cf9e 100644 (file)
--- 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 7e58737f8a36d23005c4ecdd868ff8539d875233..d2ba48d83d04a7bf0a7d08a012348d3b82ecbe49 100644 (file)
--- 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 9dde0a39912899c821ff80c318489c86cde8b25b..497dfd011b19e91d628092b42fbb992522cc3a8d 100644 (file)
--- 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 = "&";
        }
-       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+       if (ctx.qry.ssdiff) {
                html(delim);
                html("ss=1");
                delim = "&";
@@ -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 3e7a91bed058b22c30fe3f1f963c6c07a7d42a70..bb193ec6349b7deaf5b3e3d2744b7dadee72c6c0 100644 (file)
--- 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);