Author: John Keeping <john@keeping.me.uk>
ui-shared: remove toggle_ssdiff arg to cgit_diff_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>
ui-commit.c | 2 +- ui-diff.c | 4 ++-- ui-shared.c | 8 ++++---- ui-shared.h | 2 +-
diff --git a/ui-commit.c b/ui-commit.c index ec9926480f5539334d7233c1c8b5be0ecfffbf36..d5a888dc92fc117947ef9ce42b34fc9ece433d41 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -99,7 +99,7 @@ } 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); + sha1_to_hex(p->item->object.sha1), prefix); html(")</td></tr>"); parents++; } diff --git a/ui-diff.c b/ui-diff.c index 71273aa4a92399473ca184ca87dba3f85b522c69..49bd7480c573df06c41abb9d305d1ae8ac3e459c 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -97,7 +97,7 @@ html("]"); } htmlf("</td><td class='%s'>", class); cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, - ctx.qry.sha2, info->new_path, 0); + ctx.qry.sha2, info->new_path); if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { htmlf(" (%s from ", info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); @@ -175,7 +175,7 @@ int i; html("<div class='diffstat-header'>"); cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, - ctx.qry.sha2, NULL, 0); + ctx.qry.sha2, NULL); if (prefix) { html(" (limited to '"); html_txt(prefix); diff --git a/ui-shared.c b/ui-shared.c index 497dfd011b19e91d628092b42fbb992522cc3a8d..68e0d7cdf40c2573a532af1e80a109106b90b485 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -385,7 +385,7 @@ } void cgit_diff_link(const char *name, const char *title, const char *class, const char *head, const char *new_rev, const char *old_rev, - const char *path, int toggle_ssdiff) + const char *path) { char *delim; @@ -402,7 +402,7 @@ html("id2="); html_url_arg(old_rev); delim = "&"; } - if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { + if (ctx.qry.ssdiff) { html(delim); html("ss=1"); delim = "&"; @@ -478,7 +478,7 @@ 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); + ctx.qry.path); else if (!strcmp(ctx.qry.page, "stats")) cgit_stats_link(name, title, class, ctx.qry.head, ctx.qry.path); @@ -876,7 +876,7 @@ ctx.qry.sha1, ctx.qry.vpath); cgit_commit_link("commit", NULL, hc("commit"), 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); + ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath); if (ctx.repo->max_stats) cgit_stats_link("stats", NULL, hc("stats"), ctx.qry.head, ctx.qry.vpath); diff --git a/ui-shared.h b/ui-shared.h index bb193ec6349b7deaf5b3e3d2744b7dadee72c6c0..fc9be3bc6d2dde9198209d2edeccf6b2d312320a 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -43,7 +43,7 @@ const char *rev, const char *archivename); extern void cgit_diff_link(const char *name, const char *title, const char *class, const char *head, const char *new_rev, const char *old_rev, - const char *path, int toggle_ssdiff); + const char *path); extern void cgit_stats_link(const char *name, const char *title, const char *class, const char *head, const char *path);