X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_anytree_oset.h;h=c0a0a2f9efb166bc0b68e3b9e0b074a8587cb94d;hb=f2607506fe9fc95dd5d5ea67fd91035b1c62302a;hp=bbcd7a40e544d4d80e9816c1536710768e5c5983;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/lib/gl_anytree_oset.h b/lib/gl_anytree_oset.h
index bbcd7a40e..c0a0a2f9e 100644
--- a/lib/gl_anytree_oset.h
+++ b/lib/gl_anytree_oset.h
@@ -1,5 +1,5 @@
 /* Ordered set data type implemented by a binary tree.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,11 +28,15 @@ typedef struct
 typedef iterstack_item_t iterstack_t[MAXHEIGHT];
 
 static gl_oset_t
-gl_tree_create_empty (gl_oset_implementation_t implementation,
-                      gl_setelement_compar_fn compar_fn,
-                      gl_setelement_dispose_fn dispose_fn)
+gl_tree_nx_create_empty (gl_oset_implementation_t implementation,
+                         gl_setelement_compar_fn compar_fn,
+                         gl_setelement_dispose_fn dispose_fn)
 {
-  struct gl_oset_impl *set = XMALLOC (struct gl_oset_impl);
+  struct gl_oset_impl *set =
+    (struct gl_oset_impl *) malloc (sizeof (struct gl_oset_impl));
+
+  if (set == NULL)
+    return NULL;
 
   set->base.vtable = implementation;
   set->base.compar_fn = compar_fn;
@@ -132,15 +136,16 @@ gl_tree_search_node (gl_oset_t set, const void *elt)
   return NULL;
 }
 
-static bool
-gl_tree_add (gl_oset_t set, const void *elt)
+static int
+gl_tree_nx_add (gl_oset_t set, const void *elt)
 {
   gl_setelement_compar_fn compar;
   gl_oset_node_t node = set->root;
 
   if (node == NULL)
     {
-      gl_tree_add_first (set, elt);
+      if (gl_tree_nx_add_first (set, elt) == NULL)
+        return -1;
       return true;
     }
 
@@ -157,7 +162,8 @@ gl_tree_add (gl_oset_t set, const void *elt)
         {
           if (node->right == NULL)
             {
-              gl_tree_add_after (set, node, elt);
+              if (gl_tree_nx_add_after (set, node, elt) == NULL)
+                return -1;
               return true;
             }
           node = node->right;
@@ -166,7 +172,8 @@ gl_tree_add (gl_oset_t set, const void *elt)
         {
           if (node->left == NULL)
             {
-              gl_tree_add_before (set, node, elt);
+              if (gl_tree_nx_add_before (set, node, elt) == NULL)
+                return -1;
               return true;
             }
           node = node->left;