X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_carray_list.c;h=8b43901e2be6f7cb24e19c51e786c31fd63a3a3f;hb=3d37b264049ab3ff324634078c5e726f497e0df2;hp=7630c2a72b57554d9858ad33cbbb9319f053a04a;hpb=7c6d5072278ec9af612e21f0507a009ed37816e1;p=gnulib.git diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c index 7630c2a72..8b43901e2 100644 --- a/lib/gl_carray_list.c +++ b/lib/gl_carray_list.c @@ -1,11 +1,11 @@ /* Sequential list data type implemented by a circular array. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006-2008 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,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 . */ #include @@ -57,15 +56,17 @@ struct gl_list_impl static gl_list_t gl_carray_create_empty (gl_list_implementation_t implementation, - gl_listelement_equals_fn equals_fn, - gl_listelement_hashcode_fn hashcode_fn, - bool allow_duplicates) + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates) { struct gl_list_impl *list = XMALLOC (struct gl_list_impl); list->base.vtable = implementation; list->base.equals_fn = equals_fn; list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; list->base.allow_duplicates = allow_duplicates; list->elements = NULL; list->offset = 0; @@ -77,16 +78,18 @@ gl_carray_create_empty (gl_list_implementation_t implementation, static gl_list_t gl_carray_create (gl_list_implementation_t implementation, - gl_listelement_equals_fn equals_fn, - gl_listelement_hashcode_fn hashcode_fn, - bool allow_duplicates, - size_t count, const void **contents) + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents) { struct gl_list_impl *list = XMALLOC (struct gl_list_impl); list->base.vtable = implementation; list->base.equals_fn = equals_fn; list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; list->base.allow_duplicates = allow_duplicates; if (count > 0) { @@ -123,6 +126,21 @@ gl_carray_node_value (gl_list_t list, gl_list_node_t node) return list->elements[i]; } +static void +gl_carray_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt) +{ + uintptr_t index = NODE_TO_INDEX (node); + size_t i; + + if (!(index < list->count)) + /* Invalid argument. */ + abort (); + i = list->offset + index; + if (i >= list->allocated) + i -= list->allocated; + list->elements[i] = elt; +} + static gl_list_node_t gl_carray_next_node (gl_list_t list, gl_list_node_t node) { @@ -448,6 +466,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) /* Here we must have list->offset > 0, hence list->allocated > 0. */ size_t i1 = list->allocated - 1; i2 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i2]); for (i = i2; i > 0; i--) elements[i] = elements[i - 1]; elements[0] = elements[i1]; @@ -456,6 +476,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) } else { + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i2]); for (i = i2; i > i0; i--) elements[i] = elements[i - 1]; } @@ -474,6 +496,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) { i1 -= list->allocated; i3 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i3; i++) elements[i] = elements[i + 1]; } @@ -482,6 +506,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) /* Here we must have list->offset > 0, hence list->allocated > 0. */ size_t i2 = list->allocated - 1; i3 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i2; i++) elements[i] = elements[i + 1]; elements[i2] = elements[0]; @@ -490,6 +516,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) } else { + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i3; i++) elements[i] = elements[i + 1]; } @@ -524,7 +552,42 @@ static void gl_carray_list_free (gl_list_t list) { if (list->elements != NULL) - free (list->elements); + { + if (list->base.dispose_fn != NULL) + { + size_t count = list->count; + + if (count > 0) + { + gl_listelement_dispose_fn dispose = list->base.dispose_fn; + const void **elements = list->elements; + size_t i1 = list->offset; + size_t i3 = list->offset + count - 1; + + if (i3 >= list->allocated) + { + /* Here we must have list->offset > 0, hence + list->allocated > 0. */ + size_t i2 = list->allocated - 1; + size_t i; + + i3 -= list->allocated; + for (i = i1; i <= i2; i++) + dispose (elements[i]); + for (i = 0; i <= i3; i++) + dispose (elements[i]); + } + else + { + size_t i; + + for (i = i1; i <= i3; i++) + dispose (elements[i]); + } + } + } + free (list->elements); + } free (list); } @@ -760,6 +823,7 @@ const struct gl_list_implementation gl_carray_list_implementation = gl_carray_create, gl_carray_size, gl_carray_node_value, + gl_carray_node_set_value, gl_carray_next_node, gl_carray_previous_node, gl_carray_get_at,