rbtree: drop the data pointer; instead rely on being embedded

Drop the data pointer, and instead assume the struct rbtree will be
embedded in a bigger data structure (to be extracted via
container_of()).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/rbtree.h b/rbtree.h
index 3b45428f..d24daf35 100644
--- a/rbtree.h
+++ b/rbtree.h
@@ -4,15 +4,16 @@
 #include "compiler.h"
 #include <inttypes.h>
 
+/* This structure should be embedded in a larger data structure;
+   the final output from rb_search() can then be converted back
+   to the larger data structure via container_of(). */
 struct rbtree {
     uint64_t key;
-    void *data;
     struct rbtree *left, *right;
     bool red;
 };
 
-struct rbtree *rb_insert(struct rbtree *, uint64_t, void *);
+struct rbtree *rb_insert(struct rbtree *, struct rbtree *);
 const struct rbtree *rb_search(const struct rbtree *, uint64_t);
-void rb_free(struct rbtree *);
 
 #endif /* NASM_RBTREE_H */