From f44ada20b3afbc6642fc5fd2fad8ac7d0ede58b1 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Sat, 2 Oct 2010 18:50:58 +0200
Subject: [PATCH] common/rbtree.c: some cleanup

---
 src/common/rbtree.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/common/rbtree.c b/src/common/rbtree.c
index bc45b3e..896a896 100644
--- a/src/common/rbtree.c
+++ b/src/common/rbtree.c
@@ -37,12 +37,12 @@ static rbnode* node_alloc(uint key, void *ptr, size_t len) {
  */
 static void node_dealloc(rbnode *n, void (*action)(rbnode *)) {
 	
-	if (n == NULL)
+	if (!n)
 		return;
 
-	if (action != NULL) {
+	if (action) {
 		action(n);
-	} else if (n->data != NULL) {
+	} else if (n->data) {
 		xfree(n->data);
         n->data = NULL;
     }
@@ -83,7 +83,7 @@ static rbnode* rbcmp(rbnode *n, void *cmpdata, size_t len) {
 	
 	rbnode *r;
 	
-	if (n == NULL)
+	if (!n)
 		return NULL;
 
     dprint("CMP %s - %s\n", (char*)n->data, (char*)cmpdata);
@@ -134,7 +134,7 @@ rbnode* rbtree_search(rbtree *tree, uint key) {
 	
 	n = tree->root;
 	
-	while(n != NULL) {
+	while(n) {
 		
 		dprint("SEARCH: check %u\n", n->key);
 		
@@ -235,7 +235,7 @@ int rbtree_insert(rbtree *tree, uint key, void *data, size_t len) {
 		last = dir;
 		dir = q->key < key;
 			
-		if (g != NULL)
+		if (g)
 			t = g;
 		g = p, p = q;
 		q = q->child[dir];
@@ -278,7 +278,7 @@ void* rbtree_delete(rbtree *tree, uint key) {
 	
 	/* more dragons (killed some of them though) */
 	
-	while(q->child[dir] != NULL) {
+	while(q->child[dir]) {
 		last = dir;
 		
 		g = p, p = q;
@@ -318,7 +318,7 @@ void* rbtree_delete(rbtree *tree, uint key) {
 	}
 	
 	tree->root = head.child[1];
-	if (tree->root != NULL)
+	if (tree->root)
 		tree->root->color = RB_BLACK;
 	
 	/* remove if found */