X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=crc%2Fxxhash.c;h=4736c528fc07750dd5641721756e1ac860a8f9d2;hp=5190330e85c1936245a4f2904f090a956a365beb;hb=1e2c3404a2a223a3c5358c207f4436564f2aae9b;hpb=65f21d61d5d0796335ceb3320b8846e4d6d30ac7 diff --git a/crc/xxhash.c b/crc/xxhash.c index 5190330e..4736c528 100644 --- a/crc/xxhash.c +++ b/crc/xxhash.c @@ -148,21 +148,21 @@ 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) -{ +static 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); } +static uint32_t XXH_readLE32(const uint32_t* ptr, XXH_endianess endian) { return XXH_readLE32_align(ptr, endian, XXH_unaligned); } //**************************** // Simple Hash Functions //**************************** -uint32_t XXH32_endian_align(const void* input, int len, uint32_t seed, XXH_endianess endian, XXH_alignment align) +static uint32_t XXH32_endian_align(const void* input, int len, uint32_t seed, XXH_endianess endian, XXH_alignment align) { const uint8_t *p = (const uint8_t *)input; const uint8_t * const bEnd = p + len; @@ -221,7 +221,7 @@ uint32_t XXH32_endian_align(const void* input, int len, uint32_t seed, XXH_endia } -uint32_t XXH32(const void* input, int len, uint32_t seed) +uint32_t XXH32(const void* input, uint32_t len, uint32_t seed) { #if 0 // Simple version, good for code maintenance, but unfortunately slow for small inputs @@ -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; @@ -282,7 +282,7 @@ void* XXH32_init (uint32_t seed) } -XXH_errorcode XXH32_update_endian (void* state_in, const void* input, int len, XXH_endianess endian) +static XXH_errorcode XXH32_update_endian (void* state_in, const void* input, int len, XXH_endianess endian) { struct XXH_state32_t * state = (struct XXH_state32_t *) state_in; const uint8_t *p = (const uint8_t *)input; @@ -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++; } @@ -358,7 +358,7 @@ XXH_errorcode XXH32_update (void* state_in, const void* input, int len) -uint32_t XXH32_intermediateDigest_endian (void* state_in, XXH_endianess endian) +static uint32_t XXH32_intermediateDigest_endian (void* state_in, XXH_endianess endian) { struct XXH_state32_t * state = (struct XXH_state32_t *) state_in; const uint8_t *p = (const uint8_t *)state->memory;