aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-01-25 12:32:35 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-01-25 12:32:35 -0800
commitab4c17d3c1ab35d8e3cffe54986f9c1706411e62 (patch)
tree9a5557d570bfaceac64d50be5a38cebf31cd4277
parente2380338bfc9cec2f44877b3551d4e94490c1daa (diff)
parent9074794e39c5ea4b555efc7c7b4870da46ca5b6f (diff)
Merge pull request #198 from nicolasnoble/murmur
Fixing a suspicious-looking paradigm in murmur_hash.c
-rw-r--r--src/core/support/murmur_hash.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/support/murmur_hash.c b/src/core/support/murmur_hash.c
index 08b1eb80d8..892e360968 100644
--- a/src/core/support/murmur_hash.c
+++ b/src/core/support/murmur_hash.c
@@ -52,7 +52,7 @@ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) {
int i;
gpr_uint32 h1 = seed;
- gpr_uint32 k1 = 0;
+ gpr_uint32 k1;
const gpr_uint32 c1 = 0xcc9e2d51;
const gpr_uint32 c2 = 0x1b873593;
@@ -62,7 +62,7 @@ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) {
/* body */
for (i = -nblocks; i; i++) {
- gpr_uint32 k1 = GETBLOCK32(blocks, i);
+ k1 = GETBLOCK32(blocks, i);
k1 *= c1;
k1 = ROTL32(k1, 15);
@@ -73,6 +73,8 @@ gpr_uint32 gpr_murmur_hash3(const void *key, size_t len, gpr_uint32 seed) {
h1 = h1 * 5 + 0xe6546b64;
}
+ k1 = 0;
+
/* tail */
switch (len & 3) {
case 3: