From: john at keeping.me.uk (John Keeping)
Subject: [RFC/PATCH 6/7] ui-refs: use shared function to print tag downloads
Date: Sat, 31 Mar 2018 16:35:53 +0100 [thread overview]
Message-ID: <d64f09c895f25905faa753079142f65995774174.1522510150.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1522510150.git.john@keeping.me.uk>
cgit_compose_snapshot_prefix() is identical to print_tag_downloads(), so
remove the latter and use the function from ui-shared.c instead.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-refs.c | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/ui-refs.c b/ui-refs.c
index 7b95e8b..2ec3858 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -90,31 +90,6 @@ static void print_tag_header(void)
"<th class='left' colspan='2'>Age</th></tr>\n");
}
-static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
-{
- const struct cgit_snapshot_format* f;
- const char *basename;
- struct strbuf filename = STRBUF_INIT;
- size_t prefixlen;
-
- basename = cgit_snapshot_prefix(repo);
- if (starts_with(ref, basename))
- strbuf_addstr(&filename, ref);
- else
- cgit_compose_snapshot_prefix(&filename, basename, ref);
- prefixlen = filename.len;
- for (f = cgit_snapshot_formats; f->suffix; f++) {
- if (!(repo->snapshots & f->bit))
- continue;
- strbuf_setlen(&filename, prefixlen);
- strbuf_addstr(&filename, f->suffix);
- cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);
- html(" ");
- }
-
- strbuf_release(&filename);
-}
-
static int print_tag(struct refinfo *ref)
{
struct tag *tag = NULL;
@@ -134,7 +109,7 @@ static int print_tag(struct refinfo *ref)
cgit_tag_link(name, NULL, NULL, name);
html("</td><td>");
if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
- print_tag_downloads(ctx.repo, name);
+ cgit_print_snapshot_links(ctx.repo, name, " ");
else
cgit_object_link(obj);
html("</td><td>");
--
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 ` [RFC/PATCH 5/7] ui-shared: pass separator in to cgit_print_snapshot_links() john
2018-03-31 15:35 ` john [this message]
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=d64f09c895f25905faa753079142f65995774174.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).