X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibhashkit%2Fmurmur.cc;h=c1451639c57a67a069683892e4f5972f24f1262c;hb=7883b530881983213dffaa6c71ace9204bedb82a;hp=614b8a5567c5776457aad4e3036a550b198936e2;hpb=a7f20d24660e0569c372accbb112c2ffded81bbd;p=awesomized%2Flibmemcached

diff --git a/src/libhashkit/murmur.cc b/src/libhashkit/murmur.cc
index 614b8a55..c1451639 100644
--- a/src/libhashkit/murmur.cc
+++ b/src/libhashkit/murmur.cc
@@ -56,6 +56,10 @@
 
 #ifdef HAVE_MURMUR_HASH
 
+#ifdef BYTESWAP_HEADER
+# include BYTESWAP_HEADER
+#endif
+
 #include <cstring>
 
 uint32_t hashkit_murmur(const char *key, size_t length, void *context)
@@ -82,14 +86,9 @@ uint32_t hashkit_murmur(const char *key, size_t length, void *context)
   while(length >= 4)
   {
     uint32_t k;
-#if WORDS_BIGENDIAN
-    k = (data[0]<<24)
-      + (data[1]<<16)
-      + (data[2]<<8)
-      + (data[3])
-    ;
-#else
     memcpy(&k, data, sizeof(k));
+#if WORDS_BIGENDIAN
+    k = BYTESWAP_32(k);
 #endif
 
     k *= m;
@@ -104,21 +103,15 @@ uint32_t hashkit_murmur(const char *key, size_t length, void *context)
   }
 
   // Handle the last few bytes of the input array
-
-  switch(length)
-  {
+  if (length) {
+    uint32_t k = 0;
+    memcpy(&k, data, length);
 #if WORDS_BIGENDIAN
-  case 3: h ^= ((uint32_t)data[2]) << 8;     /* fall through */
-  case 2: h ^= ((uint32_t)data[1]) << 16;    /* fall through */
-  case 1: h ^= ((uint32_t)data[0]) << 24;
-#else
-  case 3: h ^= ((uint32_t)data[2]) << 16;   /* fall through */
-  case 2: h ^= ((uint32_t)data[1]) << 8;    /* fall through */
-  case 1: h ^= data[0];
+    k = BYTESWAP_32(k);
 #endif
-          h *= m;
-  default: break;
-  };
+    h ^= k;
+    h *= m;
+  }
 
   /*
     Do a few final mixes of the hash to ensure the last few bytes are