rbtree pointer should never be NULL

diff --git a/src/lib/util/rbtree.c b/src/lib/util/rbtree.c
index 8e419001256fa66344e2e8d8779623d822b1aa4e..9211f4ebf35d8ca49a58c48b61e1b28cadd9839a 100644 (file)
--- a/src/lib/util/rbtree.c
+++ b/src/lib/util/rbtree.c
@@ -821,8 +821,6 @@ int rbtree_walk(rbtree_t *tree, fr_rb_order_t order, fr_rb_walker_t compare, voi
 
 uint32_t rbtree_num_elements(rbtree_t *tree)
 {
-       if (!tree) return 0;
-
        return tree->num_elements;
 }
 

diff --git a/src/lib/util/rbtree.h b/src/lib/util/rbtree.h
index 29e054b7f11b98c7d9e1aa8e25b49a5dd9a8c5ed..18686154b2056413c5591e3148fb7a5f01d6cd7e 100644 (file)
--- a/src/lib/util/rbtree.h
+++ b/src/lib/util/rbtree.h
@@ -124,30 +124,29 @@ typedef void (*fr_rb_free_t)(void *data);
                )
 
 rbtree_t       *_rbtree_alloc(TALLOC_CTX *ctx, size_t offset, char const *type,
-                              fr_rb_cmp_t compare, fr_rb_free_t node_free, int flags);
+                              fr_rb_cmp_t compare, fr_rb_free_t node_free, int flags) CC_HINT(warn_unused_result);
 
-void           rbtree_unlock(rbtree_t *tree);
+void           rbtree_unlock(rbtree_t *tree) CC_HINT(nonnull);
 
-void           rbtree_node_talloc_free(void *data);
+void           rbtree_node_talloc_free(void *data) CC_HINT(nonnull);
 
-bool           rbtree_insert(rbtree_t *tree, void const *data);
+bool           rbtree_insert(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-fr_rb_node_t   *rbtree_insert_node(rbtree_t *tree, void *data);
+fr_rb_node_t   *rbtree_insert_node(rbtree_t *tree, void *data) CC_HINT(nonnull);
 
-void           rbtree_delete(rbtree_t *tree, fr_rb_node_t *z);
+void           rbtree_delete(rbtree_t *tree, fr_rb_node_t *z) CC_HINT(nonnull);
 
-bool           rbtree_deletebydata(rbtree_t *tree, void const *data);
+bool           rbtree_deletebydata(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-fr_rb_node_t   *rbtree_find(rbtree_t *tree, void const *data);
+fr_rb_node_t   *rbtree_find(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
 /** @hidecallergraph */
-void           *rbtree_finddata(rbtree_t *tree, void const *data);
+void           *rbtree_finddata(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-uint32_t       rbtree_num_elements(rbtree_t *tree);
+uint32_t       rbtree_num_elements(rbtree_t *tree) CC_HINT(nonnull);
 
 uint32_t       rbtree_flatten(TALLOC_CTX *ctx, void **out[], rbtree_t *tree, fr_rb_order_t order);
 
-
 void           *rbtree_node2data(rbtree_t *tree, fr_rb_node_t *node);
 
 /*