X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.c;h=afe9cfe325ad19bc82d33fe7f9e796fb794285a7;hb=902446edf822a32383c4fa4b7c13b83a568095ad;hp=efb90dfeaaffd49b3f9262b8354384bafb1cd21a;hpb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;p=meshlink diff --git a/src/edge.c b/src/edge.c index efb90dfe..afe9cfe3 100644 --- a/src/edge.c +++ b/src/edge.c @@ -37,13 +37,15 @@ 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); } @@ -61,8 +63,10 @@ void free_edge_tree(splay_tree_t *edge_tree) { } void exit_edges(meshlink_handle_t *mesh) { - if(mesh->edges) + if(mesh->edges) { splay_delete_tree(mesh->edges); + } + mesh->edges = NULL; } @@ -84,19 +88,24 @@ void edge_add(meshlink_handle_t *mesh, edge_t *e) { e->reverse = lookup_edge(e->to, e->from); - if(e->reverse) + if(e->reverse) { e->reverse->reverse = e; + } } void edge_del(meshlink_handle_t *mesh, edge_t *e) { - if(e->reverse) + 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;