X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_avltreehash_list.c;h=ce68a03d1e19fcb69548d4cb46a8363f67798ad1;hb=ab43907148e80f3895280928c05d4be93875580f;hp=ef739fca215bc4a964058b4069e2c3a509466b0c;hpb=92877a2d8aef6f0296ff0567f9828151d4d82d64;p=gnulib.git

diff --git a/lib/gl_avltreehash_list.c b/lib/gl_avltreehash_list.c
index ef739fca2..ce68a03d1 100644
--- a/lib/gl_avltreehash_list.c
+++ b/lib/gl_avltreehash_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with a binary tree.
-   Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 
 #include "gl_avltree_oset.h"
-#include "xalloc.h"
 #include "xsize.h"
 
 #ifndef uintptr_t
@@ -75,8 +74,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 ();
@@ -95,22 +94,22 @@ gl_avltreehash_list_check_invariants (gl_list_t list)
 
 const struct gl_list_implementation gl_avltreehash_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,
@@ -123,6 +122,6 @@ const struct gl_list_implementation gl_avltreehash_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
   };