Constify get-size() of hash tables.

rizinorg · Sep 18, 2024 · 47f96f3 · 47f96f3
1 parent 35f10e2
commit 47f96f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/librz/include/rz_util/ht_inc.h b/librz/include/rz_util/ht_inc.h
@@ -187,7 +187,7 @@ HT_(IterState);
 // Create a new Ht with the provided Options
 RZ_API RZ_OWN HtName_(Ht) *Ht_(new_opt)(RZ_NONNULL HT_(Options) *opt);
 // Create a new Ht with the provided Options and initial size
-RZ_API RZ_OWN HtName_(Ht) *Ht_(new_opt_size)(RZ_NONNULL HT_(Options) *opt, ut32 initial_size);
+RZ_API RZ_OWN HtName_(Ht) *Ht_(new_opt_size)(const RZ_NONNULL HT_(Options) *opt, ut32 initial_size);
 // Destroy a hashtable and all of its entries.
 RZ_API void Ht_(free)(RZ_NULLABLE HtName_(Ht) *ht);
 // Insert a new Key-Value pair into the hashtable. If the key already exists, returns false.

diff --git a/librz/include/rz_util/rz_set.h b/librz/include/rz_util/rz_set.h
@@ -20,7 +20,7 @@ RZ_API void rz_set_s_free(RZ_NULLABLE RzSetS *set);
 RZ_API void rz_set_s_add(RZ_NONNULL RzSetS *set, const char *str);
 RZ_API bool rz_set_s_contains(RZ_NONNULL RzSetS *set, const char *str);
 RZ_API void rz_set_s_delete(RZ_NONNULL RzSetS *set, const char *str);
-RZ_API ut32 rz_set_s_size(RZ_NONNULL RzSetS *set);
+RZ_API ut32 rz_set_s_size(const RZ_NONNULL RzSetS *set);
 RZ_API RZ_OWN RzPVector /*<char *>*/ *rz_set_s_to_vector(RZ_NONNULL RzSetS *set);
 RZ_API RzIterator *rz_set_s_as_iter(const RZ_NONNULL RzSetS *set);
 
@@ -31,7 +31,7 @@ RZ_API void rz_set_u_free(RZ_NULLABLE RzSetU *set);
 RZ_API void rz_set_u_add(RZ_NONNULL RzSetU *set, ut64 u);
 RZ_API bool rz_set_u_contains(RZ_NONNULL RzSetU *set, ut64 u);
 RZ_API void rz_set_u_delete(RZ_NONNULL RzSetU *set, ut64 u);
-RZ_API ut32 rz_set_u_size(RZ_NULLABLE RzSetU *set);
+RZ_API ut32 rz_set_u_size(const RZ_NONNULL RzSetU *set);
 RZ_API RzIterator *rz_set_u_as_iter(const RZ_NONNULL RzSetU *set);
 
 #ifdef __cplusplus

diff --git a/librz/util/ht/ht_inc.c b/librz/util/ht/ht_inc.c
@@ -521,7 +521,8 @@ RZ_API void Ht_(foreach)(RZ_NONNULL HtName_(Ht) *ht, RZ_NONNULL HT_(ForeachCallb
  *
  * \return The number of elements saved in the hash map.
  */
-RZ_API ut32 Ht_(size)(RZ_NONNULL HtName_(Ht) *ht) {
+RZ_API ut32 Ht_(size)(const RZ_NONNULL HtName_(Ht) *ht) {
+	rz_return_val_if_fail(ht, 0);
 	return ht->count;
 }
 

diff --git a/librz/util/set.c b/librz/util/set.c
@@ -78,7 +78,8 @@ RZ_API void rz_set_s_free(RZ_NULLABLE RzSetS *set) {
 /**
  * \brief Return number of elements saved in the set.
  */
-RZ_API ut32 rz_set_s_size(RZ_NULLABLE RzSetS *set) {
+RZ_API ut32 rz_set_s_size(const RZ_NONNULL RzSetS *set) {
+	rz_return_val_if_fail(set, 0);
 	return ht_sp_size((HtSP *)set);
 }
 
@@ -120,7 +121,8 @@ RZ_API void rz_set_u_free(RZ_NULLABLE RzSetU *set) {
 /**
  * \brief Return number of elements saved in the set.
  */
-RZ_API ut32 rz_set_u_size(RZ_NULLABLE RzSetU *set) {
+RZ_API ut32 rz_set_u_size(const RZ_NONNULL RzSetU *set) {
+	rz_return_val_if_fail(set, 0);
 	return ht_up_size((HtUP *)set);
 }