X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fsplay_tree.h;h=ca53dc37c89d4cda66c3488e8b78340b893bbcf2;hp=e4af0c4ffc1653c6b902eb8fa3ecf7e83e08d37a;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef diff --git a/src/splay_tree.h b/src/splay_tree.h index e4af0c4f..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-2006 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,14 +57,16 @@ typedef struct splay_tree_t { splay_compare_t compare; splay_action_t delete; + 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 */ @@ -73,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 *); @@ -104,4 +97,6 @@ extern splay_node_t *splay_search_closest_greater_node(splay_tree_t *, const voi extern void splay_foreach(const splay_tree_t *, splay_action_t); extern void splay_foreach_node(const splay_tree_t *, splay_action_t); +#define splay_each(type, item, tree) (type *item = (type *)1; item; item = NULL) for(splay_node_t *node = (tree)->head, *next; item = node ? node->data : NULL, next = node ? node->next : NULL, node; node = next) + #endif