Changeset 609 for branches/GNU/src/binutils/libiberty/splay-tree.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/libiberty/splay-tree.c (modified) (10 diffs, 1 prop)

branches/GNU/src/binutils/libiberty/splay-tree.c

@@ -1 +1 @@
 /* A splay-tree datatype.  
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Contributed by Mark Mitchell ([email protected]).
 
@@ -71 +71 @@
     (*sp->delete_value)(node->value);
 
-  free ((char*) node);
+  );
 }
 
@@ -228 +228 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* Allocate a new splay tree, using COMPARE_FN to compare nodes,
    DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
-   values.  */
+   values.  Use xmalloc to allocate the splay tree structure, and any
+   nodes added.  */
 
 splay_tree 
@@ -238 +258 @@
      splay_tree_delete_value_fn delete_value_fn;
 {
-  splay_tree sp = (splay_tree) xmalloc (sizeof (struct splay_tree_s));
+  return (splay_tree_new_with_allocator
+          (compare_fn, delete_key_fn, delete_value_fn,
+           splay_tree_xmalloc_allocate, splay_tree_xmalloc_deallocate, 0));
+}
+
+
+/* Allocate a new splay tree, using COMPARE_FN to compare nodes,
+   DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
+   values.  */
+
+splay_tree 
+splay_tree_new_with_allocator (compare_fn, delete_key_fn, delete_value_fn,
+                               allocate_fn, deallocate_fn, allocate_data)
+     splay_tree_compare_fn compare_fn;
+     splay_tree_delete_key_fn delete_key_fn;
+     splay_tree_delete_value_fn delete_value_fn;
+     splay_tree_allocate_fn allocate_fn;
+     splay_tree_deallocate_fn deallocate_fn;
+     void *allocate_data;
+{
+  splay_tree sp = (splay_tree) (*allocate_fn) (sizeof (struct splay_tree_s),
+                                               allocate_data);
   sp->root = 0;
   sp->comp = compare_fn;
   sp->delete_key = delete_key_fn;
   sp->delete_value = delete_value_fn;
+
+
+
 
   return sp;
@@ -254 +298 @@
 {
   splay_tree_delete_helper (sp, sp->root);
-  free ((char*) sp);
+  );
 }
 
@@ -287 +331 @@
       splay_tree_node node;
       
-      node = (splay_tree_node) xmalloc (sizeof (struct splay_tree_node_s));
+      node = ((splay_tree_node)
+              (*sp->allocate) (sizeof (struct splay_tree_node_s),
+                               sp->allocate_data));
       node->key = key;
       node->value = value;
@@ -331 +377 @@
       if (sp->delete_value)
         (*sp->delete_value) (sp->root->value);
-      free (sp->root);
+      );
 
       /* One of the children is now the root.  Doesn't matter much
@@ -369 +415 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* Return the immediate predecessor KEY, or NULL if there is no
    predecessor.  KEY need not be present in the tree.  */
@@ -403 +483 @@
 
 /* Return the immediate successor KEY, or NULL if there is no
-   predecessor.  KEY need not be present in the tree.  */
+   cessor.  KEY need not be present in the tree.  */
 
 splay_tree_node
@@ -413 +493 @@
   splay_tree_node node;
 
-  /* If the tree is empty, there is certainly no predecessor.  */
+  /* If the tree is empty, there is certainly no cessor.  */
   if (!sp->root)
     return NULL;