about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2018-03-31 14:05:02 +0100
committerJason A. Donenfeld2018-06-27 18:11:19 +0200
commitbd1b281478c8d8ab45f723ac5818d58da4a64dd1 (patch)
tree69fb78b50ecb692deac12a2513cefba71e1d3698
parentui-log: highlight annotated tags in different color (diff)
downloadcgit-bd1b281478c8d8ab45f723ac5818d58da4a64dd1.tar.gz
cgit-bd1b281478c8d8ab45f723ac5818d58da4a64dd1.zip
ui-shared: pass repo object to print_snapshot_links()
Both call sites of cgit_print_snapshot_links() use the same values for
the snapshot mask and repository name, which are derived from the
cgit_repo structure so let's pass in the structure and access the fields
directly.

Signed-off-by: John Keeping <john@keeping.me.uk>
Reviewed-by: Christian Hesse <mail@eworm.de>
-rw-r--r--ui-commit.c3
-rw-r--r--ui-shared.c8
-rw-r--r--ui-shared.h4
-rw-r--r--ui-tag.c3
4 files changed, 8 insertions, 10 deletions
diff --git a/ui-commit.c b/ui-commit.c index abf58f6..ea17461 100644 --- a/ui-commit.c +++ b/ui-commit.c
@@ -110,8 +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.qry.repo, ctx.qry.head, 113 cgit_print_snapshot_links(ctx.repo, ctx.qry.head, hex);
114 hex, ctx.repo->snapshots);
115 html("</td></tr>"); 114 html("</td></tr>");
116 } 115 }
117 html("</table>\n"); 116 html("</table>\n");
diff --git a/ui-shared.c b/ui-shared.c index 0c6ca60..e719c1b 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -1103,17 +1103,17 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
1103 strbuf_addf(filename, "%s-%s", base, ref); 1103 strbuf_addf(filename, "%s-%s", base, ref);
1104} 1104}
1105 1105
1106void cgit_print_snapshot_links(const char *repo, const char *head, 1106void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *head,
1107 const char *hex, int snapshots) 1107 const char *hex)
1108{ 1108{
1109 const struct cgit_snapshot_format* f; 1109 const struct cgit_snapshot_format* f;
1110 struct strbuf filename = STRBUF_INIT; 1110 struct strbuf filename = STRBUF_INIT;
1111 size_t prefixlen; 1111 size_t prefixlen;
1112 1112
1113 cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo), hex); 1113 cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo->url), hex);
1114 prefixlen = filename.len; 1114 prefixlen = filename.len;
1115 for (f = cgit_snapshot_formats; f->suffix; f++) { 1115 for (f = cgit_snapshot_formats; f->suffix; f++) {
1116 if (!(snapshots & f->bit)) 1116 if (!(repo->snapshots & f->bit))
1117 continue; 1117 continue;
1118 strbuf_setlen(&filename, prefixlen); 1118 strbuf_setlen(&filename, prefixlen);
1119 strbuf_addstr(&filename, f->suffix); 1119 strbuf_addstr(&filename, f->suffix);
diff --git a/ui-shared.h b/ui-shared.h index b760a17..b3eb8c5 100644 --- a/ui-shared.h +++ b/ui-shared.h
@@ -76,8 +76,8 @@ extern void cgit_print_pageheader(void);
76extern void cgit_print_filemode(unsigned short mode); 76extern void cgit_print_filemode(unsigned short mode);
77extern void cgit_compose_snapshot_prefix(struct strbuf *filename, 77extern void cgit_compose_snapshot_prefix(struct strbuf *filename,
78 const char *base, const char *ref); 78 const char *base, const char *ref);
79extern void cgit_print_snapshot_links(const char *repo, const char *head, 79extern void cgit_print_snapshot_links(const struct cgit_repo *repo,
80 const char *hex, int snapshots); 80 const char *head, const char *hex);
81extern void cgit_add_hidden_formfields(int incl_head, int incl_search, 81extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
82 const char *page); 82 const char *page);
83 83
diff --git a/ui-tag.c b/ui-tag.c index 2c216d0..89a46f9 100644 --- a/ui-tag.c +++ b/ui-tag.c
@@ -34,8 +34,7 @@ static void print_tag_content(char *buf)
34static void print_download_links(char *revname) 34static 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.qry.repo, ctx.qry.head, 37 cgit_print_snapshot_links(ctx.repo, ctx.qry.head, revname);
38 revname, ctx.repo->snapshots);
39 html("</td></tr>"); 38 html("</td></tr>");
40} 39}
41 40