X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=crc%2Fxxhash.c;h=db7890b027826938e8aa61a8c49420c39332a6b2;hb=7cd0ec5dc7fafa028fec04bb6e47b81e7dfc600e;hp=5190330e85c1936245a4f2904f090a956a365beb;hpb=65f21d61d5d0796335ceb3320b8846e4d6d30ac7;p=fio.git diff --git a/crc/xxhash.c b/crc/xxhash.c index 5190330e..db7890b0 100644 --- a/crc/xxhash.c +++ b/crc/xxhash.c @@ -149,11 +149,11 @@ typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess; typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment; uint32_t XXH_readLE32_align(const uint32_t* ptr, XXH_endianess endian, XXH_alignment align) -{ +{ if (align==XXH_unaligned) - return endian==XXH_littleEndian ? A32(ptr) : XXH_swap32(A32(ptr)); + return endian==XXH_littleEndian ? A32(ptr) : XXH_swap32(A32(ptr)); else - return endian==XXH_littleEndian ? *ptr : XXH_swap32(*ptr); + return endian==XXH_littleEndian ? *ptr : XXH_swap32(*ptr); } uint32_t XXH_readLE32(const uint32_t* ptr, XXH_endianess endian) { return XXH_readLE32_align(ptr, endian, XXH_unaligned); } @@ -253,15 +253,15 @@ uint32_t XXH32(const void* input, int len, uint32_t seed) // Advanced Hash Functions //**************************** -int XXH32_sizeofState() +int XXH32_sizeofState(void) { XXH_STATIC_ASSERT(XXH32_SIZEOFSTATE >= sizeof(struct XXH_state32_t)); // A compilation error here means XXH32_SIZEOFSTATE is not large enough - return sizeof(struct XXH_state32_t); + return sizeof(struct XXH_state32_t); } XXH_errorcode XXH32_resetState(void* state_in, uint32_t seed) -{ +{ struct XXH_state32_t * state = (struct XXH_state32_t *) state_in; state->seed = seed; state->v1 = seed + PRIME32_1 + PRIME32_2; @@ -307,7 +307,7 @@ XXH_errorcode XXH32_update_endian (void* state_in, const void* input, int len, X { const uint32_t* p32 = (const uint32_t*)state->memory; state->v1 += XXH_readLE32(p32, endian) * PRIME32_2; state->v1 = XXH_rotl32(state->v1, 13); state->v1 *= PRIME32_1; p32++; - state->v2 += XXH_readLE32(p32, endian) * PRIME32_2; state->v2 = XXH_rotl32(state->v2, 13); state->v2 *= PRIME32_1; p32++; + state->v2 += XXH_readLE32(p32, endian) * PRIME32_2; state->v2 = XXH_rotl32(state->v2, 13); state->v2 *= PRIME32_1; p32++; state->v3 += XXH_readLE32(p32, endian) * PRIME32_2; state->v3 = XXH_rotl32(state->v3, 13); state->v3 *= PRIME32_1; p32++; state->v4 += XXH_readLE32(p32, endian) * PRIME32_2; state->v4 = XXH_rotl32(state->v4, 13); state->v4 *= PRIME32_1; p32++; }