Fix some coding style issues

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>

src/commit.h

@@ -9,7 +9,7 @@ struct git_commit {
 	git_oid id;
 	time_t commit_time;
 	unsigned parsed:1,
-	         flags:26;
+		 flags:26;
 };
 
 #endif

src/fileops.h

@@ -34,7 +34,7 @@ extern int git__fsync(int fd);
 # ifndef GIT__WIN32_NO_HIDE_FILEOPS
 #  define unlink(p) git__unlink(p)
 #  define mkstemp(t) git__mkstemp(t)
-#  define mkdir(p,m) git__mkdir(p,m)
+#  define mkdir(p,m) git__mkdir(p, m)
 #  define fsync(fd) git__fsync(fd)
 # endif
 #endif  /* GIT_WIN32 */

src/git/commit.h

@@ -25,14 +25,14 @@ typedef struct git_commit git_commit;
  *         pool's git_odb, or if the commit is present but is
  *         too malformed to be parsed successfully.
  */
-GIT_EXTERN(git_commit*) git_commit_parse(git_revpool *pool, const git_oid *id);
+GIT_EXTERN(git_commit *) git_commit_parse(git_revpool *pool, const git_oid *id);
 
 /**
  * Get the id of a commit.
  * @param commit a previously parsed commit.
  * @return object identity for the commit.
  */
-GIT_EXTERN(const git_oid*) git_commit_id(git_commit *commit);
+GIT_EXTERN(const git_oid *) git_commit_id(git_commit *commit);
 
 /** @} */
 GIT_END_DECL

src/git/common.h

@@ -16,8 +16,8 @@
 /** Declare a public function exported for application use. */
 #ifdef __GNUC__
 # define GIT_EXTERN(type) extern \
-                          __attribute__((visibility("default"))) \
-                          type
+			  __attribute__((visibility("default"))) \
+			  type
 #else
 # define GIT_EXTERN(type) extern type
 #endif
@@ -25,9 +25,9 @@
 /** Declare a public TLS symbol exported for application use. */
 #ifdef __GNUC__
 # define GIT_EXTERN_TLS(type) extern \
-                              __attribute__((visibility("default"))) \
-                              GIT_TLS \
-                              type
+			      __attribute__((visibility("default"))) \
+			      GIT_TLS \
+			      type
 #else
 # define GIT_EXTERN_TLS(type) extern GIT_TLS type
 #endif

src/git/oid.h

@@ -20,8 +20,7 @@ GIT_BEGIN_DECL
 #define GIT_OID_HEXSZ (GIT_OID_RAWSZ * 2)
 
 /** Unique identity of any object (commit, tree, blob, tag). */
