From 6c04fccb1db16e1a3140c01a536bff4ed342f8ed Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 21 Jul 2020 04:35:56 +0900 Subject: [PATCH] util: make siphash24_compress_boolean() inline This also changes the stored type from int to uint8_t in order to make hash value endianness independent. --- src/basic/siphash24.c | 6 ------ src/basic/siphash24.h | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c index 666431aa31f..61180819b1b 100644 --- a/src/basic/siphash24.c +++ b/src/basic/siphash24.c @@ -151,12 +151,6 @@ void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) { } } -void siphash24_compress_boolean(bool in, struct siphash *state) { - int i = in; - - siphash24_compress(&i, sizeof i, state); -} - uint64_t siphash24_finalize(struct siphash *state) { uint64_t b; diff --git a/src/basic/siphash24.h b/src/basic/siphash24.h index 1937fea2985..d29058e51dd 100644 --- a/src/basic/siphash24.h +++ b/src/basic/siphash24.h @@ -17,9 +17,14 @@ struct siphash { void siphash24_init(struct siphash *state, const uint8_t k[static 16]); void siphash24_compress(const void *in, size_t inlen, struct siphash *state); -void siphash24_compress_boolean(bool in, struct siphash *state); #define siphash24_compress_byte(byte, state) siphash24_compress((const uint8_t[]) { (byte) }, 1, (state)) +static inline void siphash24_compress_boolean(bool in, struct siphash *state) { + uint8_t i = in; + + siphash24_compress(&i, sizeof i, state); +} + uint64_t siphash24_finalize(struct siphash *state); uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[static 16]); -- 2.39.2