aboutsummaryrefslogtreecommitdiffstats
path: root/ui-snapshot.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-06-11 08:26:59 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-06-27 18:13:00 +0200
commit2f8648ff7f5c7119ab035c134504f04eefe068fb (patch)
tree8fc7db6324b6483939cdfcf201793866877a5d92 /ui-snapshot.c
parent30a378b571c9f826d37c913b32b363f54a8997f4 (diff)
downloadcgit-2f8648ff7f5c7119ab035c134504f04eefe068fb.tar.gz
cgit-2f8648ff7f5c7119ab035c134504f04eefe068fb.tar.bz2
cgit-2f8648ff7f5c7119ab035c134504f04eefe068fb.zip
snapshot: strip bit from struct cgit_snapshot_format
We had a static bit value in struct cgit_snapshot_format. We do not rely on it and things can be calculated on the fly. So strip it. Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r--ui-snapshot.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index c7611e8..83ce6e8 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -86,11 +86,11 @@ static int write_tar_xz_archive(const char *hex, const char *prefix)
}
const struct cgit_snapshot_format cgit_snapshot_formats[] = {
- { ".zip", "application/x-zip", write_zip_archive, 0x01 },
- { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
- { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
- { ".tar", "application/x-tar", write_tar_archive, 0x08 },
- { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
+ { ".tar", "application/x-tar", write_tar_archive },
+ { ".tar.gz", "application/x-gzip", write_tar_gzip_archive },
+ { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive },
+ { ".tar.xz", "application/x-xz", write_tar_xz_archive },
+ { ".zip", "application/x-zip", write_zip_archive },
{ NULL }
};
@@ -130,6 +130,11 @@ static const struct cgit_snapshot_format *get_format(const char *filename)
return NULL;
}
+const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f)
+{
+ return BIT(f - &cgit_snapshot_formats[0]);
+}
+
static int make_snapshot(const struct cgit_snapshot_format *format,
const char *hex, const char *prefix,
const char *filename)
@@ -263,7 +268,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
}
f = get_format(filename);
- if (!f || !(ctx.repo->snapshots & f->bit)) {
+ if (!f || !(ctx.repo->snapshots & cgit_snapshot_format_bit(f))) {
cgit_print_error_page(400, "Bad request",
"Unsupported snapshot format: %s", filename);
return;