diff options
author | John Keeping | 2018-03-31 15:08:59 +0100 |
---|---|---|
committer | Jason A. Donenfeld | 2018-06-27 18:11:19 +0200 |
commit | e491eaa5df3055dc419d9d3cb75421e8a8c43944 (patch) | |
tree | 4de939687f7417ca4e2940386310c8c458c60eb8 | |
parent | ui-shared: use the same snapshot logic as ui-refs (diff) | |
download | cgit-e491eaa5df3055dc419d9d3cb75421e8a8c43944.tar.gz cgit-e491eaa5df3055dc419d9d3cb75421e8a8c43944.zip |
ui-shared: pass separator in to cgit_print_snapshot_links()
cgit_print_snapshot_links() is almost identical to print_tag_downloads(), so let's extract the difference to a parameter in preparation for removing print_tag_downloads() in the next commit. Signed-off-by: John Keeping <john@keeping.me.uk> Reviewed-by: Christian Hesse <mail@eworm.de>
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 5 | ||||
-rw-r--r-- | ui-shared.h | 2 | ||||
-rw-r--r-- | ui-tag.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/ui-commit.c b/ui-commit.c index 37c7d8d..65b4603 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
110 | } | 110 | } |
111 | if (ctx.repo->snapshots) { | 111 | if (ctx.repo->snapshots) { |
112 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 112 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
113 | cgit_print_snapshot_links(ctx.repo, hex); | 113 | cgit_print_snapshot_links(ctx.repo, hex, "<br/>"); |
114 | html("</td></tr>"); | 114 | html("</td></tr>"); |
115 | } | 115 | } |
116 | html("</table>\n"); | 116 | html("</table>\n"); |
diff --git a/ui-shared.c b/ui-shared.c index 50a168d..9d7ee3d 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -1111,7 +1111,8 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base, | |||
1111 | strbuf_addf(filename, "%s-%s", base, ref); | 1111 | strbuf_addf(filename, "%s-%s", base, ref); |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref) | 1114 | void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref, |
1115 | const char *separator) | ||
1115 | { | 1116 | { |
1116 | const struct cgit_snapshot_format* f; | 1117 | const struct cgit_snapshot_format* f; |
1117 | struct strbuf filename = STRBUF_INIT; | 1118 | struct strbuf filename = STRBUF_INIT; |
@@ -1132,7 +1133,7 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref) | |||
1132 | strbuf_addstr(&filename, f->suffix); | 1133 | strbuf_addstr(&filename, f->suffix); |
1133 | cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, | 1134 | cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, |
1134 | filename.buf); | 1135 | filename.buf); |
1135 | html("<br/>"); | 1136 | html(separator); |
1136 | } | 1137 | } |
1137 | strbuf_release(&filename); | 1138 | strbuf_release(&filename); |
1138 | } | 1139 | } |
diff --git a/ui-shared.h b/ui-shared.h index d44d7c6..4d5978b 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -77,7 +77,7 @@ extern void cgit_print_filemode(unsigned short mode); | |||
77 | extern void cgit_compose_snapshot_prefix(struct strbuf *filename, | 77 | extern void cgit_compose_snapshot_prefix(struct strbuf *filename, |
78 | const char *base, const char *ref); | 78 | const char *base, const char *ref); |
79 | extern void cgit_print_snapshot_links(const struct cgit_repo *repo, | 79 | extern void cgit_print_snapshot_links(const struct cgit_repo *repo, |
80 | const char *ref); | 80 | const char *ref, const char *separator); |
81 | extern const char *cgit_snapshot_prefix(const struct cgit_repo *repo); | 81 | extern const char *cgit_snapshot_prefix(const struct cgit_repo *repo); |
82 | extern void cgit_add_hidden_formfields(int incl_head, int incl_search, | 82 | extern void cgit_add_hidden_formfields(int incl_head, int incl_search, |
83 | const char *page); | 83 | const char *page); |
diff --git a/ui-tag.c b/ui-tag.c index f597dfa..2c96c37 100644 --- a/ui-tag.c +++ b/ui-tag.c | |||
@@ -34,7 +34,7 @@ static void print_tag_content(char *buf) | |||
34 | static void print_download_links(char *revname) | 34 | static void print_download_links(char *revname) |
35 | { | 35 | { |
36 | html("<tr><th>download</th><td class='sha1'>"); | 36 | html("<tr><th>download</th><td class='sha1'>"); |
37 | cgit_print_snapshot_links(ctx.repo, revname); | 37 | cgit_print_snapshot_links(ctx.repo, revname, "<br/>"); |
38 | html("</td></tr>"); | 38 | html("</td></tr>"); |
39 | } | 39 | } |
40 | 40 | ||