From: Arran Cudbard-Bell Date: Sun, 20 Jun 2021 17:15:59 +0000 (-0500) Subject: Mark fr_pair_count_by_da as nonnull X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7a3511eb30f481479c504d591008155d2f25b80;p=thirdparty%2Ffreeradius-server.git Mark fr_pair_count_by_da as nonnull --- diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c index c9ed6f0f14c..58286bfc1e4 100644 --- a/src/lib/util/pair.c +++ b/src/lib/util/pair.c @@ -516,8 +516,6 @@ unsigned int fr_pair_count_by_da(fr_pair_list_t const *list, fr_dict_attr_t cons LIST_VERIFY(list); - if (!da) return NULL; - while ((vp = fr_pair_list_next(list, vp))) if (da == vp->da) count++; return count; diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h index c593f39ceca..ec859e2dfcb 100644 --- a/src/lib/util/pair.h +++ b/src/lib/util/pair.h @@ -229,7 +229,7 @@ static inline fr_pair_t *fr_dcursor_iter_by_ancestor_init(fr_dcursor_t *cursor, } /** @hidecallergraph */ -unsigned int fr_pair_count_by_da(fr_pair_list_t const *list, fr_dict_attr_t const *da); +unsigned int fr_pair_count_by_da(fr_pair_list_t const *list, fr_dict_attr_t const *da) CC_HINT(nonnull); fr_pair_t *fr_pair_find_by_da(fr_pair_list_t const *list, fr_dict_attr_t const *da, unsigned int n);