X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_rbtree_list.c;h=9836b1c28e0a53beba7411f676633213d5a5f136;hb=4596125141aeea905bd7ed1a8768f11db7402e41;hp=3d77827fa8a7d17591f50f814c976f42947d5b31;hpb=407400d9367b16a628b57b2d9b8565bb5a08ffae;p=gnulib.git

diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c
index 3d77827fa..9836b1c28 100644
--- a/lib/gl_rbtree_list.c
+++ b/lib/gl_rbtree_list.c
@@ -1,11 +1,11 @@
 /* Sequential list data type implemented by a binary tree.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-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
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -23,16 +22,18 @@
 
 #include <stdlib.h>
 
-#include "xalloc.h"
-
 /* -------------------------- gl_list_t Data Type -------------------------- */
 
 /* Generic red-black tree code.  */
 #include "gl_anyrbtree_list1.h"
-#include "gl_anyrbtree_list2.h"
 
 /* Generic binary tree code.  */
 #include "gl_anytree_list1.h"
+
+/* Generic red-black tree code.  */
+#include "gl_anyrbtree_list2.h"
+
+/* Generic binary tree code.  */
 #include "gl_anytree_list2.h"
 
 /* For debugging.  */
@@ -47,8 +48,8 @@ check_invariants (gl_list_node_t node, gl_list_node_t parent)
   if (!(node->parent == parent))
     abort ();
   if (!(node->branch_size
-	== (node->left != NULL ? node->left->branch_size : 0)
-	   + 1 + (node->right != NULL ? node->right->branch_size : 0)))
+        == (node->left != NULL ? node->left->branch_size : 0)
+           + 1 + (node->right != NULL ? node->right->branch_size : 0)))
     abort ();
   if (!(node->color == BLACK || node->color == RED))
     abort ();
@@ -68,21 +69,22 @@ gl_rbtree_list_check_invariants (gl_list_t list)
 
 const struct gl_list_implementation gl_rbtree_list_implementation =
   {
-    gl_tree_create_empty,
-    gl_tree_create,
+    gl_tree_nx_create_empty,
+    gl_tree_nx_create,
     gl_tree_size,
     gl_tree_node_value,
+    gl_tree_node_nx_set_value,
     gl_tree_next_node,
     gl_tree_previous_node,
     gl_tree_get_at,
-    gl_tree_set_at,
+    gl_tree_nx_set_at,
     gl_tree_search_from_to,
     gl_tree_indexof_from_to,
-    gl_tree_add_first,
-    gl_tree_add_last,
-    gl_tree_add_before,
-    gl_tree_add_after,
-    gl_tree_add_at,
+    gl_tree_nx_add_first,
+    gl_tree_nx_add_last,
+    gl_tree_nx_add_before,
+    gl_tree_nx_add_after,
+    gl_tree_nx_add_at,
     gl_tree_remove_node,
     gl_tree_remove_at,
     gl_tree_remove,
@@ -92,7 +94,9 @@ const struct gl_list_implementation gl_rbtree_list_implementation =
     gl_tree_iterator_next,
     gl_tree_iterator_free,
     gl_tree_sortedlist_search,
+    gl_tree_sortedlist_search_from_to,
     gl_tree_sortedlist_indexof,
-    gl_tree_sortedlist_add,
+    gl_tree_sortedlist_indexof_from_to,
+    gl_tree_sortedlist_nx_add,
     gl_tree_sortedlist_remove
   };