X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=97a57a6497b974a20a1ad4789e6e8b6b6b28f6e7;hp=99ec1415e83a1080911d86b387b08d2d3774acad;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hpb=760dd966efe7dbff316a8c638e40dee162848256 diff --git a/src/edge.c b/src/edge.c index 99ec1415..97a57a64 100644 --- a/src/edge.c +++ b/src/edge.c @@ -32,13 +32,11 @@ avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */ -static int edge_compare(const edge_t *a, const edge_t *b) -{ +static int edge_compare(const edge_t *a, const edge_t *b) { return strcmp(a->to->name, b->to->name); } -static int edge_weight_compare(const edge_t *a, const edge_t *b) -{ +static int edge_weight_compare(const edge_t *a, const edge_t *b) { int result; result = a->weight - b->weight; @@ -54,29 +52,25 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) return strcmp(a->to->name, b->to->name); } -void init_edges(void) -{ +void init_edges(void) { cp(); edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL); } -avl_tree_t *new_edge_tree(void) -{ +avl_tree_t *new_edge_tree(void) { cp(); return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge); } -void free_edge_tree(avl_tree_t *edge_tree) -{ +void free_edge_tree(avl_tree_t *edge_tree) { cp(); avl_delete_tree(edge_tree); } -void exit_edges(void) -{ +void exit_edges(void) { cp(); avl_delete_tree(edge_weight_tree); @@ -84,15 +78,13 @@ void exit_edges(void) /* Creation and deletion of connection elements */ -edge_t *new_edge(void) -{ +edge_t *new_edge(void) { cp(); return xmalloc_and_zero(sizeof(edge_t)); } -void free_edge(edge_t *e) -{ +void free_edge(edge_t *e) { cp(); sockaddrfree(&e->address); @@ -100,8 +92,7 @@ void free_edge(edge_t *e) free(e); } -void edge_add(edge_t *e) -{ +void edge_add(edge_t *e) { cp(); avl_insert(edge_weight_tree, e); @@ -113,8 +104,7 @@ void edge_add(edge_t *e) e->reverse->reverse = e; } -void edge_del(edge_t *e) -{ +void edge_del(edge_t *e) { cp(); if(e->reverse) @@ -124,8 +114,7 @@ void edge_del(edge_t *e) avl_delete(e->from->edge_tree, e); } -edge_t *lookup_edge(node_t *from, node_t *to) -{ +edge_t *lookup_edge(node_t *from, node_t *to) { edge_t v; cp(); @@ -136,8 +125,7 @@ edge_t *lookup_edge(node_t *from, node_t *to) return avl_search(from->edge_tree, &v); } -void dump_edges(void) -{ +void dump_edges(void) { avl_node_t *node, *node2; node_t *n; edge_t *e;