X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_oset.c;h=96fb0b9337016a8f3388a301be63831ec7ba0d11;hb=5e3f9fb1457299215f1777603ef9d3e2f81986ff;hp=3e6f094bf66d91235e75d88cb1fe4fbe99678115;hpb=99f430a8044e80894705b9a158e56258e41d7993;p=gnulib.git

diff --git a/lib/gl_oset.c b/lib/gl_oset.c
index 3e6f094bf..96fb0b933 100644
--- a/lib/gl_oset.c
+++ b/lib/gl_oset.c
@@ -1,11 +1,11 @@
 /* Abstract ordered set data type.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2012 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>
 
@@ -28,11 +27,12 @@
    Use #define to avoid a warning because of extern vs. static.  */
 
 gl_oset_t
-gl_oset_create_empty (gl_oset_implementation_t implementation,
-		      gl_setelement_compar_fn compar_fn,
-		      gl_setelement_dispose_fn dispose_fn)
+gl_oset_nx_create_empty (gl_oset_implementation_t implementation,
+                         gl_setelement_compar_fn compar_fn,
+                         gl_setelement_dispose_fn dispose_fn)
 {
-  return implementation->create_empty (implementation, compar_fn, dispose_fn);
+  return implementation->nx_create_empty (implementation, compar_fn,
+                                          dispose_fn);
 }
 
 size_t
@@ -49,23 +49,24 @@ gl_oset_search (gl_oset_t set, const void *elt)
 
 bool
 gl_oset_search_atleast (gl_oset_t set,
-			gl_setelement_threshold_fn threshold_fn,
-			const void *threshold, const void **eltp)
+                        gl_setelement_threshold_fn threshold_fn,
+                        const void *threshold, const void **eltp)
 {
   return ((const struct gl_oset_impl_base *) set)->vtable
-	 ->search_atleast (set, threshold_fn, threshold, eltp);
+         ->search_atleast (set, threshold_fn, threshold, eltp);
 }
 
-bool
-gl_oset_add (gl_oset_t set, const void *elt)
+int
+gl_oset_nx_add (gl_oset_t set, const void *elt)
 {
-  return ((const struct gl_oset_impl_base *) set)->vtable->add (set, elt);
+  return ((const struct gl_oset_impl_base *) set)->vtable->nx_add (set, elt);
 }
 
 bool
 gl_oset_remove (gl_oset_t set, const void *elt)
 {
-  return ((const struct gl_oset_impl_base *) set)->vtable->remove (set, elt);
+  return ((const struct gl_oset_impl_base *) set)->vtable
+         ->remove_elt (set, elt);
 }
 
 void