diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2019-12-31 00:41:28 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2019-12-31 00:47:49 +0200 |
| commit | 7136f1735c60ac6967c4b8e277fcde53d485234f (patch) | |
| tree | 97cbabc12a7877ac133ee039257befa1d97fd26b /src/liblzma/lzma | |
| parent | Rename read32ne to aligned_read32ne, and similarly for the others. (diff) | |
| download | xz-7136f1735c60ac6967c4b8e277fcde53d485234f.tar.xz | |
Rename unaligned_read32ne to read32ne, and similarly for the others.
Diffstat (limited to 'src/liblzma/lzma')
| -rw-r--r-- | src/liblzma/lzma/lzma_decoder.c | 2 | ||||
| -rw-r--r-- | src/liblzma/lzma/lzma_encoder.c | 2 | ||||
| -rw-r--r-- | src/liblzma/lzma/lzma_encoder_private.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/liblzma/lzma/lzma_decoder.c b/src/liblzma/lzma/lzma_decoder.c index 9af500f0..e605a0a9 100644 --- a/src/liblzma/lzma/lzma_decoder.c +++ b/src/liblzma/lzma/lzma_decoder.c @@ -1049,7 +1049,7 @@ lzma_lzma_props_decode(void **options, const lzma_allocator *allocator, // All dictionary sizes are accepted, including zero. LZ decoder // will automatically use a dictionary at least a few KiB even if // a smaller dictionary is requested. - opt->dict_size = unaligned_read32le(props + 1); + opt->dict_size = read32le(props + 1); opt->preset_dict = NULL; opt->preset_dict_size = 0; diff --git a/src/liblzma/lzma/lzma_encoder.c b/src/liblzma/lzma/lzma_encoder.c index ba9ce698..07d2b87b 100644 --- a/src/liblzma/lzma/lzma_encoder.c +++ b/src/liblzma/lzma/lzma_encoder.c @@ -663,7 +663,7 @@ lzma_lzma_props_encode(const void *options, uint8_t *out) if (lzma_lzma_lclppb_encode(opt, out)) return LZMA_PROG_ERROR; - unaligned_write32le(out + 1, opt->dict_size); + write32le(out + 1, opt->dict_size); return LZMA_OK; } diff --git a/src/liblzma/lzma/lzma_encoder_private.h b/src/liblzma/lzma/lzma_encoder_private.h index e3d79429..2e34aace 100644 --- a/src/liblzma/lzma/lzma_encoder_private.h +++ b/src/liblzma/lzma/lzma_encoder_private.h @@ -25,8 +25,7 @@ // MATCH_LEN_MIN bytes. Unaligned access gives tiny gain so there's no // reason to not use it when it is supported. #ifdef TUKLIB_FAST_UNALIGNED_ACCESS -# define not_equal_16(a, b) \ - (unaligned_read16ne(a) != unaligned_read16ne(b)) +# define not_equal_16(a, b) (read16ne(a) != read16ne(b)) #else # define not_equal_16(a, b) \ ((a)[0] != (b)[0] || (a)[1] != (b)[1]) |