archive/archived
Archived
1
0
Fork 0
Code Activity

rbtree.h: get rid of update_fn, we don't use it.

Browse source
This commit is contained in:
Henrik Hautakoski 2011-02-01 10:29:01 +01:00
parent 442e912835
commit 7dcfd815ee
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/technical/rbtree.txt
View file

@ -28,12 +28,6 @@ Structure that holds a tree of nodes
`delete_fn`:: `delete_fn`::
Pointer to the function that should handle the delete routines for the `key` pointer. Pointer to the function that should handle the delete routines for the `key` pointer.
`update_fn`::
Pointer to the function that is called when the implementation performs an update of an `key` pointer. +
The function gets the following information passed in order: old pointer, new pointer.
NOTE: You may only need this if you store the data in another structure and has to keep it synchronized with the RB-tree.
`cmp_fn`:: `cmp_fn`::
Pointer to the function that is used to compare two `key` pointers. + Pointer to the function that is used to compare two `key` pointers. +
Shall return a value greater than zero if 'ptr1' > 'ptr2', a value less than zero if 'ptr1' < 'ptr2' and zero if 'ptr1' == 'ptr2'. Shall return a value greater than zero if 'ptr1' > 'ptr2', a value less than zero if 'ptr1' < 'ptr2' and zero if 'ptr1' == 'ptr2'.
@ -45,7 +39,7 @@ Functions
`rbtree_insert()`:: `rbtree_insert()`::
Creates and inserts a new node in the tree. + Creates and inserts a new node in the tree. +
If provided, calls `rbtree->update_fn` and `rbtree->delete_fn` if a node should be updated. + If provided, calls `rbtree->delete_fn` if a node should be updated. +
Returns nonzero if a new node was inserted or updated, zero otherwise. Returns nonzero if a new node was inserted or updated, zero otherwise.
NOTE: The memory pointed to by the 'key' pointer is *not* copied so you must ensure that it has a infinite lifetime. NOTE: The memory pointed to by the 'key' pointer is *not* copied so you must ensure that it has a infinite lifetime.

3
src/rbtree.h
View file

@ -17,11 +17,10 @@ typedef struct {
struct _rbn *root; struct _rbn *root;
/* user defined operations */ /* user defined operations */
void (*delete_fn)(void *); void (*delete_fn)(void *);
void (*update_fn)(void *, void *);
int (*cmp_fn)(const void *, const void *); int (*cmp_fn)(const void *, const void *);
} rbtree; } rbtree;
#define RBTREE_INIT(delete, update, cmp) { NULL, delete, update, cmp} #define RBTREE_INIT(delete, update, cmp) { NULL, delete, cmp}
int rbtree_is_empty(rbtree *tree); int rbtree_is_empty(rbtree *tree);