| -rw-r--r-- | ui-snapshot.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index f9879ed..bd34a28 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -49,4 +49,5 @@ static int write_tar_gzip_archive(struct archiver_args *args) return write_compressed_tar_archive(args,"gzip"); } + static int write_tar_bzip2_archive(struct archiver_args *args) { @@ -66,15 +67,18 @@ static const struct snapshot_archive_t { }; +#define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) + void cgit_print_snapshot(struct cacheitem *item, const char *head, const char *hex, const char *prefix, const char *filename, int snapshots) { - int fnl = strlen(filename); - int f, n; + const struct snapshot_archive_t* sat; + struct archiver_args args; + struct commit *commit; + unsigned char sha1[20]; + int f, sl, fnl = strlen(filename); - n = sizeof(snapshot_archives) / sizeof(*snapshot_archives); - for(f=0; f<n; f++) { - const struct snapshot_archive_t* sat = &snapshot_archives[f]; - int sl; + for(f=0; f<snapshot_archives_len; f++) { + sat = &snapshot_archives[f]; if(!(snapshots & sat->bit)) continue; @@ -82,9 +86,4 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) continue; - - struct archiver_args args; - struct commit *commit; - unsigned char sha1[20]; - if (!hex) hex = head; @@ -94,14 +93,11 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, } commit = lookup_commit_reference(sha1); - if(!commit) { cgit_print_error(fmt("Not a commit reference: %s", hex)); return;; } - memset(&args,0,sizeof(args)); args.base = fmt("%s/", prefix); args.tree = commit->tree; - cgit_print_snapshot_start(sat->mimetype, filename, item); (*sat->write_func)(&args); @@ -114,10 +110,10 @@ void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots) { + const struct snapshot_archive_t* sat; char *filename; - int f, n; + int f; - n = sizeof(snapshot_archives) / sizeof(*snapshot_archives); - for(f=0; f<n ;f++) { - const struct snapshot_archive_t* sat = &snapshot_archives[f]; + for(f=0; f<snapshot_archives_len; f++) { + sat = &snapshot_archives[f]; if(!(snapshots & sat->bit)) continue; @@ -132,8 +128,11 @@ void cgit_print_snapshot_links(const char *repo, const char *head, int cgit_parse_snapshots_mask(const char *str) { + const struct snapshot_archive_t* sat; static const char *delim = " \t,:/|;"; int f, tl, rv = 0; + /* favor legacy setting */ - if(atoi(str)) return 1; + if(atoi(str)) + return 1; for(;;) { str += strspn(str,delim); @@ -141,7 +140,8 @@ int cgit_parse_snapshots_mask(const char *str) if(!tl) break; - for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { - const struct snapshot_archive_t* sat = &snapshot_archives[f]; - if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) { + for(f=0; f<snapshot_archives_len; f++) { + sat = &snapshot_archives[f]; + if(!(strncmp(sat->suffix, str, tl) && + strncmp(sat->suffix+1, str, tl-1))) { rv |= sat->bit; break; |