Sync up num_elements

diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c
index df73ddee00a8b1260a78292c01fb64bc9ead841e..a65b5099121e1d2ab480e9e0365e421c49a5cdaf 100644 (file)
--- 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 90828b4d4a254836982f043f31c0f5f1a3f08823..d00fe5cefa021c1f955dabdd0998e73f75c707e5 100644 (file)
--- 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 88e74c486d887c1897467dc11af7deb7c658807f..dc15e88626395352959c48e5e0c688c139a62b9a 100644 (file)
--- 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 b76707f9524868de929b933643566bd56a3d4af1..b7c11b004511e7bccb04b5788bef01f80a3926ff 100644 (file)
--- 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
 }