X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgl_rbtreehash_list.c;h=faa95cff24e4946cfac3eda95dcd1ef3a12ee31b;hb=e3adb96fc71c48e1d3e638e7e1afadcd3ac0d840;hp=66ad332d692e5e1da42755a3d1cafff3b88a79d4;hpb=99099106c3c1cb16ed1e91be970332fe225e278b;p=gnulib.git diff --git a/lib/gl_rbtreehash_list.c b/lib/gl_rbtreehash_list.c index 66ad332d6..faa95cff2 100644 --- a/lib/gl_rbtreehash_list.c +++ b/lib/gl_rbtreehash_list.c @@ -2,10 +2,10 @@ Copyright (C) 2006 Free Software Foundation, Inc. Written by Bruno Haible , 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,20 +13,19 @@ 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 . */ #include /* Specification. */ #include "gl_rbtreehash_list.h" +#include /* for SIZE_MAX */ #include #include "gl_rbtree_oset.h" #include "xalloc.h" #include "xsize.h" -#include "size_max.h" #ifndef uintptr_t # define uintptr_t unsigned long @@ -95,7 +94,7 @@ gl_rbtreehash_list_check_invariants (gl_list_t list) } -const struct gl_list_implementation gl_avltreehash_list_implementation = +const struct gl_list_implementation gl_rbtreehash_list_implementation = { gl_tree_create_empty, gl_tree_create, @@ -105,8 +104,8 @@ const struct gl_list_implementation gl_avltreehash_list_implementation = gl_tree_previous_node, gl_tree_get_at, gl_tree_set_at, - gl_tree_search, - gl_tree_indexof, + gl_tree_search_from_to, + gl_tree_indexof_from_to, gl_tree_add_first, gl_tree_add_last, gl_tree_add_before, @@ -121,7 +120,9 @@ const struct gl_list_implementation gl_avltreehash_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_indexof_from_to, gl_tree_sortedlist_add, gl_tree_sortedlist_remove };