-typedef struct
-{
+typedef struct {
 	/** raw binary formatted id */
 	unsigned char id[GIT_OID_RAWSZ];
 } git_oid;

src/git/revwalk.h

@@ -25,7 +25,7 @@ GIT_BEGIN_DECL
  * @param db the database objects are read from.
  * @return the new traversal handle; NULL if memory is exhausted.
  */
-GIT_EXTERN(git_revpool*) gitrp_alloc(git_odb *db);
+GIT_EXTERN(git_revpool *) gitrp_alloc(git_odb *db);
 
 /**
  * Reset the traversal machinary for reuse.
@@ -52,7 +52,7 @@ GIT_EXTERN(void) gitrp_hide(git_revpool *pool, git_commit *commit);
  * @param pool the pool to pop the commit from.
  * @return next commit; NULL if there is no more output.
  */
-GIT_EXTERN(git_commit*) gitrp_next(git_revpool *pool);
+GIT_EXTERN(git_commit *) gitrp_next(git_revpool *pool);
 
 /**
  * Free a revwalk previously allocated.

src/odb.c

@@ -100,7 +100,7 @@ typedef struct {  /* object header data */
 static struct {
 	const char *str;   /* type name string */
 	int        loose;  /* valid loose object type flag */
-} obj_type_table [] = {
+} obj_type_table[] = {
 	{ "",          0 },  /* 0 = GIT_OBJ__EXT1     */
 	{ "commit",    1 },  /* 1 = GIT_OBJ_COMMIT    */
 	{ "tree",      1 },  /* 2 = GIT_OBJ_TREE      */
@@ -113,7 +113,7 @@ static struct {
 
 GIT_INLINE(uint32_t) decode32(void *b)
 {
-	return ntohl(*((uint32_t*)b));
+	return ntohl(*((uint32_t *)b));
 }
 
 GIT_INLINE(uint64_t) decode64(void *b)
@@ -226,7 +226,7 @@ static int is_zlib_compressed_data(unsigned char *data)
 	unsigned int w;
 
 	w = ((unsigned int)(data[0]) << 8) + data[1];
-	return data[0] == 0x78 && !(w %31);
+	return data[0] == 0x78 && !(w % 31);
 }
 
 static size_t get_binary_object_header(obj_hdr *hdr, gitfo_buf *obj)
@@ -712,7 +712,7 @@ static int pack_openidx_v1(git_pack *p)
 
 	p->idx_search = idxv1_search;
 	p->im_fanout = im_fanout;
-	p->im_oid = (unsigned char*)(src_fanout + 256);
+	p->im_oid = (unsigned char *)(src_fanout + 256);
 	return GIT_SUCCESS;
 }
 
@@ -744,7 +744,7 @@ static int idxv2_search(off_t *out, git_pack *p, const git_oid *id)
 static int pack_openidx_v2(git_pack *p)
 {
 	unsigned char *data = p->idx_map.data;
-	uint32_t *src_fanout = (uint32_t*)(data + 8);
+	uint32_t *src_fanout = (uint32_t *)(data + 8);
 	uint32_t *im_fanout;
 	int j;
 
@@ -763,8 +763,8 @@ static int pack_openidx_v2(git_pack *p)
 
 	p->idx_search = idxv2_search;
 	p->im_fanout = im_fanout;
-	p->im_oid = (unsigned char*)(src_fanout + 256);
-	p->im_crc = (uint32_t*)(p->im_oid + 20 * p->obj_cnt);
+	p->im_oid = (unsigned char *)(src_fanout + 256);
+	p->im_crc = (uint32_t *)(p->im_oid + 20 * p->obj_cnt);
 	p->im_offset32 = p->im_crc + p->obj_cnt;
 	p->im_offset64 = p->im_offset32 + p->obj_cnt;
 	return GIT_SUCCESS;
@@ -900,7 +900,7 @@ static int scan_one_pack(void *state, char *name)
 	return 0;
 }
 
-static git_packlist* scan_packs(git_odb *db)
+static git_packlist *scan_packs(git_odb *db)
 {
 	char pb[GIT_PATH_MAX];
 	struct scanned_pack *state = NULL, *c;
@@ -974,7 +974,7 @@ static int search_packs(git_pack **p, off_t *offset, git_odb *db, const git_oid
 		pack_decidx(pack);
 
 		if (!res) {
-			packlist_dec(db,pl);
+			packlist_dec(db, pl);
 			if (p)
 				*p = pack;
 			if (offset)
@@ -984,7 +984,7 @@ static int search_packs(git_pack **p, off_t *offset, git_odb *db, const git_oid
 
 	}
 
-	packlist_dec(db,pl);
+	packlist_dec(db, pl);
 	return GIT_ENOTFOUND;
 }
 

src/util.h

@@ -58,6 +58,6 @@ GIT_INLINE(int) git__is_sizet(off_t p)
 				alloc = alloc_nr(alloc); \
 			x = xrealloc((x), alloc * sizeof(*(x))); \
 		} \
-	} while(0)
+	} while (0)
 
 #endif /* INCLUDE_util_h__ */

tests/t0020-dirent.c

@@ -123,9 +123,9 @@ BEGIN_TEST(dot)
 	must_pass(setup(&dot));
 
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       one_entry,
-	                       &dot));
+			       sizeof(path_buffer),
+			       one_entry,
+			       &dot));
 
 	must_pass(check_counts(&dot));
 
