aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma/common/memcmplen.h
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2019-12-31 00:41:28 +0200
committerLasse Collin <lasse.collin@tukaani.org>2019-12-31 00:47:49 +0200
commit7136f1735c60ac6967c4b8e277fcde53d485234f (patch)
tree97cbabc12a7877ac133ee039257befa1d97fd26b /src/liblzma/common/memcmplen.h
parentRename read32ne to aligned_read32ne, and similarly for the others. (diff)
downloadxz-7136f1735c60ac6967c4b8e277fcde53d485234f.tar.xz
Rename unaligned_read32ne to read32ne, and similarly for the others.
Diffstat (limited to '')
-rw-r--r--src/liblzma/common/memcmplen.h9
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;