summaryrefslogtreecommitdiff
path: root/src/core/wee-hashtable.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/wee-hashtable.c')
-rw-r--r--src/core/wee-hashtable.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/wee-hashtable.c b/src/core/wee-hashtable.c
index e77d4c624..9ec9546b7 100644
--- a/src/core/wee-hashtable.c
+++ b/src/core/wee-hashtable.c
@@ -72,10 +72,10 @@ hashtable_get_type (const char *type)
* Returns the hash of the string.
*/
-unsigned long
+unsigned long long
hashtable_hash_key_djb2 (const char *string)
{
- unsigned long hash;
+ unsigned long long hash;
const char *ptr_string;
hash = 5381;
@@ -93,28 +93,28 @@ hashtable_hash_key_djb2 (const char *string)
* Returns the hash of the key, depending on the type.
*/
-unsigned long
+unsigned long long
hashtable_hash_key_default_cb (struct t_hashtable *hashtable, const void *key)
{
- unsigned long hash;
+ unsigned long long hash;
hash = 0;
switch (hashtable->type_keys)
{
case HASHTABLE_INTEGER:
- hash = (unsigned long)(*((int *)key));
+ hash = (unsigned long long)(*((int *)key));
break;
case HASHTABLE_STRING:
hash = hashtable_hash_key_djb2 ((const char *)key);
break;
case HASHTABLE_POINTER:
- hash = (unsigned long)((void *)key);
+ hash = (unsigned long long)((unsigned long)((void *)key));
break;
case HASHTABLE_BUFFER:
break;
case HASHTABLE_TIME:
- hash = (unsigned long)(*((time_t *)key));
+ hash = (unsigned long long)(*((time_t *)key));
break;
case HASHTABLE_NUM_TYPES:
break;
@@ -375,7 +375,7 @@ hashtable_set_with_size (struct t_hashtable *hashtable,
const void *key, int key_size,
const void *value, int value_size)
{
- unsigned long hash;
+ unsigned long long hash;
struct t_hashtable_item *ptr_item, *pos_item, *new_item;
if (!hashtable || !key
@@ -469,9 +469,9 @@ hashtable_set (struct t_hashtable *hashtable,
struct t_hashtable_item *
hashtable_get_item (struct t_hashtable *hashtable, const void *key,
- unsigned long *hash)
+ unsigned long long *hash)
{
- unsigned long key_hash;
+ unsigned long long key_hash;
struct t_hashtable_item *ptr_item;
if (!hashtable || !key)
@@ -1109,7 +1109,7 @@ hashtable_add_to_infolist (struct t_hashtable *hashtable,
void
hashtable_remove_item (struct t_hashtable *hashtable,
struct t_hashtable_item *item,
- unsigned long hash)
+ unsigned long long hash)
{
if (!hashtable || !item)
return;
@@ -1139,7 +1139,7 @@ void
hashtable_remove (struct t_hashtable *hashtable, const void *key)
{
struct t_hashtable_item *ptr_item;
- unsigned long hash;
+ unsigned long long hash;
if (!hashtable || !key)
return;