From e491eaa5df3055dc419d9d3cb75421e8a8c43944 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:08:59 +0100 Subject: 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 Reviewed-by: Christian Hesse --- ui-commit.c | 2 +- ui-shared.c | 5 +++-- ui-shared.h | 2 +- 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) } if (ctx.repo->snapshots) { html("download"); - cgit_print_snapshot_links(ctx.repo, hex); + cgit_print_snapshot_links(ctx.repo, hex, "
"); html(""); } html("\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, 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 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref) strbuf_addstr(&filename, f->suffix); cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf); - html("
"); + html(separator); } strbuf_release(&filename); } 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); 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 f597dfa..2c96c37 100644 --- a/ui-tag.c +++ b/ui-tag.c @@ -34,7 +34,7 @@ static void print_tag_content(char *buf) static void print_download_links(char *revname) { html("download"); - cgit_print_snapshot_links(ctx.repo, revname); + cgit_print_snapshot_links(ctx.repo, revname, "
"); html(""); } -- cgit