Merge in removal of smp make

[m6w6/libmemcached] / libhashkit / hsieh.c

diff --git a/libhashkit/hsieh.c b/libhashkit/hsieh.c
index c688add6c6d914bac9c0ca11a56fc1f5e194df61..35a2e2096c23d5c2f300a9ca877b095cc45aaabd 100644 (file)
--- a/libhashkit/hsieh.c
+++ b/libhashkit/hsieh.c
@@ -5,7 +5,7 @@
  * http://www.azillionmonkeys.com/qed/hash.html
 */
 
-#include "common.h"
+#include <libhashkit/common.h>
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__))
@@ -43,16 +43,18 @@ uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context __attri
   {
   case 3: hash += get16bits (key);
           hash ^= hash << 16;
-          hash ^= key[sizeof (uint16_t)] << 18;
+          hash ^= (uint32_t)key[sizeof (uint16_t)] << 18;
           hash += hash >> 11;
           break;
   case 2: hash += get16bits (key);
           hash ^= hash << 11;
           hash += hash >> 17;
           break;
-  case 1: hash += *key;
+  case 1: hash += (unsigned char)(*key);
           hash ^= hash << 10;
           hash += hash >> 1;
+  default:
+          break;
   }
 
   /* Force "avalanching" of final 127 bits */