lzx_common: get rid of unnecessary functions

[wimlib] / include / wimlib / lzx_common.h

diff --git a/include/wimlib/lzx_common.h b/include/wimlib/lzx_common.h
index 4d7587584af86a09e9b7259885a6d4a73c6c7095..92e0b75b255c2bc2d55787d9f83102bf08eec97e 100644 (file)
--- a/include/wimlib/lzx_common.h
+++ b/include/wimlib/lzx_common.h
@@ -7,7 +7,6 @@
 #ifndef _LZX_COMMON_H
 #define _LZX_COMMON_H
 
-#include "wimlib/bitops.h"
 #include "wimlib/lzx_constants.h"
 #include "wimlib/types.h"
 
@@ -15,48 +14,9 @@ extern const u32 lzx_offset_slot_base[LZX_MAX_OFFSET_SLOTS + 1];
 
 extern const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS];
 
-/*
- * Return the offset slot for the specified match offset.
- *
- * This returns the smallest i such that:
- *
- *     offset + LZX_OFFSET_ADJUSTMENT >= lzx_offset_slot_base[i]
- *
- * However, the actual implementation below takes advantage of the regularity of
- * the offset slot bases to calculate the slot directly from the adjusted offset
- * without actually looking at the array.
- */
-static inline unsigned
-lzx_get_offset_slot(u32 offset)
-{
-       u32 adjusted_offset = offset + LZX_OFFSET_ADJUSTMENT;
-       if (adjusted_offset >= 196608) {
-               return (adjusted_offset >> 17) + 34;
-       } else {
-               unsigned mssb_idx = fls32(adjusted_offset);
-               return (mssb_idx << 1) |
-                       ((adjusted_offset >> (mssb_idx - 1)) & 1);
-       }
-}
-
-static inline unsigned
-lzx_main_symbol_for_literal(unsigned literal)
-{
-       return literal;
-}
-
-static inline unsigned
-lzx_main_symbol_for_match(unsigned offset_slot, unsigned len_header)
-{
-       return LZX_NUM_CHARS + (offset_slot * LZX_NUM_LEN_HEADERS) + len_header;
-}
-
 extern unsigned
 lzx_get_window_order(size_t max_bufsize);
 
-extern unsigned
-lzx_get_num_offset_slots(unsigned window_order);
-
 extern unsigned
 lzx_get_num_main_syms(unsigned window_order);