Bool fix.

[m6w6/libmemcached] / libmemcached / hosts.c

diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c
index c6c9eb8e4a037366c247c1421cd77b96e7fc7cb8..9d8870dca7c731b8b00bd246e176e8963a910e8e 100644 (file)
--- a/libmemcached/hosts.c
+++ b/libmemcached/hosts.c
@@ -63,11 +63,12 @@ memcached_return_t run_distribution(memcached_st *ptr)
   return MEMCACHED_SUCCESS;
 }
 
-static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
+static uint32_t ketama_server_hash(const char *key, unsigned int key_length, uint32_t alignment)
 {
   unsigned char results[16];
 
-  md5_signature((unsigned char*)key, key_length, results);
+  libhashkit_md5_signature((unsigned char*)key, key_length, results);
+
   return ((uint32_t) (results[3 + alignment * 4] & 0xFF) << 24)
     | ((uint32_t) (results[2 + alignment * 4] & 0xFF) << 16)
     | ((uint32_t) (results[1 + alignment * 4] & 0xFF) << 8)
@@ -213,17 +214,16 @@ static memcached_return_t update_continuum(memcached_st *ptr)
 
         if (is_ketama_weighted)
         {
-          unsigned int i;
-          for (i = 0; i < pointer_per_hash; i++)
+          for (uint32_t x = 0; x < pointer_per_hash; x++)
           {
-             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, x);
              ptr->continuum[continuum_index].index= host_index;
              ptr->continuum[continuum_index++].value= value;
           }
         }
         else
         {
-          value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash);
+          value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length);
           ptr->continuum[continuum_index].index= host_index;
           ptr->continuum[continuum_index++].value= value;
         }
@@ -258,17 +258,16 @@ static memcached_return_t update_continuum(memcached_st *ptr)
 
         if (is_ketama_weighted)
         {
-          unsigned int i;
-          for (i = 0; i < pointer_per_hash; i++)
+          for (uint32_t x = 0; x < pointer_per_hash; x++)
           {
-             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) x);
              ptr->continuum[continuum_index].index= host_index;
              ptr->continuum[continuum_index++].value= value;
           }
         }
         else
         {
-          value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash);
+          value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length);
           ptr->continuum[continuum_index].index= host_index;
           ptr->continuum[continuum_index++].value= value;
         }