From 7d18174be52718790dd8f41ec21c681a407adfdf Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Fri, 9 Dec 2016 00:49:25 +0100
Subject: Force brackets around one-line conditional statements

---
 test/test_avltree.c |  9 ++++++---
 test/test_rbtree.c  |  9 ++++++---
 test/test_rdxtree.c | 28 ++++++++++++++++++----------
 test/test_shell.c   |  3 ++-
 4 files changed, 32 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/test_avltree.c b/test/test_avltree.c
index 395561d..3f11e57 100644
--- a/test/test_avltree.c
+++ b/test/test_avltree.c
@@ -54,13 +54,15 @@ print_subtree(struct avltree_node *node, int level)
     char balance;
     int i;
 
-    if (node == NULL)
+    if (node == NULL) {
         return;
+    }
 
     print_subtree(node->children[AVLTREE_RIGHT], level + 1);
 
-    for (i = level; i > 0; i--)
+    for (i = level; i > 0; i--) {
         putchar(' ');
+    }
 
     obj = avltree_entry(node, struct obj, node);
 
@@ -114,8 +116,9 @@ main(int argc, char *argv[])
         id = get_id(i);
         node = avltree_lookup_slot(&tree, id, obj_cmp_lookup, slot);
 
-        if (node != NULL)
+        if (node != NULL) {
             continue;
+        }
 
         obj = malloc(sizeof(*obj));
         obj->id = id;
diff --git a/test/test_rbtree.c b/test/test_rbtree.c
index 0478a5d..db4b6ca 100644
--- a/test/test_rbtree.c
+++ b/test/test_rbtree.c
@@ -54,13 +54,15 @@ print_subtree(struct rbtree_node *node, int level)
     char color;
     int i;
 
-    if (node == NULL)
+    if (node == NULL) {
         return;
+    }
 
     print_subtree(node->children[RBTREE_RIGHT], level + 1);
 
-    for (i = level; i > 0; i--)
+    for (i = level; i > 0; i--) {
         putchar(' ');
+    }
 
     obj = rbtree_entry(node, struct obj, node);
     color = (node->parent & RBTREE_COLOR_MASK) ? 'b' : 'r';
@@ -99,8 +101,9 @@ main(int argc, char *argv[])
         id = get_id(i);
         node = rbtree_lookup_slot(&tree, id, obj_cmp_lookup, slot);
 
-        if (node != NULL)
+        if (node != NULL) {
             continue;
+        }
 
         obj = malloc(sizeof(*obj));
         obj->id = id;
diff --git a/test/test_rdxtree.c b/test/test_rdxtree.c
index bfe9820..9ed21ac 100644
--- a/test/test_rdxtree.c
+++ b/test/test_rdxtree.c
@@ -71,13 +71,15 @@ print_value(void *ptr, size_t index, size_t level)
     struct obj *obj;
     int i;
 
-    if (ptr == NULL)
+    if (ptr == NULL) {
         return;
+    }
 
     obj = ptr;
 
-    for (i = level; i > 0; i--)
+    for (i = level; i > 0; i--) {
         putchar(' ');
+    }
 
     printf("%zu:%llu\n", index, (unsigned long long)obj->id);
 }
@@ -87,13 +89,15 @@ print_values(struct rdxtree_node *node, size_t index, size_t level)
 {
     size_t i;
 
-    for (i = level; i > 0; i--)
+    for (i = level; i > 0; i--) {
         putchar(' ');
+    }
 
     printf("%zu:n (bm: " BM_FORMAT ")\n", index, node->alloc_bm);
 
-    for (i = 0; i < ARRAY_SIZE(node->entries); i++)
+    for (i = 0; i < ARRAY_SIZE(node->entries); i++) {
         print_value(node->entries[i], i, level + 1);
+    }
 }
 
 static void
@@ -102,8 +106,9 @@ print_node(struct rdxtree_node *node, int height, size_t index, size_t level)
     void *entry;
     size_t i;
 
-    for (i = level; i > 0; i--)
+    for (i = level; i > 0; i--) {
         putchar(' ');
+    }
 
     printf("%zu:n (bm: " BM_FORMAT ")\n", index, node->alloc_bm);
 
@@ -116,13 +121,15 @@ print_node(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)
+    if (node == NULL) {
         return;
+    }
 
-    if (height == 1)
+    if (height == 1) {
         print_values(node, index, level);
-    else
+    } else {
         print_node(node, height, index, level);
+    }
 }
 
 static void
@@ -132,10 +139,11 @@ print_tree(struct rdxtree *tree)
 
     root = rdxtree_entry_addr(tree->root);
 
-    if (tree->height == 0)
+    if (tree->height == 0) {
         print_value(root, 0, 0);
-    else
+    } else {
         print_subtree(root, tree->height, 0, 0);
+    }
 }
 
 static void
diff --git a/test/test_shell.c b/test/test_shell.c
index 866ae5f..c26e545 100644
--- a/test/test_shell.c
+++ b/test/test_shell.c
@@ -99,8 +99,9 @@ main(int argc, char *argv[])
     for (i = 0; i < ARRAY_SIZE(test_shell_cmds); i++) {
         ret = shell_cmd_register(&test_shell_cmds[i]);
 
-        if (ret)
+        if (ret) {
             error_die(ret);
+        }
     }
 
     setbuf(stdin, NULL);
-- 
cgit v1.2.3