From 927f2357d80dbe44e6e9cbca8786b0fa3094c2f3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 18 Oct 2020 15:10:23 +0200 Subject: [PATCH] *-list, *-oset, *-omap: Avoid a GCC warning (regression 2020-10-10). * lib/gl_anylinked_list2.h (gl_linked_iterator_free): Remove '_GL_ATTRIBUTE_CONST'. * lib/gl_anytree_list2.h (gl_tree_iterator_free): Likewise. * lib/gl_anytree_omap.h (gl_tree_iterator_free): Likewise. * lib/gl_anytree_oset.h (gl_tree_iterator_free): Likewise. * lib/gl_array_list.c (gl_array_iterator_free): Likewise. * lib/gl_array_omap.c (gl_array_iterator_free): Likewise. * lib/gl_array_oset.c (gl_array_iterator_free): Likewise. * lib/gl_carray_list.c (gl_carray_iterator_free): Likewise. --- ChangeLog | 13 +++++++++++++ lib/gl_anylinked_list2.h | 2 +- lib/gl_anytree_list2.h | 2 +- lib/gl_anytree_omap.h | 2 +- lib/gl_anytree_oset.h | 2 +- lib/gl_array_list.c | 2 +- lib/gl_array_omap.c | 2 +- lib/gl_array_oset.c | 2 +- lib/gl_carray_list.c | 2 +- 9 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9634c0a2ee..df3eabfefd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2020-10-18 Bruno Haible + + *-list, *-oset, *-omap: Avoid a GCC warning (regression 2020-10-10). + * lib/gl_anylinked_list2.h (gl_linked_iterator_free): Remove + '_GL_ATTRIBUTE_CONST'. + * lib/gl_anytree_list2.h (gl_tree_iterator_free): Likewise. + * lib/gl_anytree_omap.h (gl_tree_iterator_free): Likewise. + * lib/gl_anytree_oset.h (gl_tree_iterator_free): Likewise. + * lib/gl_array_list.c (gl_array_iterator_free): Likewise. + * lib/gl_array_omap.c (gl_array_iterator_free): Likewise. + * lib/gl_array_oset.c (gl_array_iterator_free): Likewise. + * lib/gl_carray_list.c (gl_carray_iterator_free): Likewise. + 2020-10-18 Bruno Haible obstack: Fix a clang warning. diff --git a/lib/gl_anylinked_list2.h b/lib/gl_anylinked_list2.h index bc9d5c7ab1..24ef47ec0c 100644 --- a/lib/gl_anylinked_list2.h +++ b/lib/gl_anylinked_list2.h @@ -1022,7 +1022,7 @@ gl_linked_iterator_next (gl_list_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_linked_iterator_free (gl_list_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_anytree_list2.h b/lib/gl_anytree_list2.h index 3cb34221db..ae4d419be5 100644 --- a/lib/gl_anytree_list2.h +++ b/lib/gl_anytree_list2.h @@ -631,7 +631,7 @@ gl_tree_iterator_next (gl_list_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_tree_iterator_free (gl_list_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_anytree_omap.h b/lib/gl_anytree_omap.h index 016c83be37..d8658c2e51 100644 --- a/lib/gl_anytree_omap.h +++ b/lib/gl_anytree_omap.h @@ -299,7 +299,7 @@ gl_tree_iterator_next (gl_omap_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_tree_iterator_free (gl_omap_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_anytree_oset.h b/lib/gl_anytree_oset.h index 46c47c2867..5b3ab13037 100644 --- a/lib/gl_anytree_oset.h +++ b/lib/gl_anytree_oset.h @@ -437,7 +437,7 @@ gl_tree_iterator_next (gl_oset_iterator_t *iterator, const void **eltp) return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_tree_iterator_free (gl_oset_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c index 92bf4636a3..3d9020e5d8 100644 --- a/lib/gl_array_list.c +++ b/lib/gl_array_list.c @@ -508,7 +508,7 @@ gl_array_iterator_next (gl_list_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_array_iterator_free (gl_list_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_array_omap.c b/lib/gl_array_omap.c index c3117db3fe..2bc5f5e02c 100644 --- a/lib/gl_array_omap.c +++ b/lib/gl_array_omap.c @@ -369,7 +369,7 @@ gl_array_iterator_next (gl_omap_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_array_iterator_free (gl_omap_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_array_oset.c b/lib/gl_array_oset.c index 5fb0da1eb2..7832abcc60 100644 --- a/lib/gl_array_oset.c +++ b/lib/gl_array_oset.c @@ -487,7 +487,7 @@ gl_array_iterator_next (gl_oset_iterator_t *iterator, const void **eltp) return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_array_iterator_free (gl_oset_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c index 8c2dc4e487..e602516d73 100644 --- a/lib/gl_carray_list.c +++ b/lib/gl_carray_list.c @@ -680,7 +680,7 @@ gl_carray_iterator_next (gl_list_iterator_t *iterator, return false; } -static void _GL_ATTRIBUTE_CONST +static void gl_carray_iterator_free (gl_list_iterator_t *iterator _GL_ATTRIBUTE_MAYBE_UNUSED) { } -- 2.39.5