X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_rbtree_oset.c;h=936709d5825877996c01a4a6ab551cf30170e39f;hb=5d0b385594bc914e6233988bfb6bc1b92a2184b5;hp=2ca4fbccdaf7e3410b0a3563688c8203fac8f7d9;hpb=d96695ef5092764e7839ecc3644276f4c324ba6b;p=gnulib.git

diff --git a/lib/gl_rbtree_oset.c b/lib/gl_rbtree_oset.c
index 2ca4fbccd..936709d58 100644
--- a/lib/gl_rbtree_oset.c
+++ b/lib/gl_rbtree_oset.c
@@ -1,5 +1,5 @@
 /* Ordered set data type implemented by a binary tree.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "gl_rbtree_oset.h"
@@ -544,8 +542,7 @@ static gl_oset_node_t
 gl_tree_add_first (gl_oset_t set, const void *elt)
 {
   /* Create new node.  */
-  gl_oset_node_t new_node =
-    (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+  gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
 
   new_node->left = NULL;
   new_node->right = NULL;
@@ -580,8 +577,7 @@ static gl_oset_node_t
 gl_tree_add_before (gl_oset_t set, gl_oset_node_t node, const void *elt)
 {
   /* Create new node.  */
-  gl_oset_node_t new_node =
-    (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+  gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
 
   new_node->left = NULL;
   new_node->right = NULL;
@@ -609,8 +605,7 @@ static gl_oset_node_t
 gl_tree_add_after (gl_oset_t set, gl_oset_node_t node, const void *elt)
 {
   /* Create new node.  */
-  gl_oset_node_t new_node =
-    (struct gl_oset_node_impl *) xmalloc (sizeof (struct gl_oset_node_impl));
+  gl_oset_node_t new_node = XMALLOC (struct gl_oset_node_impl);
 
   new_node->left = NULL;
   new_node->right = NULL;
@@ -754,6 +749,8 @@ gl_tree_remove_node (gl_oset_t set, gl_oset_node_t node)
     }
 
   set->count--;
+  if (set->base.dispose_fn != NULL)
+    set->base.dispose_fn (node->value);
   free (node);
   return true;
 }
@@ -798,6 +795,7 @@ const struct gl_oset_implementation gl_rbtree_oset_implementation =
     gl_tree_create_empty,
     gl_tree_size,
     gl_tree_search,
+    gl_tree_search_atleast,
     gl_tree_add,
     gl_tree_remove,
     gl_tree_oset_free,