Merge Monty

diff --combined libmemcached/memcached_hash.c
index e3249c0624774f0d2b343a27e719153e36dd0a45,5abc1e0761731627bcc49b1caaf1401f7f32e18b..4956d18e0655e784bbb4e7a4b3c0200d4552bb77
--- 1/libmemcached/memcached_hash.c
--- 2/libmemcached/memcached_hash.c
+++ b/libmemcached/memcached_hash.c
@@@ -47,11 -47,11 +47,11 @@@ uint32_t memcached_generate_hash_value(
      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 +146,7 @@@ static uint32_t dispatch_host(memcached
    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 +201,11 @@@ uint32_t memcached_generate_hash(memcac
  static uint32_t internal_generate_hash(const char *key, size_t key_length)
  {
    const char *ptr= key;
 -  int32_t value= 0;
 +  uint32_t value= 0;
  
    while (key_length--) 
    {
-     value += *ptr++;
 -    value += (int32_t) *ptr++;
++    value += (uint32_t) *ptr++;
      value += (value << 10);
      value ^= (value >> 6);
    }
@@@ -213,7 -213,7 +213,7 @@@
    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)