crtxcr/cgitsb
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Kiadások Wiki Tevékenység

ui-snapshot: whitespace/formatting cleanup

Forráskód böngészése 
Introduce a #define for number of snapshot archive entries, move all decls
to function entrypoint, remove some trailing whitespace and reformat a few
lines.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-07-23 22:51:45 +02:00
szülő 43291e418a
commit 1221adbb58
1 fájl változott, egészen pontosan 23 új sor hozzáadva és 23 régi sor törölve
Statisztikák mutatása Download Patch File Download Diff File Expand all files Collapse all files

44
ui-snapshot.c
Fájl megtekintése

@ -48,6 +48,7 @@ static int write_tar_gzip_archive(struct archiver_args *args)
{ {
return write_compressed_tar_archive(args,"gzip"); return write_compressed_tar_archive(args,"gzip");
} }
static int write_tar_bzip2_archive(struct archiver_args *args) static int write_tar_bzip2_archive(struct archiver_args *args)
{ {
return write_compressed_tar_archive(args,"bzip2"); return write_compressed_tar_archive(args,"bzip2");
@ -65,27 +66,25 @@ static const struct snapshot_archive_t {
{ ".tar", "application/x-tar", write_tar_archive, 0x8 } { ".tar", "application/x-tar", write_tar_archive, 0x8 }
}; };
#define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives))
void cgit_print_snapshot(struct cacheitem *item, const char *head, void cgit_print_snapshot(struct cacheitem *item, const char *head,
const char *hex, const char *prefix, const char *hex, const char *prefix,
const char *filename, int snapshots) const char *filename, int snapshots)
{ {
int fnl = strlen(filename); const struct snapshot_archive_t* sat;
int f, n; 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<snapshot_archives_len; f++) {
for(f=0; f<n; f++) { sat = &snapshot_archives[f];
const struct snapshot_archive_t* sat = &snapshot_archives[f];
int sl;
if(!(snapshots & sat->bit)) if(!(snapshots & sat->bit))
continue; continue;
sl = strlen(sat->suffix); sl = strlen(sat->suffix);
if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
continue; continue;
struct archiver_args args;
struct commit *commit;
unsigned char sha1[20];
if (!hex) if (!hex)
hex = head; hex = head;
if(get_sha1(hex, sha1)) { if(get_sha1(hex, sha1)) {
@ -93,16 +92,13 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
return; return;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
if(!commit) { if(!commit) {
cgit_print_error(fmt("Not a commit reference: %s", hex)); cgit_print_error(fmt("Not a commit reference: %s", hex));
return;; return;;
} }
memset(&args,0,sizeof(args)); memset(&args,0,sizeof(args));
args.base = fmt("%s/", prefix); args.base = fmt("%s/", prefix);
args.tree = commit->tree; args.tree = commit->tree;
cgit_print_snapshot_start(sat->mimetype, filename, item); cgit_print_snapshot_start(sat->mimetype, filename, item);
(*sat->write_func)(&args); (*sat->write_func)(&args);
return; return;
@ -113,12 +109,12 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
void cgit_print_snapshot_links(const char *repo, const char *head, void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots) const char *hex, int snapshots)
{ {
const struct snapshot_archive_t* sat;
char *filename; char *filename;
int f, n; int f;
n = sizeof(snapshot_archives) / sizeof(*snapshot_archives); for(f=0; f<snapshot_archives_len; f++) {
for(f=0; f<n ;f++) { sat = &snapshot_archives[f];
const struct snapshot_archive_t* sat = &snapshot_archives[f];
if(!(snapshots & sat->bit)) if(!(snapshots & sat->bit))
continue; continue;
filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
@ -131,18 +127,22 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
int cgit_parse_snapshots_mask(const char *str) int cgit_parse_snapshots_mask(const char *str)
{ {
const struct snapshot_archive_t* sat;
static const char *delim = " \t,:/|;"; static const char *delim = " \t,:/|;";
int f, tl, rv = 0; int f, tl, rv = 0;
/* favor legacy setting */ /* favor legacy setting */
if(atoi(str)) return 1; if(atoi(str))
return 1;
for(;;) { for(;;) {
str += strspn(str,delim); str += strspn(str,delim);
tl = strcspn(str,delim); tl = strcspn(str,delim);
if(!tl) if(!tl)
break; break;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { for(f=0; f<snapshot_archives_len; f++) {
const struct snapshot_archive_t* sat = &snapshot_archives[f]; sat = &snapshot_archives[f];
if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) { if(!(strncmp(sat->suffix, str, tl) &&
strncmp(sat->suffix+1, str, tl-1))) {
rv |= sat->bit; rv |= sat->bit;
break; break;
} }