@@ -148,9 +148,9 @@ BEGIN_TEST(sub)
 	must_pass(setup(&sub));
 
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       one_entry,
-	                       &sub));
+			       sizeof(path_buffer),
+			       one_entry,
+			       &sub));
 
 	must_pass(check_counts(&sub));
 
@@ -167,9 +167,9 @@ BEGIN_TEST(sub_slash)
 	must_pass(setup(&sub_slash));
 
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       one_entry,
-	                       &sub_slash));
+			       sizeof(path_buffer),
+			       one_entry,
+			       &sub_slash));
 
 	must_pass(check_counts(&sub_slash));
 
@@ -196,17 +196,17 @@ BEGIN_TEST(empty)
 	must_pass(setup(&empty));
 
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       one_entry,
-	                       &empty));
+			       sizeof(path_buffer),
+			       one_entry,
+			       &empty));
 
 	must_pass(check_counts(&empty));
 
 	/* make sure callback not called */
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       dont_call_me,
-	                       &empty));
+			       sizeof(path_buffer),
+			       dont_call_me,
+			       &empty));
 
 	must_pass(knockdown(&empty));
 END_TEST
@@ -229,9 +229,9 @@ BEGIN_TEST(odd)
 	must_pass(setup(&odd));
 
 	must_pass(gitfo_dirent(path_buffer,
-	                       sizeof(path_buffer),
-	                       one_entry,
-	                       &odd));
+			       sizeof(path_buffer),
+			       one_entry,
+			       &odd));
 
 	must_pass(check_counts(&odd));
 

tests/t0101-oid.c

@@ -50,7 +50,7 @@ BEGIN_TEST(invalid_string_all_chars)
 				test_die("line %d: must accept '%s'", __LINE__, in);
 			if (memcmp(out.id, exp, sizeof(out.id)))
 				test_die("line %d: bad parse of '%s', %x != %x",
-				         __LINE__, in, exp[19], out.id[19]);
+					 __LINE__, in, exp[19], out.id[19]);
 		} else if (!git_oid_mkstr(&out, in))
 			test_die("line %d: must not accept '%s'", __LINE__, in);
 	}

tests/t0102-objtype.c

@@ -3,19 +3,19 @@
 #include <git/odb.h>
 
 BEGIN_TEST(type_to_string)
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_BAD),""));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ__EXT1),""));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_COMMIT),"commit"));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_TREE),"tree"));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_BLOB),"blob"));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_TAG),"tag"));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ__EXT2),""));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_OFS_DELTA),"OFS_DELTA"));
-	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_REF_DELTA),"REF_DELTA"));
-
-	must_be_true(!strcmp(git_obj_type_to_string(-2),""));
-	must_be_true(!strcmp(git_obj_type_to_string(8),""));
-	must_be_true(!strcmp(git_obj_type_to_string(1234),""));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_BAD), ""));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ__EXT1), ""));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_COMMIT), "commit"));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_TREE), "tree"));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_BLOB), "blob"));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_TAG), "tag"));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ__EXT2), ""));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_OFS_DELTA), "OFS_DELTA"));
+	must_be_true(!strcmp(git_obj_type_to_string(GIT_OBJ_REF_DELTA), "REF_DELTA"));
+
+	must_be_true(!strcmp(git_obj_type_to_string(-2), ""));
+	must_be_true(!strcmp(git_obj_type_to_string(8), ""));
+	must_be_true(!strcmp(git_obj_type_to_string(1234), ""));
 END_TEST
 
 BEGIN_TEST(string_to_type)

tests/t0201-existsloose.c

@@ -37,8 +37,8 @@ BEGIN_TEST(exists_loose_one)
     must_be_true(git_odb_exists(db, &id));
 
 	/* Test for a non-existant object */
-    must_pass(git_oid_mkstr(&id2,"8b137891791fe96927ad78e64b0aad7bded08baa"));
-	must_be_true(0 == git_odb_exists(db, &id2));
+    must_pass(git_oid_mkstr(&id2, "8b137891791fe96927ad78e64b0aad7bded08baa"));
+    must_be_true(0 == git_odb_exists(db, &id2));
 
     git_odb_close(db);
     must_pass(remove_object_files(odb_dir, &one));

tests/t0301-write.c

