diff options
author | John Keeping | 2014-10-05 10:59:03 +0100 |
---|---|---|
committer | Lukas Fleischer | 2014-12-13 12:38:42 +0100 |
commit | 03f537f1a134c8578ae4c16055596539fbbcc220 (patch) | |
tree | 4c16fece25d645a7e52565d82833528d3c22d240 | |
parent | eeddb5bc0905d4728001a111a9b1eb60ecccf9bd (diff) | |
download | cgit-03f537f1a134c8578ae4c16055596539fbbcc220.tar.gz cgit-03f537f1a134c8578ae4c16055596539fbbcc220.tar.bz2 cgit-03f537f1a134c8578ae4c16055596539fbbcc220.zip |
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>
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-diff.c | 4 | ||||
-rw-r--r-- | ui-shared.c | 8 | ||||
-rw-r--r-- | ui-shared.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ui-commit.c b/ui-commit.c index ec99264..d5a888d 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -99,7 +99,7 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
99 | cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix); | 99 | cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix); |
100 | html(" ("); | 100 | html(" ("); |
101 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 101 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
102 | sha1_to_hex(p->item->object.sha1), prefix, 0); | 102 | sha1_to_hex(p->item->object.sha1), prefix); |
103 | html(")</td></tr>"); | 103 | html(")</td></tr>"); |
104 | parents++; | 104 | parents++; |
105 | } | 105 | } |
@@ -97,7 +97,7 @@ static void print_fileinfo(struct fileinfo *info) | |||
97 | } | 97 | } |
98 | htmlf("</td><td class='%s'>", class); | 98 | htmlf("</td><td class='%s'>", class); |
99 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 99 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
100 | ctx.qry.sha2, info->new_path, 0); | 100 | ctx.qry.sha2, info->new_path); |
101 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { | 101 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { |
102 | htmlf(" (%s from ", | 102 | htmlf(" (%s from ", |
103 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); | 103 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); |
@@ -175,7 +175,7 @@ static void cgit_print_diffstat(const unsigned char *old_sha1, | |||
175 | 175 | ||
176 | html("<div class='diffstat-header'>"); | 176 | html("<div class='diffstat-header'>"); |
177 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 177 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
178 | ctx.qry.sha2, NULL, 0); | 178 | ctx.qry.sha2, NULL); |
179 | if (prefix) { | 179 | if (prefix) { |
180 | html(" (limited to '"); | 180 | html(" (limited to '"); |
181 | html_txt(prefix); | 181 | html_txt(prefix); |
diff --git a/ui-shared.c b/ui-shared.c index 497dfd0..68e0d7c 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -385,7 +385,7 @@ void cgit_snapshot_link(const char *name, const char *title, const char *class, | |||
385 | 385 | ||
386 | void cgit_diff_link(const char *name, const char *title, const char *class, | 386 | void cgit_diff_link(const char *name, const char *title, const char *class, |
387 | const char *head, const char *new_rev, const char *old_rev, | 387 | const char *head, const char *new_rev, const char *old_rev, |
388 | const char *path, int toggle_ssdiff) | 388 | const char *path) |
389 | { | 389 | { |
390 | char *delim; | 390 | char *delim; |
391 | 391 | ||
@@ -402,7 +402,7 @@ void cgit_diff_link(const char *name, const char *title, const char *class, | |||
402 | html_url_arg(old_rev); | 402 | html_url_arg(old_rev); |
403 | delim = "&"; | 403 | delim = "&"; |
404 | } | 404 | } |
405 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | 405 | if (ctx.qry.ssdiff) { |
406 | html(delim); | 406 | html(delim); |
407 | html("ss=1"); | 407 | html("ss=1"); |
408 | delim = "&"; | 408 | delim = "&"; |
@@ -478,7 +478,7 @@ static void cgit_self_link(char *name, const char *title, const char *class) | |||
478 | else if (!strcmp(ctx.qry.page, "diff")) | 478 | else if (!strcmp(ctx.qry.page, "diff")) |
479 | cgit_diff_link(name, title, class, ctx.qry.head, | 479 | cgit_diff_link(name, title, class, ctx.qry.head, |
480 | ctx.qry.sha1, ctx.qry.sha2, | 480 | ctx.qry.sha1, ctx.qry.sha2, |
481 | ctx.qry.path, 0); | 481 | ctx.qry.path); |
482 | else if (!strcmp(ctx.qry.page, "stats")) | 482 | else if (!strcmp(ctx.qry.page, "stats")) |
483 | cgit_stats_link(name, title, class, ctx.qry.head, | 483 | cgit_stats_link(name, title, class, ctx.qry.head, |
484 | ctx.qry.path); | 484 | ctx.qry.path); |
@@ -876,7 +876,7 @@ void cgit_print_pageheader(void) | |||
876 | cgit_commit_link("commit", NULL, hc("commit"), | 876 | cgit_commit_link("commit", NULL, hc("commit"), |
877 | ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath); | 877 | ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath); |
878 | cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head, | 878 | cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head, |
879 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath, 0); | 879 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath); |
880 | if (ctx.repo->max_stats) | 880 | if (ctx.repo->max_stats) |
881 | cgit_stats_link("stats", NULL, hc("stats"), | 881 | cgit_stats_link("stats", NULL, hc("stats"), |
882 | ctx.qry.head, ctx.qry.vpath); | 882 | ctx.qry.head, ctx.qry.vpath); |
diff --git a/ui-shared.h b/ui-shared.h index bb193ec..fc9be3b 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -43,7 +43,7 @@ extern void cgit_snapshot_link(const char *name, const char *title, | |||
43 | extern void cgit_diff_link(const char *name, const char *title, | 43 | extern void cgit_diff_link(const char *name, const char *title, |
44 | const char *class, const char *head, | 44 | const char *class, const char *head, |
45 | const char *new_rev, const char *old_rev, | 45 | const char *new_rev, const char *old_rev, |
46 | const char *path, int toggle_ssdiff); | 46 | const char *path); |
47 | extern void cgit_stats_link(const char *name, const char *title, | 47 | extern void cgit_stats_link(const char *name, const char *title, |
48 | const char *class, const char *head, | 48 | const char *class, const char *head, |
49 | const char *path); | 49 | const char *path); |