ext/digest/murmurhash/murmurhash1.c in digest-murmurhash-0.2.3 vs ext/digest/murmurhash/murmurhash1.c in digest-murmurhash-0.3.0

@@ -2,31 +2,27 @@
  * MurmurHash1 (C) Austin Appleby
  */
 
 #include "murmurhash1.h"
 
-static inline size_t
-murmur1(uint32_t h, const uint8_t r)
-{
-	const uint32_t m = MURMURHASH_MAGIC;
-	h *= m;
-	h ^= h >> r;
-	return h;
-}
+#define murmur1(r) do { \
+	h *= m; \
+	h ^= h >> r; \
+} while(0)
 
 static uint32_t
-murmur_hash_process1(const char *data, uint32_t length)
+murmur_hash_process1(const char *data, uint32_t length, uint32_t seed)
 {
 	const uint32_t m = MURMURHASH_MAGIC;
 	const uint8_t r = 16;
 	uint32_t h;
 
-	h = length * m;
+	h = seed ^ (length * m);
 
 	while (4 <= length) {
 		h += *(uint32_t*)data;
-		h = murmur1(h, r);
+		murmur1(r);
 		data += 4;
 		length -= 4;
 	}
 
 	switch (length) {
@@ -34,65 +30,43 @@
 		h += data[2] << 16;
 	case 2:
 		h += data[1] << 8;
 	case 1:
 		h += data[0];
-		h = murmur1(h, r);
+		murmur1(r);
 	}
 
-	h = murmur1(h, 10);
-	h = murmur1(h, 17);
+	murmur1(10);
+	murmur1(17);
 
 	return h;
 }
 
 VALUE
 murmur1_finish(VALUE self)
 {
-	uint32_t h;
 	uint8_t digest[4];
-	MURMURHASH(self, ptr);
+	uint64_t h;
 
-	h = murmur_hash_process1(ptr->buffer, ptr->p - ptr->buffer);
-
-	digest[0] = h >> 24;
-	digest[1] = h >> 16;
-	digest[2] = h >> 8;
-	digest[3] = h;
-
+	h = _murmur_finish32(self, murmur_hash_process1);
+	ASSINE_BY_ENDIAN_32(digest, h);
 	return rb_str_new((const char*) digest, 4);
 }
 
 VALUE
 murmur1_to_i(VALUE self)
 {
-	MURMURHASH(self, ptr);
-	return UINT2NUM(murmur_hash_process1(ptr->buffer, ptr->p - ptr->buffer));
+	return UINT2NUM(_murmur_finish32(self, murmur_hash_process1));
 }
 
 VALUE
 murmur1_s_digest(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE str;
-	uint32_t h;
 	uint8_t digest[4];
-
-	if (argc < 1)
-		rb_raise(rb_eArgError, "no data given");
-
-	str = *argv++;
-	argc--;
-
-	StringValue(str);
-
-	h = murmur_hash_process1(RSTRING_PTR(str), RSTRING_LEN(str));
-
-	digest[0] = h >> 24;
-	digest[1] = h >> 16;
-	digest[2] = h >> 8;
-	digest[3] = h;
-
+	uint32_t h;
+	h = _murmur_s_digest32(argc, argv, klass, murmur_hash_process1);
+	ASSINE_BY_ENDIAN_32(digest, h);
 	return rb_str_new((const char*) digest, 4);
 }
 
 VALUE
 murmur1_s_hexdigest(int argc, VALUE *argv, VALUE klass)
@@ -101,17 +75,7 @@
 }
 
 VALUE
 murmur1_s_rawdigest(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE str;
-
-	if (argc < 1)
-		rb_raise(rb_eArgError, "no data given");
-
-	str = *argv++;
-	argc--;
-
-	StringValue(str);
-
-	return UINT2NUM(murmur_hash_process1(RSTRING_PTR(str), RSTRING_LEN(str)));
+	return UINT2NUM(_murmur_s_digest32(argc, argv, klass, murmur_hash_process1));
 }