projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variables, fix some #includes.
[tinc]
/
src
/
splay_tree.c
diff --git
a/src/splay_tree.c
b/src/splay_tree.c
index
3a792e8
..
a1dd4a1
100644
(file)
--- 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 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;
splay_node_t *leftbottom = &left, *rightbottom = &right, *child, *grandchild;
splay_node_t *root = tree->root;
int c;
@@
-530,9
+530,7
@@
void splay_delete(splay_tree_t *tree, void *data) {
/* Fast tree cleanup */
void splay_delete_tree(splay_tree_t *tree) {
/* 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);
}
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) {
/* 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) {
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);
}
next = node->next;
action(node);
}