From f09b1cba44882dfb42741a5895e1d0d84e89e1db Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 19 Sep 2015 13:56:11 -0500 Subject: [PATCH] lz_hash.h: remove unused code --- include/wimlib/bt_matchfinder.h | 2 +- include/wimlib/lz_hash.h | 31 +------------------------------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/include/wimlib/bt_matchfinder.h b/include/wimlib/bt_matchfinder.h index 8a69bca4..c2fa8b82 100644 --- a/include/wimlib/bt_matchfinder.h +++ b/include/wimlib/bt_matchfinder.h @@ -147,7 +147,7 @@ TEMPLATED(bt_matchfinder_advance_one_byte)(struct TEMPLATED(bt_matchfinder) * co u32 len; u32 best_len = 2; - if (unlikely(max_len < LZ_HASH3_REQUIRED_NBYTES + 1)) { + if (unlikely(max_len < LOAD_U24_REQUIRED_NBYTES + 1)) { *best_len_ret = best_len; return lz_matchptr; } diff --git a/include/wimlib/lz_hash.h b/include/wimlib/lz_hash.h index 5aa4eff5..464c01af 100644 --- a/include/wimlib/lz_hash.h +++ b/include/wimlib/lz_hash.h @@ -13,7 +13,7 @@ #ifndef _LZ_HASH_H #define _LZ_HASH_H -#include "wimlib/unaligned.h" +#include "wimlib/types.h" /* * The hash function: given a sequence prefix held in the low-order bits of a @@ -28,33 +28,4 @@ lz_hash(u32 seq, unsigned num_bits) return (u32)(seq * 0x1E35A7BD) >> (32 - num_bits); } -/* - * Hash the 2-byte sequence beginning at @p, producing a hash of length - * @num_bits bits. At least 2 bytes of data must be available at @p. - */ -static inline u32 -lz_hash_2_bytes(const u8 *p, unsigned num_bits) -{ - u32 seq = load_u16_unaligned(p); - if (num_bits >= 16) - return seq; - return lz_hash(seq, num_bits); -} - -/* - * Hash the 3-byte sequence beginning at @p, producing a hash of length - * @num_bits bits. At least LZ_HASH3_REQUIRED_NBYTES bytes of data must be - * available at @p; note that this may be more than 3. - */ -static inline u32 -lz_hash_3_bytes(const u8 *p, unsigned num_bits) -{ - u32 seq = load_u24_unaligned(p); - if (num_bits >= 24) - return seq; - return lz_hash(seq, num_bits); -} - -#define LZ_HASH3_REQUIRED_NBYTES LOAD_U24_REQUIRED_NBYTES - #endif /* _LZ_HASH_H */ -- 2.43.0