X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_rbtree_list.c;h=ba1c271212e96c325d7a62c22c035e37292c3f44;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=e584702c5b47d9f85ed13025e1115c62ae3063ec;hpb=a562f3635a01ccc315d964f115b7c256a94a44b6;p=gnulib.git

diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c
index e584702c5..ba1c27121 100644
--- a/lib/gl_rbtree_list.c
+++ b/lib/gl_rbtree_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a binary tree.
-   Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,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.  */
@@ -67,22 +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_set_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,
@@ -95,6 +97,6 @@ const struct gl_list_implementation gl_rbtree_list_implementation =
     gl_tree_sortedlist_search_from_to,
     gl_tree_sortedlist_indexof,
     gl_tree_sortedlist_indexof_from_to,
-    gl_tree_sortedlist_add,
+    gl_tree_sortedlist_nx_add,
     gl_tree_sortedlist_remove
   };