X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hp=d3dbf78e90200c9c5994dfccf0adf9ab65f4701a;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hpb=a7ef599e6bdd8730c5a949d4c1727c38d5b6ff9e

diff --git a/src/edge.c b/src/edge.c
index d3dbf78e..afe9cfe3 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -37,18 +37,20 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 
 	result = a->weight - b->weight;
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
 	result = strcmp(a->from->name, b->from->name);
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
 	return strcmp(a->to->name, b->to->name);
 }
 
-void init_edges(void) {
+void init_edges(meshlink_handle_t *mesh) {
 	mesh->edges = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
@@ -60,8 +62,12 @@ void free_edge_tree(splay_tree_t *edge_tree) {
 	splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void) {
-	splay_delete_tree(mesh->edges);
+void exit_edges(meshlink_handle_t *mesh) {
+	if(mesh->edges) {
+		splay_delete_tree(mesh->edges);
+	}
+
+	mesh->edges = NULL;
 }
 
 /* Creation and deletion of connection elements */
@@ -76,25 +82,30 @@ void free_edge(edge_t *e) {
 	free(e);
 }
 
-void edge_add(edge_t *e) {
+void edge_add(meshlink_handle_t *mesh, edge_t *e) {
 	splay_insert(mesh->edges, e);
 	splay_insert(e->from->edge_tree, e);
 
 	e->reverse = lookup_edge(e->to, e->from);
 
-	if(e->reverse)
+	if(e->reverse) {
 		e->reverse->reverse = e;
+	}
 }
 
-void edge_del(edge_t *e) {
-	if(e->reverse)
+void edge_del(meshlink_handle_t *mesh, edge_t *e) {
+	if(e->reverse) {
 		e->reverse->reverse = NULL;
+	}
 
 	splay_delete(mesh->edges, e);
 	splay_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
+	assert(from);
+	assert(to);
+
 	edge_t v;
 
 	v.from = from;