X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.c;h=861b94538111041e53ab75f83ce6c188f584eeae;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=97a57a6497b974a20a1ad4789e6e8b6b6b28f6e7;hpb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;p=meshlink

diff --git a/src/edge.c b/src/edge.c
index 97a57a64..861b9453 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -30,7 +30,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
+splay_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
 
 static int edge_compare(const edge_t *a, const edge_t *b) {
 	return strcmp(a->to->name, b->to->name);
@@ -55,25 +55,25 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 void init_edges(void) {
 	cp();
 
-	edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
+	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
-avl_tree_t *new_edge_tree(void) {
+splay_tree_t *new_edge_tree(void) {
 	cp();
 
-	return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
+	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
-void free_edge_tree(avl_tree_t *edge_tree) {
+void free_edge_tree(splay_tree_t *edge_tree) {
 	cp();
 
-	avl_delete_tree(edge_tree);
+	splay_delete_tree(edge_tree);
 }
 
 void exit_edges(void) {
 	cp();
 
-	avl_delete_tree(edge_weight_tree);
+	splay_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
@@ -95,8 +95,8 @@ void free_edge(edge_t *e) {
 void edge_add(edge_t *e) {
 	cp();
 
-	avl_insert(edge_weight_tree, e);
-	avl_insert(e->from->edge_tree, e);
+	splay_insert(edge_weight_tree, e);
+	splay_insert(e->from->edge_tree, e);
 
 	e->reverse = lookup_edge(e->to, e->from);
 
@@ -110,8 +110,8 @@ void edge_del(edge_t *e) {
 	if(e->reverse)
 		e->reverse->reverse = NULL;
 
-	avl_delete(edge_weight_tree, e);
-	avl_delete(e->from->edge_tree, e);
+	splay_delete(edge_weight_tree, e);
+	splay_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
@@ -122,11 +122,11 @@ edge_t *lookup_edge(node_t *from, node_t *to) {
 	v.from = from;
 	v.to = to;
 
-	return avl_search(from->edge_tree, &v);
+	return splay_search(from->edge_tree, &v);
 }
 
 void dump_edges(void) {
-	avl_node_t *node, *node2;
+	splay_node_t *node, *node2;
 	node_t *n;
 	edge_t *e;
 	char *address;