X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsplay_tree.c;h=166e5ee68f1405dd96b37566ad9e2b5d41805dd9;hp=3a792e8badb6bfc0ea669fd5a497a7bfdc62ad15;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564

diff --git a/src/splay_tree.c b/src/splay_tree.c
index 3a792e8b..166e5ee6 100644
--- a/src/splay_tree.c
+++ b/src/splay_tree.c
@@ -25,7 +25,7 @@
 /* Splay operation */
 
 static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *result) {
-	splay_node_t left = {0}, right = {0};
+	splay_node_t left = {NULL}, right = {NULL};
 	splay_node_t *leftbottom = &left, *rightbottom = &right, *child, *grandchild;
 	splay_node_t *root = tree->root;
 	int c;
@@ -44,10 +44,10 @@ static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
 				rightbottom->left = child;
 				child->parent = rightbottom;
 				rightbottom = child;
-				
+
 				if((root->left = child->right))
 					child->right->parent = root;
-				
+
 				child->right = root;
 				root->parent = child;
 
@@ -74,7 +74,7 @@ static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
 				rightbottom->left = root;
 				root->parent = rightbottom;
 				rightbottom = root;
-				
+
 				root->left = NULL;
 				child->parent = NULL;
 
@@ -88,10 +88,10 @@ static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
 				leftbottom->right = child;
 				child->parent = leftbottom;
 				leftbottom = child;
-				
+
 				if((root->right = child->left))
 					child->left->parent = root;
-				
+
 				child->left = root;
 				root->parent = child;
 
@@ -158,14 +158,14 @@ static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *r
 
 	return tree->root;
 }
-			
+
 static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
 	splay_node_t *parent, *grandparent, *greatgrandparent;
 
 	while((parent = node->parent)) {
 		if(!(grandparent = parent->parent)) { /* zig */
 			if(node == parent->left) {
-				if((parent->left = node->right))				
+				if((parent->left = node->right))
 					parent->left->parent = parent;
 				node->right = parent;
 			} else {
@@ -326,7 +326,7 @@ splay_node_t *splay_search_closest_node_nosplay(const splay_tree_t *tree, const
 		} else if(c > 0) {
 			if(node->right)
 				node = node->right;
-			else 
+			else
 				break;
 		} else {
 			break;
@@ -384,12 +384,12 @@ splay_node_t *splay_insert(splay_tree_t *tree, void *data) {
 
 		new = splay_alloc_node();
 		new->data = data;
-		
+
 		if(result < 0)
 			splay_insert_before(tree, closest, new);
 		else
 			splay_insert_after(tree, closest, new);
-	}			
+	}
 
 	return new;
 }
@@ -402,7 +402,7 @@ splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
 		splay_insert_top(tree, node);
 	else {
 		closest = splay_search_closest_node(tree, node->data, &result);
-		
+
 		if(!result)
 			return NULL;
 
@@ -530,9 +530,7 @@ void splay_delete(splay_tree_t *tree, void *data) {
 /* Fast tree cleanup */
 
 void splay_delete_tree(splay_tree_t *tree) {
-	splay_node_t *node, *next;
-
-	for(node = tree->head; node; node = next) {
+	for(splay_node_t *node = tree->head, *next; node; node = next) {
 		next = node->next;
 		splay_free_node(tree, node);
 	}
@@ -543,18 +541,14 @@ void splay_delete_tree(splay_tree_t *tree) {
 /* Tree walking */
 
 void splay_foreach(const splay_tree_t *tree, splay_action_t action) {
-	splay_node_t *node, *next;
-
-	for(node = tree->head; node; node = next) {
+	for(splay_node_t *node = tree->head, *next; node; node = next) {
 		next = node->next;
 		action(node->data);
 	}
 }
 
 void splay_foreach_node(const splay_tree_t *tree, splay_action_t action) {
-	splay_node_t *node, *next;
-
-	for(node = tree->head; node; node = next) {
+	for(splay_node_t *node = tree->head, *next; node; node = next) {
 		next = node->next;
 		action(node);
 	}