X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsplay_tree.h;h=24645fa5fefe74facb5e0879ec76073051685d31;hb=50c62f7235eacd3b88c59ead983e8be719fb7604;hp=d5ab742190db43c1ccffd91d0708ce346559a9f4;hpb=d6c8a1a3d3e945142b251b2897517e10ce0dfce4;p=tinc diff --git a/src/splay_tree.h b/src/splay_tree.h index d5ab7421..24645fa5 100644 --- a/src/splay_tree.h +++ b/src/splay_tree.h @@ -41,7 +41,6 @@ typedef struct splay_node_t { typedef int (*splay_compare_t)(const void *data1, const void *data2); typedef void (*splay_action_t)(const void *data); -typedef void (*splay_action_node_t)(const splay_node_t *node); typedef struct splay_tree_t { @@ -64,10 +63,10 @@ typedef struct splay_tree_t { /* (De)constructors */ -extern splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) __attribute__((__malloc__)); +extern splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) ATTR_MALLOC; extern void splay_free_tree(splay_tree_t *tree); -extern splay_node_t *splay_alloc_node(void) __attribute__((__malloc__)); +extern splay_node_t *splay_alloc_node(void) ATTR_MALLOC; extern void splay_free_node(splay_tree_t *tree, splay_node_t *node); /* Insertion and deletion */ @@ -86,6 +85,7 @@ extern void splay_delete_node(splay_tree_t *tree, splay_node_t *node); /* Fast tree cleanup */ +extern void splay_empty_tree(splay_tree_t *tree); extern void splay_delete_tree(splay_tree_t *tree); /* Searching */