introduce some more typedefs and conversion functions to improve portability

[nbds] / include / hashtable.h

diff --git a/include/hashtable.h b/include/hashtable.h
index 880f2a49dea90a11f5cfaa23fc6e44982ed4977d..3fb5d6cff3ff3844a1d367e31208a139ffba3c30 100644 (file)
--- a/include/hashtable.h
+++ b/include/hashtable.h
@@ -7,15 +7,15 @@ typedef struct ht hashtable_t;
 typedef struct ht_iter ht_iter_t;
 
 hashtable_t * ht_alloc (const datatype_t *key_type);
-uint64_t ht_cas    (hashtable_t *ht, map_key_t key, uint64_t expected_val, uint64_t val);
-uint64_t ht_get    (hashtable_t *ht, map_key_t key);
-uint64_t ht_remove (hashtable_t *ht, map_key_t key);
-uint64_t ht_count  (hashtable_t *ht);
-void     ht_print  (hashtable_t *ht);
-void     ht_free   (hashtable_t *ht);
+map_val_t ht_cas    (hashtable_t *ht, map_key_t key, map_val_t expected_val, map_val_t val);
+map_val_t ht_get    (hashtable_t *ht, map_key_t key);
+map_val_t ht_remove (hashtable_t *ht, map_key_t key);
+size_t    ht_count  (hashtable_t *ht);
+void      ht_print  (hashtable_t *ht);
+void      ht_free   (hashtable_t *ht);
 
 ht_iter_t * ht_iter_begin (hashtable_t *ht, map_key_t key);
-uint64_t    ht_iter_next  (ht_iter_t *iter, map_key_t *key_ptr);
+map_val_t   ht_iter_next  (ht_iter_t *iter, map_key_t *key_ptr);
 void        ht_iter_free  (ht_iter_t *iter);
 
 static const map_impl_t ht_map_impl = {