From mboxrd@z Thu Jan  1 00:00:00 1970
From: list at eworm.de (Christian Hesse)
Date: Mon, 11 Jun 2018 08:53:02 +0200
Subject: [PATCH v2 1/1] snapshot: strip bit from struct cgit_snapshot_format
In-Reply-To: <20180611085127.562dffcd@leda>
References: <20180611085127.562dffcd@leda>
Message-ID: <20180611065302.30837-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

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 at eworm.de>
---
 cgit.c        |  2 +-
 cgit.h        |  4 +++-
 shared.c      |  2 +-
 ui-shared.c   |  2 +-
 ui-snapshot.c | 17 +++++++++++------
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cgit.c b/cgit.c
index d2f7b9c..ca0a89c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -765,7 +765,7 @@ static char *build_snapshot_setting(int bitmap)
 	struct strbuf result = STRBUF_INIT;
 
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
-		if (f->bit & bitmap) {
+		if (cgit_snapshot_format_bit(f) & bitmap) {
 			if (result.len)
 				strbuf_addch(&result, ' ');
 			strbuf_addstr(&result, f->suffix);
diff --git a/cgit.h b/cgit.h
index a686390..0798dc5 100644
--- a/cgit.h
+++ b/cgit.h
@@ -46,6 +46,8 @@
  */
 #define PAGE_ENCODING "UTF-8"
 
+#define BIT(x)	(1U << (x))
+
 typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
@@ -314,7 +316,6 @@ struct cgit_snapshot_format {
 	const char *suffix;
 	const char *mimetype;
 	write_archive_fn_t write_func;
-	int bit;
 };
 
 extern const char *cgit_version;
@@ -376,6 +377,7 @@ extern const char *cgit_repobasename(const char *reponame);
 extern int cgit_parse_snapshots_mask(const char *str);
 extern const struct object_id *cgit_snapshot_get_sig(const char *ref,
 						     const struct cgit_snapshot_format *f);
+extern const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f);
 
 extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);
diff --git a/shared.c b/shared.c
index 0a11e68..d59ae7e 100644
--- a/shared.c
+++ b/shared.c
@@ -400,7 +400,7 @@ int cgit_parse_snapshots_mask(const char *str)
 		for (f = cgit_snapshot_formats; f->suffix; f++) {
 			if (!strcmp(item->string, f->suffix) ||
 			    !strcmp(item->string, f->suffix + 1)) {
-				rv |= f->bit;
+				rv |= cgit_snapshot_format_bit(f);
 				break;
 			}
 		}
diff --git a/ui-shared.c b/ui-shared.c
index 51a25a0..b773a9c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1130,7 +1130,7 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
 
 	prefixlen = filename.len;
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
-		if (!(repo->snapshots & f->bit))
+		if (!(repo->snapshots & cgit_snapshot_format_bit(f)))
 			continue;
 		strbuf_setlen(&filename, prefixlen);
 		strbuf_addstr(&filename, f->suffix);
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 76d0573..4ebd295 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 || (!sig_filename && !(ctx.repo->snapshots & f->bit))) {
+	if (!f || (!sig_filename && !(ctx.repo->snapshots & cgit_snapshot_format_bit(f)))) {
 		cgit_print_error_page(400, "Bad request",
 				"Unsupported snapshot format: %s", filename);
 		return;