@@ -351,55 +351,54 @@ static git_obj some_obj = {
 
 static int make_odb_dir(void)
 {
-    if (gitfo_mkdir(odb_dir, 0755) < 0) {
-        if (errno == EEXIST) {
-            fprintf(stderr, "odb directory \"%s\" already exists!\n", odb_dir);
-            return -1;
-        }
-        fprintf(stderr, "can't make odb directory \"%s\"\n", odb_dir);
-        return -1;
-    }
-
-    return 0;
+	if (gitfo_mkdir(odb_dir, 0755) < 0) {
+		int err = errno;
+		fprintf(stderr, "can't make directory \"%s\"", odb_dir);
+		if (err == EEXIST)
+			fprintf(stderr, " (already exists)");
+		fprintf(stderr, "\n");
+		return -1;
+	}
+	return 0;
 }
 
 static int remove_object_files(object_data *d)
 {
-    if (gitfo_unlink(d->file) < 0) {
-        fprintf(stderr, "can't delete object file \"%s\"\n", d->file);
-        return -1;
-    }
-    if ((gitfo_rmdir(d->dir) < 0) && (errno != ENOTEMPTY)) {
-        fprintf(stderr, "can't remove object directory \"%s\"\n", d->dir);
-        return -1;
-    }
-
-    if (gitfo_rmdir(odb_dir) < 0) {
-        fprintf(stderr, "can't remove odb directory \"%s\"\n", odb_dir);
-        return -1;
-    }
-
-    return 0;
+	if (gitfo_unlink(d->file) < 0) {
+		fprintf(stderr, "can't delete object file \"%s\"\n", d->file);
+		return -1;
+	}
+	if ((gitfo_rmdir(d->dir) < 0) && (errno != ENOTEMPTY)) {
+		fprintf(stderr, "can't remove directory \"%s\"\n", d->dir);
+		return -1;
+	}
+
+	if (gitfo_rmdir(odb_dir) < 0) {
+		fprintf(stderr, "can't remove directory \"%s\"\n", odb_dir);
+		return -1;
+	}
+
+	return 0;
 }
 
 static int check_object_files(object_data *d)
 {
-    if (gitfo_exists(d->dir) < 0)
-	    return -1;
-    if (gitfo_exists(d->file) < 0)
-	    return -1;
-    return 0;
+	if (gitfo_exists(d->dir) < 0)
+		return -1;
+	if (gitfo_exists(d->file) < 0)
+		return -1;
+	return 0;
 }
 
 static int cmp_objects(git_obj *o1, git_obj *o2)
 {
-    if (o1->type != o2->type)
-        return -1;
-    if (o1->len != o2->len)
-        return -1;
-    if ((o1->len > 0) && (memcmp(o1->data, o2->data, o1->len) != 0))
-        return -1;
-    return 0;
+	if (o1->type != o2->type)
+		return -1;
+	if (o1->len != o2->len)
+		return -1;
+	if ((o1->len > 0) && (memcmp(o1->data, o2->data, o1->len) != 0))
+		return -1;
+	return 0;
 }
 
 BEGIN_TEST(write_commit)

tests/test_helpers.c

@@ -29,66 +29,66 @@
 
 int write_object_data(char *file, void *data, size_t len)
 {
-    git_file fd;
-    int ret;
+	git_file fd;
+	int ret;
 
-    if ((fd = gitfo_creat(file, S_IREAD | S_IWRITE)) < 0)
-        return -1;
-    ret = gitfo_write(fd, data, len);
-    gitfo_close(fd);
+	if ((fd = gitfo_creat(file, S_IREAD | S_IWRITE)) < 0)
+		return -1;
+	ret = gitfo_write(fd, data, len);
+	gitfo_close(fd);
 
-    return ret;
+	return ret;
 }
 
 int write_object_files(const char *odb_dir, object_data *d)
 {
-    if (gitfo_mkdir(odb_dir, 0755) < 0) {
-        if (errno == EEXIST) {
-            fprintf(stderr, "odb directory \"%s\" already exists!\n", odb_dir);
-            return -1;
-        }
-        fprintf(stderr, "can't make odb directory \"%s\"\n", odb_dir);
-        return -1;
-    }
+	if (gitfo_mkdir(odb_dir, 0755) < 0) {
+		int err = errno;
+		fprintf(stderr, "can't make directory \"%s\"", odb_dir);
+		if (err == EEXIST)
+			fprintf(stderr, " (already exists)");
+		fprintf(stderr, "\n");
+		return -1;
+	}
 
-    if ((gitfo_mkdir(d->dir, 0755) < 0) && (errno != EEXIST)) {
-        fprintf(stderr, "can't make object directory \"%s\"\n", d->dir);
-        return -1;
-    }
-    if (write_object_data(d->file, d->bytes, d->blen) < 0) {
-        fprintf(stderr, "can't write object file \"%s\"\n", d->file);
-        return -1;
-    }
+	if ((gitfo_mkdir(d->dir, 0755) < 0) && (errno != EEXIST)) {
+		fprintf(stderr, "can't make object directory \"%s\"\n", d->dir);
+		return -1;
+	}
+	if (write_object_data(d->file, d->bytes, d->blen) < 0) {
+		fprintf(stderr, "can't write object file \"%s\"\n", d->file);
+		return -1;
+	}
 
-    return 0;
+	return 0;
 }
 
 int remove_object_files(const char *odb_dir, object_data *d)
 {
-    if (gitfo_unlink(d->file) < 0) {
-        fprintf(stderr, "can't delete object file \"%s\"\n", d->file);
-        return -1;
-    }
-    if ((gitfo_rmdir(d->dir) < 0) && (errno != ENOTEMPTY)) {
-        fprintf(stderr, "can't remove object directory \"%s\"\n", d->dir);
-        return -1;
-    }
+	if (gitfo_unlink(d->file) < 0) {
+		fprintf(stderr, "can't delete object file \"%s\"\n", d->file);
+		return -1;
+	}
+	if ((gitfo_rmdir(d->dir) < 0) && (errno != ENOTEMPTY)) {
+		fprintf(stderr, "can't remove object directory \"%s\"\n", d->dir);
+		return -1;
+	}
 
-    if (gitfo_rmdir(odb_dir) < 0) {
-        fprintf(stderr, "can't remove odb directory \"%s\"\n", odb_dir);
-        return -1;
-    }
+	if (gitfo_rmdir(odb_dir) < 0) {
+		fprintf(stderr, "can't remove directory \"%s\"\n", odb_dir);
+		return -1;
+	}
 
-    return 0;
+	return 0;
 }
 
 int cmp_objects(git_obj *o, object_data *d)
 {
-    if (o->type != git_obj_string_to_type(d->type))
-        return -1;
-    if (o->len != d->dlen)
-        return -1;
-    if ((o->len > 0) && (memcmp(o->data, d->data, o->len) != 0))
-        return -1;
-    return 0;
+	if (o->type != git_obj_string_to_type(d->type))
+		return -1;
+	if (o->len != d->dlen)
+		return -1;
+	if ((o->len > 0) && (memcmp(o->data, d->data, o->len) != 0))
+		return -1;
+	return 0;
 }

tests/test_lib.c

@@ -26,8 +26,7 @@
 #define GIT__NO_HIDE_MALLOC
 #include "test_lib.h"
 
-struct test_info
-{
+struct test_info {
 	struct test_info *next;
 	const char *test_name;
 	const char *file_name;
@@ -40,9 +39,9 @@ static struct test_info *current_test;
 static void show_test_result(const char *status)
 {
 	fprintf(stderr, "* %-6s %5d: %s\n",
-	        status,
-			current_test->line_no,
-			current_test->test_name);
+		status,
+		current_test->line_no,
+		current_test->test_name);
 }
 
 void test_die(const char *fmt, ...)

tests/test_lib.h

@@ -45,7 +45,7 @@
  * @param name C symbol to assign to this test's function.
  */
 #define BEGIN_TEST(name) \
-	void testfunc__##name (void) \
+	void testfunc__##name(void) \
 	{ \
 		test_begin(#name, __FILE__, __LINE__); \
 	{