Rename WORDSIZE to WORDBYTES and introduce WORDBITS

[wimlib] / include / wimlib / lz_extend.h

diff --git a/include/wimlib/lz_extend.h b/include/wimlib/lz_extend.h
index 2fb76bc921d47c5b1986c087b1e12e24cd7b62ac..c4547e2bc6d9d046e7aebc35ee765eae40db9342 100644 (file)
--- a/include/wimlib/lz_extend.h
+++ b/include/wimlib/lz_extend.h
@@ -32,17 +32,17 @@ static inline u32
 lz_extend(const u8 * const strptr, const u8 * const matchptr,
          u32 len, const u32 max_len)
 {
-       while (UNALIGNED_ACCESS_IS_FAST && len + WORDSIZE <= max_len) {
+       while (UNALIGNED_ACCESS_IS_FAST && len + WORDBYTES <= max_len) {
                machine_word_t v = load_word_unaligned(matchptr + len) ^
                                   load_word_unaligned(strptr + len);
                if (v != 0) {
                        if (CPU_IS_LITTLE_ENDIAN)
                                len += ffsw(v) >> 3;
                        else
-                               len += (8 * WORDSIZE - 1 - flsw(v)) >> 3;
+                               len += (WORDBITS - 1 - flsw(v)) >> 3;
                        return len;
                }
-               len += WORDSIZE;
+               len += WORDBYTES;
        }
 
        while (len < max_len && matchptr[len] == strptr[len])