From e9a04c1cb384cf3cf23d70107e85f79c4ac0a555 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 19 Sep 2015 13:56:10 -0500 Subject: [PATCH 1/1] Rename 'pos_t' to 'mf_pos_t' --- include/wimlib/bt_matchfinder.h | 14 +++++++------- include/wimlib/hc_matchfinder.h | 20 ++++++++++---------- src/lzx_compress.c | 10 +++++----- src/xpress_compress.c | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/wimlib/bt_matchfinder.h b/include/wimlib/bt_matchfinder.h index 70e4f143..8a69bca4 100644 --- a/include/wimlib/bt_matchfinder.h +++ b/include/wimlib/bt_matchfinder.h @@ -78,17 +78,17 @@ struct TEMPLATED(bt_matchfinder) { /* The hash table for finding length 2 matches, if enabled */ #ifdef BT_MATCHFINDER_HASH2_ORDER - pos_t hash2_tab[1UL << BT_MATCHFINDER_HASH2_ORDER]; + mf_pos_t hash2_tab[1UL << BT_MATCHFINDER_HASH2_ORDER]; #endif /* The hash table which contains the roots of the binary trees for * finding length 3 matches */ - pos_t hash3_tab[1UL << BT_MATCHFINDER_HASH3_ORDER]; + mf_pos_t hash3_tab[1UL << BT_MATCHFINDER_HASH3_ORDER]; /* The child node references for the binary trees. The left and right * children of the node for the sequence with position 'pos' are * 'child_tab[pos * 2]' and 'child_tab[pos * 2 + 1]', respectively. */ - pos_t child_tab[]; + mf_pos_t child_tab[]; }; /* Return the number of bytes that must be allocated for a 'bt_matchfinder' that @@ -97,7 +97,7 @@ static inline size_t TEMPLATED(bt_matchfinder_size)(size_t max_bufsize) { return sizeof(struct TEMPLATED(bt_matchfinder)) + - (2 * max_bufsize * sizeof(pos_t)); + (2 * max_bufsize * sizeof(mf_pos_t)); } /* Prepare the matchfinder for a new input buffer. */ @@ -107,13 +107,13 @@ TEMPLATED(bt_matchfinder_init)(struct TEMPLATED(bt_matchfinder) *mf) memset(mf, 0, sizeof(*mf)); } -static inline pos_t * +static inline mf_pos_t * TEMPLATED(bt_left_child)(struct TEMPLATED(bt_matchfinder) *mf, u32 node) { return &mf->child_tab[(node << 1) + 0]; } -static inline pos_t * +static inline mf_pos_t * TEMPLATED(bt_right_child)(struct TEMPLATED(bt_matchfinder) *mf, u32 node) { return &mf->child_tab[(node << 1) + 1]; @@ -142,7 +142,7 @@ TEMPLATED(bt_matchfinder_advance_one_byte)(struct TEMPLATED(bt_matchfinder) * co u32 hash3; u32 cur_node; const u8 *matchptr; - pos_t *pending_lt_ptr, *pending_gt_ptr; + mf_pos_t *pending_lt_ptr, *pending_gt_ptr; u32 best_lt_len, best_gt_len; u32 len; u32 best_len = 2; diff --git a/include/wimlib/hc_matchfinder.h b/include/wimlib/hc_matchfinder.h index 6c7020e5..e1da62b5 100644 --- a/include/wimlib/hc_matchfinder.h +++ b/include/wimlib/hc_matchfinder.h @@ -49,13 +49,13 @@ * * Notes on usage * - * Before including this header, you must define 'pos_t' to an integer type that - * can represent all possible positions. This can be a 16-bit or 32-bit + * Before including this header, you must define 'mf_pos_t' to an integer type + * that can represent all possible positions. This can be a 16-bit or 32-bit * unsigned integer. When possible, the former should be used due to the * reduced cache pressure. This header can be included multiple times in a - * single .c file with different 'pos_t' definitions; however, you must define a - * different MF_SUFFIX each time to generate different names for the matchfinder - * structure and functions. + * single .c file with different 'mf_pos_t' definitions; however, you must + * define a different MF_SUFFIX each time to generate different names for the + * matchfinder structure and functions. * * The number of bytes that must be allocated for a given 'struct * hc_matchfinder' must be gotten by calling hc_matchfinder_size(). @@ -118,15 +118,15 @@ struct TEMPLATED(hc_matchfinder) { /* The hash table for finding length 3 matches */ - pos_t hash3_tab[1UL << HC_MATCHFINDER_HASH3_ORDER]; + mf_pos_t hash3_tab[1UL << HC_MATCHFINDER_HASH3_ORDER]; /* The hash table which contains the first nodes of the linked lists for * finding length 4+ matches */ - pos_t hash4_tab[1UL << HC_MATCHFINDER_HASH4_ORDER]; + mf_pos_t hash4_tab[1UL << HC_MATCHFINDER_HASH4_ORDER]; /* The "next node" references for the linked lists. The "next node" of * the node for the sequence with position 'pos' is 'next_tab[pos]'. */ - pos_t next_tab[]; + mf_pos_t next_tab[]; }; /* Return the number of bytes that must be allocated for a 'hc_matchfinder' that @@ -135,7 +135,7 @@ static inline size_t TEMPLATED(hc_matchfinder_size)(size_t max_bufsize) { return sizeof(struct TEMPLATED(hc_matchfinder)) + - (max_bufsize * sizeof(pos_t)); + (max_bufsize * sizeof(mf_pos_t)); } /* Prepare the matchfinder for a new input buffer. */ @@ -188,7 +188,7 @@ TEMPLATED(hc_matchfinder_longest_match)(struct TEMPLATED(hc_matchfinder) * const const u8 *in_next = in_begin + cur_pos; u32 depth_remaining = max_search_depth; const u8 *best_matchptr = best_matchptr; /* uninitialized */ - pos_t cur_node3, cur_node4; + mf_pos_t cur_node3, cur_node4; u32 hash3, hash4; u32 next_seq3, next_seq4; u32 seq4; diff --git a/src/lzx_compress.c b/src/lzx_compress.c index de843014..98142962 100644 --- a/src/lzx_compress.c +++ b/src/lzx_compress.c @@ -153,16 +153,16 @@ #include "wimlib/util.h" /* Matchfinders with 16-bit positions */ -#define pos_t u16 -#define MF_SUFFIX _16 +#define mf_pos_t u16 +#define MF_SUFFIX _16 #include "wimlib/bt_matchfinder.h" #include "wimlib/hc_matchfinder.h" /* Matchfinders with 32-bit positions */ -#undef pos_t +#undef mf_pos_t #undef MF_SUFFIX -#define pos_t u32 -#define MF_SUFFIX _32 +#define mf_pos_t u32 +#define MF_SUFFIX _32 #include "wimlib/bt_matchfinder.h" #include "wimlib/hc_matchfinder.h" diff --git a/src/xpress_compress.c b/src/xpress_compress.c index 734bfc02..b57d0ea6 100644 --- a/src/xpress_compress.c +++ b/src/xpress_compress.c @@ -48,7 +48,7 @@ /* * Matchfinder definitions. For XPRESS, only a 16-bit matchfinder is needed. */ -#define pos_t u16 +#define mf_pos_t u16 #define MF_SUFFIX /* -- 2.43.0