From d4c648197db2b8fdbc0fdc9583a8f7c58e019c4c Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 14 Aug 2018 21:02:59 +0000 Subject: Remove avl*_deletenode() macros, document all added functions --- src/include/skalibs/avlnode.h | 1 - src/include/skalibs/avltree.h | 1 - src/include/skalibs/avltreen.h | 2 -- 3 files changed, 4 deletions(-) (limited to 'src/include') diff --git a/src/include/skalibs/avlnode.h b/src/include/skalibs/avlnode.h index 69e507b..554a185 100644 --- a/src/include/skalibs/avlnode.h +++ b/src/include/skalibs/avlnode.h @@ -38,7 +38,6 @@ extern int avlnode_extreme (avlnode const *, uint32_t, uint32_t, int, uint32_t * extern uint32_t avlnode_insertnode (avlnode *, uint32_t, uint32_t, uint32_t, dtokfunc_t_ref, cmpfunc_t_ref, void *) ; extern uint32_t avlnode_delete (avlnode *, uint32_t, uint32_t *, void const *, dtokfunc_t_ref, cmpfunc_t_ref, void *) ; -#define avlnode_deletenode(s, max, r, i, dtok, f, p) avlnode_delete(s, max, r, (*(dtok))((s)[i].data), dtok, f, p) extern uint32_t avlnode_iter_nocancel (avlnode *, uint32_t, uint32_t, uint32_t, avliterfunc_t_ref, void *) ; #define avlnode_iter(tree, max, root, f, stuff) (avlnode_iter_nocancel(tree, max, max, root, f, stuff) == (max)) diff --git a/src/include/skalibs/avltree.h b/src/include/skalibs/avltree.h index 8234d95..fe8be43 100644 --- a/src/include/skalibs/avltree.h +++ b/src/include/skalibs/avltree.h @@ -48,7 +48,6 @@ extern int avltree_newnode (avltree *, uint32_t, uint32_t *) ; #define avltree_insertnode(t, i) avltree_setroot(t, avlnode_insertnode(avltree_nodes(t), avltree_totalsize(t), avltree_root(t), i, (t)->dtok, (t)->kcmp, (t)->external)) extern int avltree_insert (avltree *, uint32_t) ; -#define avltree_deletenode(t, i) avltree_delete(t, (*(t)->dtok)(avltree_data(t, i),(t)->external)) extern int avltree_delete (avltree *, void const *) ; #define avltree_iter(t, f, p) avlnode_iter(avltree_nodes(t), avltree_totalsize(t), avltree_root(t), f, p) diff --git a/src/include/skalibs/avltreen.h b/src/include/skalibs/avltreen.h index 09ef480..c8af35e 100644 --- a/src/include/skalibs/avltreen.h +++ b/src/include/skalibs/avltreen.h @@ -47,7 +47,6 @@ extern uint32_t avltreen_newnode (avltreen *, uint32_t) ; #define avltreen_insertnode(t, i) avltreen_setroot(t, avlnode_insertnode(avltreen_nodes(t), avltreen_totalsize(t), avltreen_root(t), i, (t)->dtok, (t)->kcmp, (t)->external)) extern int avltreen_insert (avltreen *, uint32_t) ; -#define avltreen_deletenode(t, i) avltreen_delete(t, avltreen_data(t, i)) extern int avltreen_delete (avltreen *, void const *) ; #define avltreen_iter(t, f, p) avlnode_iter(avltreen_nodes(t), avltreen_totalsize(t), avltreen_root(t), f, p) @@ -82,7 +81,6 @@ extern int avltreen_delete (avltreen *, void const *) ; #define avltreeb_insertnode(t, i) avltreeb_setroot(t, avlnode_insertnode(avltreeb_nodes(t), avltreeb_totalsize(t), avltreeb_root(t), (i), (t)->info.dtok, (t)->info.kcmp, (t)->info.external)) #define avltreeb_insert(t, d) avltreen_insert(&(t)->info, d) -#define avltreeb_deletenode(t, i) avltreeb_delete(t, avltreeb_data(t, i)) #define avltreeb_delete(t, k) avltreen_delete(&(t)->info, k) #define avltreeb_iter(t, f, p) avlnode_iter(avltreeb_nodes(t), avltreeb_totalsize(t), avltreeb_root(t), f, p) -- cgit v1.2.3