GitHub CI: update list of container images

[tinc] / src / edge.h

diff --git a/src/edge.h b/src/edge.h
index 687c8ec..3b4dbb2 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -39,17 +39,15 @@ 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 *);
-extern splay_tree_t *new_edge_tree(void) __attribute__((__malloc__));
-extern void free_edge_tree(splay_tree_t *);
-extern void edge_add(edge_t *);
-extern void edge_del(edge_t *);
-extern edge_t *lookup_edge(struct node_t *, struct node_t *);
-extern bool dump_edges(struct connection_t *);
+extern void free_edge(edge_t *e);
+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);
+extern bool dump_edges(struct connection_t *c);
 
 #endif