X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fsplay_tree.h;h=ca53dc37c89d4cda66c3488e8b78340b893bbcf2;hp=8367ce71f7e3b210203693977029c911fb3db22b;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=1f8b70efa0dedbd3642e0ee82a640d125664af34 diff --git a/src/splay_tree.h b/src/splay_tree.h index 8367ce71..ca53dc37 100644 --- a/src/splay_tree.h +++ b/src/splay_tree.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_SPLAY_TREE_H +#define MESHLINK_SPLAY_TREE_H + /* splay_tree.h -- header file for splay_tree.c - Copyright (C) 2004-2012 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef __SPLAY_TREE_H__ -#define __SPLAY_TREE_H__ - typedef struct splay_node_t { /* Linked list part */ @@ -58,16 +57,16 @@ typedef struct splay_tree_t { splay_compare_t compare; splay_action_t delete; - int count; + unsigned int count; } splay_tree_t; /* (De)constructors */ -extern splay_tree_t *splay_alloc_tree(splay_compare_t, splay_action_t); -extern void splay_free_tree(splay_tree_t *); +extern splay_tree_t *splay_alloc_tree(splay_compare_t, splay_action_t) __attribute__((__malloc__)); +extern void splay_delete_tree(splay_tree_t *); -extern splay_node_t *splay_alloc_node(void); +extern splay_node_t *splay_alloc_node(void) __attribute__((__malloc__)); extern void splay_free_node(splay_tree_t *tree, splay_node_t *); /* Insertion and deletion */ @@ -75,19 +74,11 @@ extern void splay_free_node(splay_tree_t *tree, splay_node_t *); extern splay_node_t *splay_insert(splay_tree_t *, void *); extern splay_node_t *splay_insert_node(splay_tree_t *, splay_node_t *); -extern void splay_insert_top(splay_tree_t *, splay_node_t *); -extern void splay_insert_before(splay_tree_t *, splay_node_t *, splay_node_t *); -extern void splay_insert_after(splay_tree_t *, splay_node_t *, splay_node_t *); - extern splay_node_t *splay_unlink(splay_tree_t *, void *); extern void splay_unlink_node(splay_tree_t *tree, splay_node_t *); extern void splay_delete(splay_tree_t *, void *); extern void splay_delete_node(splay_tree_t *, splay_node_t *); -/* Fast tree cleanup */ - -extern void splay_delete_tree(splay_tree_t *); - /* Searching */ extern void *splay_search(splay_tree_t *, const void *);