htable.h: allow template user to define hash value type.

Added HTABLE_DECLARE_WITH(), HTABLE_PROTOS_WITH(), HTABLE_BODIES_WITH().

darcs-hash:20060906190246-65a35-e5153642848f840c71f2f05ab518096b9a816af4.gz

libsofia-sip-ua/su/sofia-sip/htable.h

@@ -71,12 +71,15 @@ typedef unsigned long hash_value_t;
  * @param pr      hash table field prefix
  * @param entry_t entry type
  */
-#define HTABLE_DECLARE(prefix, pr, entry_t) \
-typedef struct prefix##_s { \
-  unsigned pr##_size; \
-  unsigned pr##_used; \
-  entry_t**pr##_table; /**< Hash table itself */ \
-} prefix##_t
+#define HTABLE_DECLARE(prefix, pr, entry_t)		\
+  HTABLE_DECLARE_WITH(prefix, pr, entry_t, unsigned, hash_value_t)
+
+#define HTABLE_DECLARE_WITH(prefix, pr, entry_t, size_t, hash_value_t)	\
+  typedef struct prefix##_s {						\
+    size_t pr##_size;							\
+    size_t pr##_used;							\
+    entry_t**pr##_table; /**< Hash table itself */			\
+  } prefix##_t
 
 #ifndef HTABLE_SCOPE
 /** Default scope for hash table functions. */
@@ -94,7 +97,10 @@ typedef struct prefix##_s { \
  * @param entry_t entry type
  */
 #define HTABLE_PROTOS(prefix, pr, entry_t) \
-HTABLE_SCOPE int prefix##_resize(su_home_t *, prefix##_t pr[1], unsigned); \
+  HTABLE_PROTOS_WITH(prefix, pr, entry_t, unsigned, hash_value_t)
+
+#define HTABLE_PROTOS_WITH(prefix, pr, entry_t, size_t, hash_value_t)	\
+HTABLE_SCOPE int prefix##_resize(su_home_t *, prefix##_t pr[1], size_t); \
 HTABLE_SCOPE int prefix##_is_full(prefix##_t const *); \
 HTABLE_SCOPE entry_t **prefix##_hash(prefix##_t const *, hash_value_t hv); \
 HTABLE_SCOPE entry_t **prefix##_next(prefix##_t const *, entry_t * const *ee); \
@@ -115,6 +121,9 @@ HTABLE_SCOPE void prefix##_remove(prefix##_t *, entry_t const *e)
  * @param hfun    function or macro returning hash value of entry
  */
 #define HTABLE_BODIES(prefix, pr, entry_t, hfun) \
+  HTABLE_BODIES_WITH(prefix, pr, entry_t, hfun, unsigned, hash_value_t)
+
+#define HTABLE_BODIES_WITH(prefix, pr, entry_t, hfun, size_t, hash_value_t)	\
 /** Reallocate new hash table */ \
 HTABLE_SCOPE \
 int prefix##_resize(su_home_t *home, \