LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Cleanup (safe, it was checked) subscript[0] in MurmurHash3 (and cleanup MurmurHash3 to be more clear).

Browse source
This commit is contained in:
Jeremy Rubin 2017-02-19 13:11:44 -05:00
parent 96f2119e6c
commit 6896dbf169
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hash.cpp
View file

@ -17,8 +17,6 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
{ {
// The following is MurmurHash3 (x86_32), see http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp // The following is MurmurHash3 (x86_32), see http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
uint32_t h1 = nHashSeed; uint32_t h1 = nHashSeed;
if (vDataToHash.size() > 0)
{
const uint32_t c1 = 0xcc9e2d51; const uint32_t c1 = 0xcc9e2d51;
const uint32_t c2 = 0x1b873593; const uint32_t c2 = 0x1b873593;
@ -26,9 +24,9 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
//---------- //----------
// body // body
const uint8_t* blocks = &vDataToHash[0] + nblocks * 4; const uint8_t* blocks = vDataToHash.data();
for (int i = -nblocks; i; i++) { for (int i = 0; i < nblocks; ++i) {
uint32_t k1 = ReadLE32(blocks + i*4); uint32_t k1 = ReadLE32(blocks + i*4);
k1 *= c1; k1 *= c1;
@ -42,7 +40,7 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
//---------- //----------
// tail // tail
const uint8_t* tail = (const uint8_t*)(&vDataToHash[0] + nblocks * 4); const uint8_t* tail = vDataToHash.data() + nblocks * 4;
uint32_t k1 = 0; uint32_t k1 = 0;
@ -58,7 +56,6 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
k1 *= c2; k1 *= c2;
h1 ^= k1; h1 ^= k1;
} }
}
//---------- //----------
// finalization // finalization