X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.h;h=3b4dbb20f733613d703f5d95e6f9cbd439451125;hb=2f2bda4d1953617b945f1222e008cb53edee162a;hp=032acbc5659758ca0a489a3088bbd38c37090b11;hpb=42d2dff33306beae8ddbd9cc991ad80f135950a6;p=tinc diff --git a/src/edge.h b/src/edge.h index 032acbc5..3b4dbb20 100644 --- a/src/edge.h +++ b/src/edge.h @@ -39,14 +39,12 @@ typedef struct edge_t { struct edge_t *reverse; /* edge in the opposite direction, if available */ } edge_t; -extern splay_tree_t *edge_weight_tree; /* Tree with all known edges sorted on weight */ +extern splay_tree_t edge_weight_tree; /* Tree with all known edges sorted on weight */ -extern void init_edges(void); extern void exit_edges(void); -extern edge_t *new_edge(void) __attribute__((__malloc__)); extern void free_edge(edge_t *e); -extern splay_tree_t *new_edge_tree(void) __attribute__((__malloc__)); -extern void free_edge_tree(splay_tree_t *edge_tree); +extern edge_t *new_edge(void) ATTR_MALLOC ATTR_DEALLOCATOR(free_edge); +extern void init_edge_tree(splay_tree_t *tree); extern void edge_add(edge_t *e); extern void edge_del(edge_t *e); extern edge_t *lookup_edge(struct node_t *from, struct node_t *to);