Author: John Keeping <john@keeping.me.uk>
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>
ui-commit.c | 2 +- ui-shared.c | 5 +++-- ui-shared.h | 2 +- ui-tag.c | 2 +-
diff --git a/ui-commit.c b/ui-commit.c index 37c7d8d118495878d2e433e021c9dc25fccb2a57..65b4603979552667553493854852c368f2bdb243 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -110,7 +110,7 @@ parents++; } if (ctx.repo->snapshots) { html("<tr><th>download</th><td colspan='2' class='sha1'>"); - cgit_print_snapshot_links(ctx.repo, hex); + cgit_print_snapshot_links(ctx.repo, hex, "<br/>"); html("</td></tr>"); } html("</table>\n"); diff --git a/ui-shared.c b/ui-shared.c index 50a168d8873a0bf99c76790df5bad10759d6e147..9d7ee3d90e424bb69da1eb447bfbaa9cc19de66d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -1111,7 +1111,8 @@ strbuf_addf(filename, "%s-%s", base, ref); } -void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref) +void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref, + const char *separator) { const struct cgit_snapshot_format* f; struct strbuf filename = STRBUF_INIT; @@ -1132,7 +1133,7 @@ strbuf_setlen(&filename, prefixlen); strbuf_addstr(&filename, f->suffix); cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf); - html("<br/>"); + html(separator); } strbuf_release(&filename); } diff --git a/ui-shared.h b/ui-shared.h index d44d7c6323d5632212462cd85318f8a4d97b1f47..4d5978bb6f79b643ee296b69b061baf4955dc4cc 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -77,7 +77,7 @@ extern void cgit_print_filemode(unsigned short mode); extern void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base, const char *ref); extern void cgit_print_snapshot_links(const struct cgit_repo *repo, - const char *ref); + const char *ref, const char *separator); extern const char *cgit_snapshot_prefix(const struct cgit_repo *repo); extern void cgit_add_hidden_formfields(int incl_head, int incl_search, const char *page); diff --git a/ui-tag.c b/ui-tag.c index f597dfa31093a120f632879423921b3486f8c094..2c96c37efc6cc7be4643b9ecbc5d6031755cf310 100644 --- a/ui-tag.c +++ b/ui-tag.c @@ -34,7 +34,7 @@ static void print_download_links(char *revname) { html("<tr><th>download</th><td class='sha1'>"); - cgit_print_snapshot_links(ctx.repo, revname); + cgit_print_snapshot_links(ctx.repo, revname, "<br/>"); html("</td></tr>"); }