diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-19 19:21:46 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-19 19:21:46 +0200 |
commit | 20e01b1a03819d843a860284033b48a5e3b65ff7 (patch) | |
tree | 5b390722b053ce5b448919bda2695d173980ffb5 /src/hash.cpp | |
parent | 2fc6c67400e91846ca1c1c57011e57491013f9bd (diff) |
Apply clang-format on some infrequently-updated files
Diffstat (limited to 'src/hash.cpp')
-rw-r--r-- | src/hash.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/hash.cpp b/src/hash.cpp index bddd8abf38..4ce4da4c30 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -1,6 +1,6 @@ #include "hash.h" -inline uint32_t ROTL32 ( uint32_t x, int8_t r ) +inline uint32_t ROTL32(uint32_t x, int8_t r) { return (x << r) | (x >> (32 - r)); } @@ -16,33 +16,37 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char //---------- // body - const uint32_t * blocks = (const uint32_t *)(&vDataToHash[0] + nblocks*4); + const uint32_t* blocks = (const uint32_t*)(&vDataToHash[0] + nblocks * 4); - for(int i = -nblocks; i; i++) - { + for (int i = -nblocks; i; i++) { uint32_t k1 = blocks[i]; k1 *= c1; - k1 = ROTL32(k1,15); + k1 = ROTL32(k1, 15); k1 *= c2; h1 ^= k1; - h1 = ROTL32(h1,13); - h1 = h1*5+0xe6546b64; + h1 = ROTL32(h1, 13); + h1 = h1 * 5 + 0xe6546b64; } //---------- // tail - const uint8_t * tail = (const uint8_t*)(&vDataToHash[0] + nblocks*4); + const uint8_t* tail = (const uint8_t*)(&vDataToHash[0] + nblocks * 4); uint32_t k1 = 0; - switch(vDataToHash.size() & 3) - { - case 3: k1 ^= tail[2] << 16; - case 2: k1 ^= tail[1] << 8; - case 1: k1 ^= tail[0]; - k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; + switch (vDataToHash.size() & 3) { + case 3: + k1 ^= tail[2] << 16; + case 2: + k1 ^= tail[1] << 8; + case 1: + k1 ^= tail[0]; + k1 *= c1; + k1 = ROTL32(k1, 15); + k1 *= c2; + h1 ^= k1; }; //---------- |