>From be744f1e1db0b7dc79f8206fd83918c32fad1d31 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 10 Oct 2020 22:17:15 +0200 Subject: [PATCH 1/2] rbtree-list: Avoid possible compiler warnings. This mirrors the change of avltree-list on 2014-09-16. * lib/gl_rbtree_list.c (gl_rbtree_list_check_invariants): Add extern declaration. Add cast to void for ignored value of check_invariants. --- ChangeLog | 7 +++++++ lib/gl_avltree_list.c | 1 - lib/gl_rbtree_list.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b479cf0..869f627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-10-10 Bruno Haible + + rbtree-list: Avoid possible compiler warnings. + This mirrors the change of avltree-list on 2014-09-16. + * lib/gl_rbtree_list.c (gl_rbtree_list_check_invariants): Add extern + declaration. Add cast to void for ignored value of check_invariants. + 2020-10-10 Paul Eggert attribute: improve const, pure doc diff --git a/lib/gl_avltree_list.c b/lib/gl_avltree_list.c index 35ffec6..600e78b 100644 --- a/lib/gl_avltree_list.c +++ b/lib/gl_avltree_list.c @@ -61,7 +61,6 @@ check_invariants (gl_list_node_t node, gl_list_node_t parent) return 1 + (left_height > right_height ? left_height : right_height); } - void gl_avltree_list_check_invariants (gl_list_t list) { diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c index d79becf..5be225f 100644 --- a/lib/gl_rbtree_list.c +++ b/lib/gl_rbtree_list.c @@ -37,6 +37,8 @@ #include "gl_anytree_list2.h" /* For debugging. */ +extern void gl_rbtree_list_check_invariants (gl_list_t list); + static unsigned int check_invariants (gl_list_node_t node, gl_list_node_t parent) { @@ -64,7 +66,7 @@ void gl_rbtree_list_check_invariants (gl_list_t list) { if (list->root != NULL) - check_invariants (list->root, NULL); + (void) check_invariants (list->root, NULL); } const struct gl_list_implementation gl_rbtree_list_implementation = -- 2.7.4