From 821015b5747ecf99422ada31398bde8dd7549970 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 12 Dec 2018 01:03:13 +0100 Subject: [PATCH] array-omap, avltree-omap, rbtree-omap: Tweak style. * lib/gl_anytree_omap.h (gl_tree_nx_getput): Return 1 or 0, not true or false. * lib/gl_array_omap.c (gl_array_nx_getput): Likewise. --- ChangeLog | 5 +++++ lib/gl_anytree_omap.h | 8 ++++---- lib/gl_array_omap.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71acad6611..2b95de209d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-12-11 Bruno Haible + array-omap, avltree-omap, rbtree-omap: Tweak style. + * lib/gl_anytree_omap.h (gl_tree_nx_getput): Return 1 or 0, not true or + false. + * lib/gl_array_omap.c (gl_array_nx_getput): Likewise. + rbtree-omap: Add tests. * tests/test-rbtree_omap.c: New file. * modules/rbtree-omap-tests: New file. diff --git a/lib/gl_anytree_omap.h b/lib/gl_anytree_omap.h index 0b43712369..0fd5192819 100644 --- a/lib/gl_anytree_omap.h +++ b/lib/gl_anytree_omap.h @@ -129,7 +129,7 @@ gl_tree_nx_getput (gl_omap_t map, const void *key, const void *value, { if (gl_tree_nx_add_first (map, key, value) == NULL) return -1; - return true; + return 1; } compar = map->base.compar_fn; @@ -147,7 +147,7 @@ gl_tree_nx_getput (gl_omap_t map, const void *key, const void *value, { if (gl_tree_nx_add_after (map, node, key, value) == NULL) return -1; - return true; + return 1; } node = node->right; } @@ -157,7 +157,7 @@ gl_tree_nx_getput (gl_omap_t map, const void *key, const void *value, { if (gl_tree_nx_add_before (map, node, key, value) == NULL) return -1; - return true; + return 1; } node = node->left; } @@ -165,7 +165,7 @@ gl_tree_nx_getput (gl_omap_t map, const void *key, const void *value, { *oldvaluep = node->value; node->value = value; - return false; + return 0; } } } diff --git a/lib/gl_array_omap.c b/lib/gl_array_omap.c index d643fbac14..a2b21bc3ad 100644 --- a/lib/gl_array_omap.c +++ b/lib/gl_array_omap.c @@ -271,7 +271,7 @@ gl_array_nx_getput (gl_omap_t map, const void *key, const void *value, { *oldvaluep = map->pairs[mid].value; map->pairs[mid].value = value; - return false; + return 0; } } while (low < high); -- 2.39.5