projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid doubling \ in common case of "c-maybe" quoting style.
[gnulib.git]
/
lib
/
gl_array_list.c
diff --git
a/lib/gl_array_list.c
b/lib/gl_array_list.c
index
7623f02
..
f82d01b
100644
(file)
--- a/
lib/gl_array_list.c
+++ b/
lib/gl_array_list.c
@@
-1,11
+1,11
@@
/* Sequential list data type implemented by an array.
/* Sequential list data type implemented by an array.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
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
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
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
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>
#include <config.h>
@@
-56,14
+55,15
@@
static gl_list_t
gl_array_create_empty (gl_list_implementation_t implementation,
gl_listelement_equals_fn equals_fn,
gl_listelement_hashcode_fn hashcode_fn,
gl_array_create_empty (gl_list_implementation_t implementation,
gl_listelement_equals_fn equals_fn,
gl_listelement_hashcode_fn hashcode_fn,
+ gl_listelement_dispose_fn dispose_fn,
bool allow_duplicates)
{
bool allow_duplicates)
{
- struct gl_list_impl *list =
- (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+ 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.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->count = 0;
list->base.allow_duplicates = allow_duplicates;
list->elements = NULL;
list->count = 0;
@@
-76,20
+76,20
@@
static gl_list_t
gl_array_create (gl_list_implementation_t implementation,
gl_listelement_equals_fn equals_fn,
gl_listelement_hashcode_fn hashcode_fn,
gl_array_create (gl_list_implementation_t implementation,
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)
{
bool allow_duplicates,
size_t count, const void **contents)
{
- struct gl_list_impl *list =
- (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+ 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.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)
{
list->base.allow_duplicates = allow_duplicates;
if (count > 0)
{
- list->elements =
- (const void **) xmalloc (count * sizeof (const void *));
+ list->elements = XNMALLOC (count, const void *);
memcpy (list->elements, contents, count * sizeof (const void *));
}
else
memcpy (list->elements, contents, count * sizeof (const void *));
}
else
@@
-116,6
+116,16
@@
gl_array_node_value (gl_list_t list, gl_list_node_t node)
return list->elements[index];
}
return list->elements[index];
}
+static void
+gl_array_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+ uintptr_t index = NODE_TO_INDEX (node);
+ if (!(index < list->count))
+ /* Invalid argument. */
+ abort ();
+ list->elements[index] = elt;
+}
+
static gl_list_node_t
gl_array_next_node (gl_list_t list, gl_list_node_t node)
{
static gl_list_node_t
gl_array_next_node (gl_list_t list, gl_list_node_t node)
{
@@
-348,6
+358,8
@@
gl_array_remove_node (gl_list_t list, gl_list_node_t node)
abort ();
position = index;
elements = list->elements;
abort ();
position = index;
elements = list->elements;
+ if (list->base.dispose_fn != NULL)
+ list->base.dispose_fn (elements[position]);
for (i = position + 1; i < count; i++)
elements[i - 1] = elements[i];
list->count = count - 1;
for (i = position + 1; i < count; i++)
elements[i - 1] = elements[i];
list->count = count - 1;
@@
-365,6
+377,8
@@
gl_array_remove_at (gl_list_t list, size_t position)
/* Invalid argument. */
abort ();
elements = list->elements;
/* Invalid argument. */
abort ();
elements = list->elements;
+ if (list->base.dispose_fn != NULL)
+ list->base.dispose_fn (elements[position]);
for (i = position + 1; i < count; i++)
elements[i - 1] = elements[i];
list->count = count - 1;
for (i = position + 1; i < count; i++)
elements[i - 1] = elements[i];
list->count = count - 1;
@@
-385,7
+399,23
@@
static void
gl_array_list_free (gl_list_t list)
{
if (list->elements != NULL)
gl_array_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;
+
+ do
+ dispose (*elements++);
+ while (--count > 0);
+ }
+ }
+ free (list->elements);
+ }
free (list);
}
free (list);
}
@@
-442,8
+472,8
@@
gl_array_iterator_next (gl_list_iterator_t *iterator,
abort ();
/* The last returned element was removed. */
iterator->count--;
abort ();
/* The last returned element was removed. */
iterator->count--;
- iterator->p
--
;
- iterator->q
--
;
+ iterator->p
= (const void **) iterator->p - 1
;
+ iterator->q
= (const void **) iterator->q - 1
;
}
if (iterator->p < iterator->q)
{
}
if (iterator->p < iterator->q)
{
@@
-598,6
+628,7
@@
const struct gl_list_implementation gl_array_list_implementation =
gl_array_create,
gl_array_size,
gl_array_node_value,
gl_array_create,
gl_array_size,
gl_array_node_value,
+ gl_array_node_set_value,
gl_array_next_node,
gl_array_previous_node,
gl_array_get_at,
gl_array_next_node,
gl_array_previous_node,
gl_array_get_at,