diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2019-12-31 22:41:45 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2019-12-31 22:41:45 +0200 |
| commit | 00517d125cc26ecece0eebb84c1c3975cd19bee0 (patch) | |
| tree | 7594f2692ad92e8115ce91e6030032171161368c /src/liblzma/common/memcmplen.h | |
| parent | Rename read32ne to aligned_read32ne, and similarly for the others. (diff) | |
| download | xz-00517d125cc26ecece0eebb84c1c3975cd19bee0.tar.xz | |
Rename unaligned_read32ne to read32ne, and similarly for the others.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/common/memcmplen.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/liblzma/common/memcmplen.h b/src/liblzma/common/memcmplen.h index 25debf6a..dcfd8d6f 100644 --- a/src/liblzma/common/memcmplen.h +++ b/src/liblzma/common/memcmplen.h @@ -61,8 +61,7 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2, // to __builtin_clzll(). #define LZMA_MEMCMPLEN_EXTRA 8 while (len < limit) { - const uint64_t x = unaligned_read64ne(buf1 + len) - - unaligned_read64ne(buf2 + len); + const uint64_t x = read64ne(buf1 + len) - read64ne(buf2 + len); if (x != 0) { # if defined(_M_X64) // MSVC or Intel C compiler on Windows unsigned long tmp; @@ -112,8 +111,7 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2, // Generic 32-bit little endian method # define LZMA_MEMCMPLEN_EXTRA 4 while (len < limit) { - uint32_t x = unaligned_read32ne(buf1 + len) - - unaligned_read32ne(buf2 + len); + uint32_t x = read32ne(buf1 + len) - read32ne(buf2 + len); if (x != 0) { if ((x & 0xFFFF) == 0) { len += 2; @@ -135,8 +133,7 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2, // Generic 32-bit big endian method # define LZMA_MEMCMPLEN_EXTRA 4 while (len < limit) { - uint32_t x = unaligned_read32ne(buf1 + len) - ^ unaligned_read32ne(buf2 + len); + uint32_t x = read32ne(buf1 + len) ^ read32ne(buf2 + len); if (x != 0) { if ((x & 0xFFFF0000) == 0) { len += 2; |