From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 16 Apr 2021 19:02:27 +0000 (-0500)
Subject: Sync up num_elements
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3e46dec5beeda7cf68bc1a5d9805a0515b77295;p=thirdparty%2Ffreeradius-server.git

Sync up num_elements
---

diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c
index df73ddee00a..a65b5099121 100644
--- a/src/lib/util/hash.c
+++ b/src/lib/util/hash.c
@@ -583,7 +583,7 @@ bool fr_hash_table_delete(fr_hash_table_t *ht, void const *data)
 /*
  *	Count number of elements
  */
-uint64_t fr_hash_table_num_elements(fr_hash_table_t *ht)
+uint32_t fr_hash_table_num_elements(fr_hash_table_t *ht)
 {
 	return ht->num_elements;
 }
diff --git a/src/lib/util/hash.h b/src/lib/util/hash.h
index 90828b4d4a2..d00fe5cefa0 100644
--- a/src/lib/util/hash.h
+++ b/src/lib/util/hash.h
@@ -72,7 +72,7 @@ void		*fr_hash_table_remove(fr_hash_table_t *ht, void const *data) CC_HINT(nonnu
 
 bool		fr_hash_table_delete(fr_hash_table_t *ht, void const *data) CC_HINT(nonnull);
 
-uint64_t	fr_hash_table_num_elements(fr_hash_table_t *ht) CC_HINT(nonnull);
+uint32_t	fr_hash_table_num_elements(fr_hash_table_t *ht) CC_HINT(nonnull);
 
 void		*fr_hash_table_iter_next(fr_hash_table_t *ht, fr_hash_iter_t *iter) CC_HINT(nonnull);
 
diff --git a/src/lib/util/trie.c b/src/lib/util/trie.c
index 88e74c486d8..dc15e886263 100644
--- a/src/lib/util/trie.c
+++ b/src/lib/util/trie.c
@@ -2779,7 +2779,7 @@ bool fr_trie_delete(fr_trie_t *ft, void const *data)
  *
  * @param[in] ft	to return node count for.
  */
-uint64_t fr_trie_num_elements(UNUSED fr_trie_t *ft)
+uint32_t fr_trie_num_elements(UNUSED fr_trie_t *ft)
 {
 	return 0;
 }
diff --git a/src/lib/util/trie.h b/src/lib/util/trie.h
index b76707f9524..b7c11b00451 100644
--- a/src/lib/util/trie.h
+++ b/src/lib/util/trie.h
@@ -80,7 +80,7 @@ void		*fr_trie_remove(fr_trie_t *ft, void const *data) CC_HINT(nonnull);
 
 bool		fr_trie_delete(fr_trie_t *ft, void const *data) CC_HINT(nonnull);
 
-uint64_t	fr_trie_num_elements(fr_trie_t *ft) CC_HINT(nonnull); /* always returns 0 */
+uint32_t	fr_trie_num_elements(fr_trie_t *ft) CC_HINT(nonnull); /* always returns 0 */
 
 #ifdef __cplusplus
 }