From: john at keeping.me.uk (John Keeping)
Subject: [RFC/PATCH 5/7] ui-shared: pass separator in to cgit_print_snapshot_links()
Date: Sat, 31 Mar 2018 16:35:52 +0100 [thread overview]
Message-ID: <f99f4bf38b5dba7ef3822d41594914a83cfd3b45.1522510150.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1522510150.git.john@keeping.me.uk>
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 at keeping.me.uk>
---
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("<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 588f0bf..6415a33 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1110,7 +1110,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;
@@ -1131,7 +1132,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("<br/>");
+ 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 3a6dcee..0bac93a 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("<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>");
}
--
2.16.3
next prev parent reply other threads:[~2018-03-31 15:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-31 15:35 [RFC/PATCH 0/7] Snapshot signatures john
2018-03-31 15:35 ` [RFC/PATCH 1/7] ui-refs: remove unnecessary sanity check john
2018-03-31 15:35 ` [RFC/PATCH 2/7] ui-shared: remove unused parameter john
2018-03-31 15:35 ` [RFC/PATCH 3/7] ui-shared: rename parameter to cgit_print_snapshot_links() john
2018-03-31 15:35 ` [RFC/PATCH 4/7] ui-shared: use the same snapshot logic as ui-refs john
2018-03-31 15:35 ` john [this message]
2018-03-31 15:35 ` [RFC/PATCH 6/7] ui-refs: use shared function to print tag downloads john
2018-03-31 15:35 ` [RFC/PATCH 7/7] snapshot: support archive signatures john
2018-04-02 21:22 ` [RFC/PATCH 0/7] Snapshot signatures konstantin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f99f4bf38b5dba7ef3822d41594914a83cfd3b45.1522510150.git.john@keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).