From: Padraig O'Sullivan <osullivan.padraig@gmail.com>
Date: Sat, 18 Jul 2009 17:11:32 +0000 (-0400)
Subject: Build fixes for the memcached_hash.c file.
X-Git-Tag: 0.32~7^2^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5c2eb3585e9a16c2bb2d7dc3785a8fbb6f8396c4;p=m6w6%2Flibmemcached

Build fixes for the memcached_hash.c file.
---

diff --git a/libmemcached/memcached_hash.c b/libmemcached/memcached_hash.c
index e3249c06..5abc1e07 100644
--- a/libmemcached/memcached_hash.c
+++ b/libmemcached/memcached_hash.c
@@ -47,11 +47,11 @@ uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
     break;
   case MEMCACHED_HASH_FNV1A_64: 
     {
-      hash= FNV_64_INIT;
+      hash= (uint32_t) FNV_64_INIT;
       for (x= 0; x < key_length; x++) 
       {
         hash ^= key[x];
-        hash *= FNV_64_PRIME;
+        hash *= (uint32_t) FNV_64_PRIME;
       }
     }
     break;
@@ -146,7 +146,7 @@ static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
   case MEMCACHED_DISTRIBUTION_MODULA:
     return hash % ptr->number_of_hosts;
   case MEMCACHED_DISTRIBUTION_RANDOM:
-    return random() % ptr->number_of_hosts;
+    return (uint32_t) random() % ptr->number_of_hosts;
   default:
     WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
     return hash % ptr->number_of_hosts;
@@ -201,11 +201,11 @@ uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
 static uint32_t internal_generate_hash(const char *key, size_t key_length)
 {
   const char *ptr= key;
-  uint32_t value= 0;
+  int32_t value= 0;
 
   while (key_length--) 
   {
-    value += *ptr++;
+    value += (int32_t) *ptr++;
     value += (value << 10);
     value ^= (value >> 6);
   }
@@ -213,7 +213,7 @@ static uint32_t internal_generate_hash(const char *key, size_t key_length)
   value ^= (value >> 11);
   value += (value << 15); 
 
-  return value == 0 ? 1 : value;
+  return value == 0 ? 1 : (uint32_t) value;
 }
 
 static uint32_t internal_generate_md5(const char *key, size_t key_length)