Slight coding style change

13 files changed, 121 insertions, 64 deletions

diff --git a/test/test_avltree.c b/test/test_avltree.c
index f8fcec8..a08c7e2 100644
--- a/test/test_avltree.c
+++ b/test/test_avltree.c
@@ -39,7 +39,8 @@ struct obj {
     int id;
 };
 
-static inline int obj_cmp_lookup(int id, struct avltree_node *node)
+static inline int
+obj_cmp_lookup(int id, struct avltree_node *node)
 {
     struct obj *obj;
 
@@ -47,7 +48,8 @@ static inline int obj_cmp_lookup(int id, struct avltree_node *node)
     return id - obj->id;
 }
 
-static void print_subtree(struct avltree_node *node, int level)
+static void
+print_subtree(struct avltree_node *node, int level)
 {
     struct obj *obj;
     char balance;
@@ -83,17 +85,20 @@ static void print_subtree(struct avltree_node *node, int level)
     print_subtree(node->children[AVLTREE_LEFT], level + 1);
 }
 
-static void print_tree(struct avltree *tree)
+static void
+print_tree(struct avltree *tree)
 {
     print_subtree(tree->root, 0);
 }
 
-static int get_id(int i)
+static int
+get_id(int i)
 {
     return hash_int32(i, 6);
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct avltree tree;
     struct avltree_node *node, *tmp;
diff --git a/test/test_mem.c b/test/test_mem.c
index 95887ca..eb7a56c 100644
--- a/test/test_mem.c
+++ b/test/test_mem.c
@@ -32,7 +32,8 @@
 #define STRING      "This is a test string."
 #define STRING_SIZE (STRLEN(STRING) + 1)
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     char *s;
 
diff --git a/test/test_mem_cache.c b/test/test_mem_cache.c
index 2ae17fc..518dc09 100644
--- a/test/test_mem_cache.c
+++ b/test/test_mem_cache.c
@@ -52,7 +52,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -64,7 +65,8 @@ static struct mem_cache *obj_cache;
 static volatile int work;
 static struct result results[NTHREADS];
 
-static void * run(void *arg)
+static void *
+run(void *arg)
 {
     struct obj *objs[OBJSPERLOOP];
     struct result *result;
@@ -90,7 +92,8 @@ static void * run(void *arg)
     return NULL;
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     pthread_t threads[NTHREADS];
     unsigned long ops;
diff --git a/test/test_mem_cache_double_free.c b/test/test_mem_cache_double_free.c
index 241533d..de356a3 100644
--- a/test/test_mem_cache_double_free.c
+++ b/test/test_mem_cache_double_free.c
@@ -35,7 +35,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -43,7 +44,8 @@ static void obj_ctor(void *ptr)
     obj->nr_refs = 0;
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct mem_cache *obj_cache;
     struct obj *obj;
diff --git a/test/test_mem_cache_invalid_free.c b/test/test_mem_cache_invalid_free.c
index 9efddb9..767ee6b 100644
--- a/test/test_mem_cache_invalid_free.c
+++ b/test/test_mem_cache_invalid_free.c
@@ -35,7 +35,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -43,7 +44,8 @@ static void obj_ctor(void *ptr)
     obj->nr_refs = 0;
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct mem_cache *obj_cache;
     struct obj *obj;
diff --git a/test/test_mem_cache_write_beyond.c b/test/test_mem_cache_write_beyond.c
index ba0c4ce..05bea2e 100644
--- a/test/test_mem_cache_write_beyond.c
+++ b/test/test_mem_cache_write_beyond.c
@@ -35,7 +35,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -43,7 +44,8 @@ static void obj_ctor(void *ptr)
     obj->nr_refs = 0;
 }
 
-static void obj_print(struct obj *obj, size_t size)
+static void
+obj_print(struct obj *obj, size_t size)
 {
     unsigned char *ptr, *end;
 
@@ -55,7 +57,8 @@ static void obj_print(struct obj *obj, size_t size)
     printf("\n");
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct mem_cache *obj_cache;
     struct obj *obj;
diff --git a/test/test_mem_cache_write_buftag.c b/test/test_mem_cache_write_buftag.c
index 1d437f9..539d399 100644
--- a/test/test_mem_cache_write_buftag.c
+++ b/test/test_mem_cache_write_buftag.c
@@ -35,7 +35,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -43,7 +44,8 @@ static void obj_ctor(void *ptr)
     obj->nr_refs = 0;
 }
 
-static void obj_print(struct obj *obj, size_t size)
+static void
+obj_print(struct obj *obj, size_t size)
 {
     unsigned char *ptr, *end;
 
@@ -55,7 +57,8 @@ static void obj_print(struct obj *obj, size_t size)
     printf("\n");
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct mem_cache *obj_cache;
     struct obj *obj;
diff --git a/test/test_mem_cache_write_free.c b/test/test_mem_cache_write_free.c
index b07fac9..fd1c9db 100644
--- a/test/test_mem_cache_write_free.c
+++ b/test/test_mem_cache_write_free.c
@@ -38,7 +38,8 @@ struct obj {
     char name[16];
 };
 
-static void obj_ctor(void *ptr)
+static void
+obj_ctor(void *ptr)
 {
     struct obj *obj;
 
@@ -46,7 +47,8 @@ static void obj_ctor(void *ptr)
     obj->nr_refs = 0;
 }
 
-static void obj_print(struct obj *obj)
+static void
+obj_print(struct obj *obj)
 {
     unsigned char *ptr, *end;
 
@@ -60,7 +62,8 @@ static void obj_print(struct obj *obj)
     printf("\n");
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct mem_cache *obj_cache;
     struct obj *obj;
diff --git a/test/test_mem_offbyone.c b/test/test_mem_offbyone.c
index 1a2072f..b9e7d75 100644
--- a/test/test_mem_offbyone.c
+++ b/test/test_mem_offbyone.c
@@ -30,7 +30,8 @@
 
 #define BUFSIZE 200
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     char *s;
 
diff --git a/test/test_phys.c b/test/test_phys.c
index ba6fbe4..d9ad154 100644
--- a/test/test_phys.c
+++ b/test/test_phys.c
@@ -29,7 +29,8 @@
 
 #include "../phys.c"
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct phys_page *page;
 
diff --git a/test/test_rbtree.c b/test/test_rbtree.c
index e379fb8..840465f 100644
--- a/test/test_rbtree.c
+++ b/test/test_rbtree.c
@@ -39,7 +39,8 @@ struct obj {
     int id;
 };
 
-static inline int obj_cmp_lookup(int id, struct rbtree_node *node)
+static inline int
+obj_cmp_lookup(int id, struct rbtree_node *node)
 {
     struct obj *obj;
 
@@ -47,7 +48,8 @@ static inline int obj_cmp_lookup(int id, struct rbtree_node *node)
     return id - obj->id;
 }
 
-static void print_subtree(struct rbtree_node *node, int level)
+static void
+print_subtree(struct rbtree_node *node, int level)
 {
     struct obj *obj;
     char color;
@@ -68,17 +70,20 @@ static void print_subtree(struct rbtree_node *node, int level)
     print_subtree(node->children[RBTREE_LEFT], level + 1);
 }
 
-static void print_tree(struct rbtree *tree)
+static void
+print_tree(struct rbtree *tree)
 {
     print_subtree(tree->root, 0);
 }
 
-static int get_id(int i)
+static int
+get_id(int i)
 {
     return hash_int32(i, 6);
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     struct rbtree tree;
     struct rbtree_node *node, *tmp;
diff --git a/test/test_rdxtree.c b/test/test_rdxtree.c
index fb3b674..250ce69 100644
--- a/test/test_rdxtree.c
+++ b/test/test_rdxtree.c
@@ -46,7 +46,11 @@ struct obj {
     unsigned long id;
 };
 
-static struct obj * obj_create(unsigned long id)
+static void print_subtree(struct rdxtree_node *node, int height, size_t index,
+                          size_t level);
+
+static struct obj *
+obj_create(unsigned long id)
 {
     struct obj *obj;
 
@@ -56,15 +60,14 @@ static struct obj * obj_create(unsigned long id)
     return obj;
 }
 
-static void obj_destroy(struct obj *obj)
+static void
+obj_destroy(struct obj *obj)
 {
     free(obj);
 }
 
-static void print_subtree(struct rdxtree_node *node, int height, size_t index,
-                          size_t level);
-
-static void print_value(void *ptr, size_t index, size_t level)
+static void
+print_value(void *ptr, size_t index, size_t level)
 {
     struct obj *obj;
     int i;
@@ -80,7 +83,8 @@ static void print_value(void *ptr, size_t index, size_t level)
     printf("%zu:%lu\n", index, obj->id);
 }
 
-static void print_values(struct rdxtree_node *node, size_t index, size_t level)
+static void
+print_values(struct rdxtree_node *node, size_t index, size_t level)
 {
     size_t i;
 
@@ -93,8 +97,8 @@ static void print_values(struct rdxtree_node *node, size_t index, size_t level)
         print_value(node->slots[i], i, level + 1);
 }
 
-static void print_node(struct rdxtree_node *node, int height, size_t index,
-                       size_t level)
+static void
+print_node(struct rdxtree_node *node, int height, size_t index, size_t level)
 {
     size_t i;
 
@@ -107,8 +111,8 @@ static void print_node(struct rdxtree_node *node, int height, size_t index,
         print_subtree(node->slots[i], height - 1, i, level + 1);
 }
 
-static void print_subtree(struct rdxtree_node *node, int height, size_t index,
-                          size_t level)
+static void
+print_subtree(struct rdxtree_node *node, int height, size_t index, size_t level)
 {
     if (node == NULL)
         return;
@@ -119,7 +123,8 @@ static void print_subtree(struct rdxtree_node *node, int height, size_t index,
         print_node(node, height, index, level);
 }
 
-static void print_tree(struct rdxtree *tree)
+static void
+print_tree(struct rdxtree *tree)
 {
     if (tree->height == 0)
         print_value(tree->root, 0, 0);
@@ -127,7 +132,8 @@ static void print_tree(struct rdxtree *tree)
         print_subtree(tree->root, tree->height, 0, 0);
 }
 
-static void destroy_tree(struct rdxtree *tree)
+static void
+destroy_tree(struct rdxtree *tree)
 {
     struct rdxtree_iter iter;
     struct obj *obj;
@@ -138,7 +144,8 @@ static void destroy_tree(struct rdxtree *tree)
     rdxtree_remove_all(tree);
 }
 
-static void test_1(void)
+static void
+test_1(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -154,7 +161,8 @@ static void test_1(void)
     destroy_tree(&tree);
 }
 
-static void test_2(void)
+static void
+test_2(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -170,7 +178,8 @@ static void test_2(void)
     destroy_tree(&tree);
 }
 
-static void test_3(void)
+static void
+test_3(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -189,7 +198,8 @@ static void test_3(void)
     destroy_tree(&tree);
 }
 
-static void test_4(void)
+static void
+test_4(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -208,7 +218,8 @@ static void test_4(void)
     destroy_tree(&tree);
 }
 
-static void test_5(void)
+static void
+test_5(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -227,7 +238,8 @@ static void test_5(void)
     destroy_tree(&tree);
 }
 
-static void test_6(void)
+static void
+test_6(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -246,7 +258,8 @@ static void test_6(void)
     destroy_tree(&tree);
 }
 
-static void test_7(void)
+static void
+test_7(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -265,7 +278,8 @@ static void test_7(void)
     print_tree(&tree);
 }
 
-static void test_8(void)
+static void
+test_8(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -284,7 +298,8 @@ static void test_8(void)
     print_tree(&tree);
 }
 
-static void test_9(void)
+static void
+test_9(void)
 {
     struct rdxtree tree;
     struct obj *obj1, *obj2;
@@ -309,7 +324,8 @@ static void test_9(void)
     print_tree(&tree);
 }
 
-static void test_10(void)
+static void
+test_10(void)
 {
     struct rdxtree tree;
     struct obj *obj1, *obj2;
@@ -334,7 +350,8 @@ static void test_10(void)
     print_tree(&tree);
 }
 
-static void test_11(void)
+static void
+test_11(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -359,7 +376,8 @@ static void test_11(void)
     print_tree(&tree);
 }
 
-static void test_12(void)
+static void
+test_12(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -384,7 +402,8 @@ static void test_12(void)
     print_tree(&tree);
 }
 
-static void test_13(void)
+static void
+test_13(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -405,7 +424,8 @@ static void test_13(void)
     destroy_tree(&tree);
 }
 
-static void test_14(void)
+static void
+test_14(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -429,7 +449,8 @@ static void test_14(void)
     destroy_tree(&tree);
 }
 
-static void test_15(void)
+static void
+test_15(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -454,7 +475,8 @@ static void test_15(void)
     destroy_tree(&tree);
 }
 
-static void test_16(void)
+static void
+test_16(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -479,7 +501,8 @@ static void test_16(void)
     destroy_tree(&tree);
 }
 
-static void test_17(void)
+static void
+test_17(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -516,7 +539,8 @@ static void test_17(void)
     destroy_tree(&tree);
 }
 
-static void test_18(void)
+static void
+test_18(void)
 {
     struct rdxtree tree;
     struct obj *obj;
@@ -540,7 +564,8 @@ static void test_18(void)
     destroy_tree(&tree);
 }
 
-static void test_19(void)
+static void
+test_19(void)
 {
     struct rdxtree tree;
     struct obj *obj1, *obj2, *tmp;
@@ -565,7 +590,8 @@ static void test_19(void)
     destroy_tree(&tree);
 }
 
-static void test_20(void)
+static void
+test_20(void)
 {
     struct rdxtree tree;
     struct obj *obj1, *obj2, *tmp;
@@ -590,7 +616,8 @@ static void test_20(void)
     destroy_tree(&tree);
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     (void)argc;
     (void)argv;
diff --git a/test/test_xprintf.c b/test/test_xprintf.c
index 84a4176..ff157b8 100644
--- a/test/test_xprintf.c
+++ b/test/test_xprintf.c
@@ -43,7 +43,8 @@ MACRO_BEGIN                                             \
     assert(strcmp(stra, strb) == 0);                    \
 MACRO_END
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     (void)argc;
     (void)argv;