X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_avltree_list.c;h=415167204ec39a93b4a1aa4ee031456377fe01ac;hb=fb6aa6ad7dd950729f4e3349d89d4ad82761af61;hp=ff74513d67ec468e9a8433503c53f19dc74a52f3;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/gl_avltree_list.c b/lib/gl_avltree_list.c
index ff74513d6..415167204 100644
--- a/lib/gl_avltree_list.c
+++ b/lib/gl_avltree_list.c
@@ -1,5 +1,5 @@
 /* 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
@@ -22,16 +22,18 @@
 
 #include <stdlib.h>
 
-#include "xalloc.h"
-
 /* -------------------------- gl_list_t Data Type -------------------------- */
 
 /* Generic AVL tree code.  */
 #include "gl_anyavltree_list1.h"
-#include "gl_anyavltree_list2.h"
 
 /* Generic binary tree code.  */
 #include "gl_anytree_list1.h"
+
+/* Generic AVL tree code.  */
+#include "gl_anyavltree_list2.h"
+
+/* Generic binary tree code.  */
 #include "gl_anytree_list2.h"
 
 /* For debugging.  */
@@ -47,8 +49,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 (!(balance >= -1 && balance <= 1))
     abort ();
@@ -66,21 +68,22 @@ gl_avltree_list_check_invariants (gl_list_t list)
 
 const struct gl_list_implementation gl_avltree_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,
@@ -93,6 +96,6 @@ const struct gl_list_implementation gl_avltree_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
   };