ui-snapshot: whitespace/formatting cleanup

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>

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
@@ -50,2 +50,3 @@ static int write_tar_gzip_archive(struct archiver_args *args)
 }
+
 static int write_tar_bzip2_archive(struct archiver_args *args)
@@ -67,2 +68,4 @@ 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,
@@ -71,9 +74,10 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
 {
-	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))
@@ -83,7 +87,2 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
 			continue;
-
-		struct archiver_args args;
-		struct commit *commit;
-		unsigned char sha1[20];
-
 		if (!hex)
@@ -95,3 +94,2 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
 		commit = lookup_commit_reference(sha1);
-
 		if(!commit) {
@@ -100,3 +98,2 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
 		}
-
 		memset(&args,0,sizeof(args));
@@ -104,3 +101,2 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
 		args.tree = commit->tree;
-
 		cgit_print_snapshot_start(sat->mimetype, filename, item);
@@ -115,8 +111,8 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
 {
+	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))
@@ -133,6 +129,9 @@ 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(;;) {
@@ -142,5 +141,6 @@ int cgit_parse_snapshots_mask(const char *str)
 			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;