Fixed return length issues.

[m6w6/libmemcached] / lib / memcached_hash.c

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index a8ecebf5c419cb912778e899a08c9cc6687ef246..0e26fbbea44cd1dd40642664e9d1866a73dd658d 100644 (file)
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -1,6 +1,36 @@
 #include "common.h"
 
-unsigned int memcached_generate_hash(char *key, size_t key_length)
+/* Prototypes */
+static unsigned int internal_generate_hash(char *key, size_t key_length);
+
+unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length)
+{
+  unsigned int hash;
+
+  if (ptr->flags & MEM_USE_MD5)
+  {
+    unsigned char results[16];
+
+    md5_signature((unsigned char*)key, (unsigned int)key_length, results);
+
+    hash= (unsigned int)(( results[3] << 24 )
+                                | ( results[2] << 16 )
+                                | ( results[1] <<  8 )
+                                |   results[0] );
+  }
+  else
+    hash= internal_generate_hash(key, key_length);
+
+  if (ptr->flags & MEM_USE_KETAMA)
+  {
+    WATCHPOINT_ASSERT(0);
+    return 0;
+  }
+  else
+    return hash % ptr->number_of_hosts;
+}
+
+static unsigned int internal_generate_hash(char *key, size_t key_length)
 {
   char *ptr= key;
   unsigned int value= 0;