crtxcr/cgitsb
1
0
Vork 0
Code Kwesties Pull-aanvragen Publicaties Wiki Activiteit

snapshot: strip bit from struct cgit_snapshot_format

Bladeren bron 
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>
This commit is contained in:
Christian Hesse 2018-06-11 08:26:59 +02:00 gecommit door Jason A. Donenfeld
bovenliggende 30a378b571
commit 2f8648ff7f
5 gewijzigde bestanden met toevoegingen van 17 en 10 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
cgit.c
Bestand weergeven

@ -765,7 +765,7 @@ static char *build_snapshot_setting(int bitmap)
struct strbuf result = STRBUF_INIT; struct strbuf result = STRBUF_INIT;
for (f = cgit_snapshot_formats; f->suffix; f++) { for (f = cgit_snapshot_formats; f->suffix; f++) {
if (f->bit & bitmap) { if (cgit_snapshot_format_bit(f) & bitmap) {
if (result.len) if (result.len)
strbuf_addch(&result, ' '); strbuf_addch(&result, ' ');
strbuf_addstr(&result, f->suffix); strbuf_addstr(&result, f->suffix);

4
cgit.h
Bestand weergeven

@ -46,6 +46,8 @@
*/ */
#define PAGE_ENCODING "UTF-8" #define PAGE_ENCODING "UTF-8"
#define BIT(x) (1U << (x))
typedef void (*configfn)(const char *name, const char *value); typedef void (*configfn)(const char *name, const char *value);
typedef void (*filepair_fn)(struct diff_filepair *pair); typedef void (*filepair_fn)(struct diff_filepair *pair);
typedef void (*linediff_fn)(char *line, int len); typedef void (*linediff_fn)(char *line, int len);
@ -314,7 +316,6 @@ struct cgit_snapshot_format {
const char *suffix; const char *suffix;
const char *mimetype; const char *mimetype;
write_archive_fn_t write_func; write_archive_fn_t write_func;
int bit;
}; };
extern const char *cgit_version; 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 int cgit_parse_snapshots_mask(const char *str);
extern const struct object_id *cgit_snapshot_get_sig(const char *ref, extern const struct object_id *cgit_snapshot_get_sig(const char *ref,
const struct cgit_snapshot_format *f); 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_open_filter(struct cgit_filter *filter, ...);
extern int cgit_close_filter(struct cgit_filter *filter); extern int cgit_close_filter(struct cgit_filter *filter);

2
shared.c
Bestand weergeven

@ -400,7 +400,7 @@ int cgit_parse_snapshots_mask(const char *str)
for (f = cgit_snapshot_formats; f->suffix; f++) { for (f = cgit_snapshot_formats; f->suffix; f++) {
if (!strcmp(item->string, f->suffix) || if (!strcmp(item->string, f->suffix) ||
!strcmp(item->string, f->suffix + 1)) { !strcmp(item->string, f->suffix + 1)) {
rv |= f->bit; rv |= cgit_snapshot_format_bit(f);
break; break;
} }
} }

2
ui-shared.c
Bestand weergeven

@ -1127,7 +1127,7 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
prefixlen = filename.len; prefixlen = filename.len;
for (f = cgit_snapshot_formats; f->suffix; f++) { for (f = cgit_snapshot_formats; f->suffix; f++) {
if (!(repo->snapshots & f->bit)) if (!(repo->snapshots & cgit_snapshot_format_bit(f)))
continue; continue;
strbuf_setlen(&filename, prefixlen); strbuf_setlen(&filename, prefixlen);
strbuf_addstr(&filename, f->suffix); strbuf_addstr(&filename, f->suffix);

17
ui-snapshot.c
Bestand weergeven

@ -86,11 +86,11 @@ static int write_tar_xz_archive(const char *hex, const char *prefix)
} }
const struct cgit_snapshot_format cgit_snapshot_formats[] = { const struct cgit_snapshot_format cgit_snapshot_formats[] = {
{ ".zip", "application/x-zip", write_zip_archive, 0x01 }, { ".tar", "application/x-tar", write_tar_archive },
{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 }, { ".tar.gz", "application/x-gzip", write_tar_gzip_archive },
{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 }, { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive },
{ ".tar", "application/x-tar", write_tar_archive, 0x08 }, { ".tar.xz", "application/x-xz", write_tar_xz_archive },
{ ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 }, { ".zip", "application/x-zip", write_zip_archive },
{ NULL } { NULL }
}; };
@ -130,6 +130,11 @@ static const struct cgit_snapshot_format *get_format(const char *filename)
return NULL; 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, static int make_snapshot(const struct cgit_snapshot_format *format,
const char *hex, const char *prefix, const char *hex, const char *prefix,
const char *filename) const char *filename)
@ -263,7 +268,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
} }
f = get_format(filename); 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", cgit_print_error_page(400, "Bad request",
"Unsupported snapshot format: %s", filename); "Unsupported snapshot format: %s", filename);
return; return;