aatree: use uintptr_t instead of long for data

diff --git a/usual/aatree.c b/usual/aatree.c
index 29570a3e58d54fadb62b98aaf865b5198c1992ce..81acd696faf26911aa882d2e26b9818fd5957362 100644 (file)
--- a/usual/aatree.c
+++ b/usual/aatree.c
@@ -138,7 +138,7 @@ static Node *rebalance_on_remove(Node *current)
  * Recursive insertion
  */
 
-static Node * insert_sub(Tree *tree, Node *current, long value, Node *node)
+static Node * insert_sub(Tree *tree, Node *current, uintptr_t value, Node *node)
 {
        int cmp;
 
@@ -167,7 +167,7 @@ static Node * insert_sub(Tree *tree, Node *current, long value, Node *node)
        return rebalance_on_insert(current);
 }
 
-void aatree_insert(Tree *tree, long value, Node *node)
+void aatree_insert(Tree *tree, uintptr_t value, Node *node)
 {
        tree->root = insert_sub(tree, tree->root, value, node);
 }
@@ -217,7 +217,7 @@ static Node *drop_this_node(Tree *tree, Node *old)
        return new;
 }
 
-static Node *remove_sub(Tree *tree, Node *current, long value)
+static Node *remove_sub(Tree *tree, Node *current, uintptr_t value)
 {
        int cmp;
 
@@ -236,7 +236,7 @@ static Node *remove_sub(Tree *tree, Node *current, long value)
        return rebalance_on_remove(current);
 }
 
-void aatree_remove(Tree *tree, long value)
+void aatree_remove(Tree *tree, uintptr_t value)
 {
        tree->root = remove_sub(tree, tree->root, value);
 }
@@ -298,7 +298,7 @@ void aatree_init(Tree *tree, aatree_cmp_f cmpfn, aatree_walker_f release_cb)
 /*
  * search function
  */
-Node *aatree_search(Tree *tree, long value)
+Node *aatree_search(Tree *tree, uintptr_t value)
 {
        Node *current = tree->root;
        while (current != NIL) {

diff --git a/usual/aatree.h b/usual/aatree.h
index 23f26bf28585ac704a1dd67e7233db124d0d9f40..2f7bfdbde423de0827e09110d8aa161ea0720409 100644 (file)
--- a/usual/aatree.h
+++ b/usual/aatree.h
@@ -30,7 +30,7 @@ struct AATree;
 struct AANode;
 
 /** Callback for node comparision against value */
-typedef int (*aatree_cmp_f)(long, struct AANode *node);
+typedef int (*aatree_cmp_f)(uintptr_t, struct AANode *node);
 
 /** Callback for walking the tree */
 typedef void (*aatree_walker_f)(struct AANode *n, void *arg);
@@ -73,13 +73,13 @@ enum AATreeWalkType {
 void aatree_init(struct AATree *tree, aatree_cmp_f cmpfn, aatree_walker_f release_cb);
 
 /** Search for node */
-struct AANode *aatree_search(struct AATree *tree, long value);
+struct AANode *aatree_search(struct AATree *tree, uintptr_t value);
 
 /** Insert new node */
-void aatree_insert(struct AATree *tree, long value, struct AANode *node);
+void aatree_insert(struct AATree *tree, uintptr_t value, struct AANode *node);
 
 /** Remote node */
-void aatree_remove(struct AATree *tree, long value);
+void aatree_remove(struct AATree *tree, uintptr_t value);
 
 /** Walk over all nodes */
 void aatree_walk(struct AATree *tree, enum AATreeWalkType wtype, aatree_walker_f walker, void *arg);