From b56bc8251d2736224af6bdaaae734ceb8926a879 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Mon, 14 Nov 2022 23:19:57 +0200 Subject: [PATCH] Revert "liblzma: Simple/BCJ filters: Allow disabling generic BCJ options." This reverts commit 177bdc922cb17bd0fd831ab8139dfae912a5c2b8 and also does equivalent change to arm64.c. Now that ARM64 filter will use lzma_options_bcj, this change is not needed anymore. --- src/liblzma/simple/arm.c | 2 +- src/liblzma/simple/arm64.c | 2 +- src/liblzma/simple/armthumb.c | 2 +- src/liblzma/simple/ia64.c | 2 +- src/liblzma/simple/powerpc.c | 2 +- src/liblzma/simple/simple_coder.c | 4 ++-- src/liblzma/simple/simple_private.h | 2 +- src/liblzma/simple/sparc.c | 2 +- src/liblzma/simple/x86.c | 3 +-- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/liblzma/simple/arm.c b/src/liblzma/simple/arm.c index 1b8e24ac..ff5073ae 100644 --- a/src/liblzma/simple/arm.c +++ b/src/liblzma/simple/arm.c @@ -49,7 +49,7 @@ arm_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &arm_code, 0, 4, 4, is_encoder, true); + &arm_code, 0, 4, 4, is_encoder); } diff --git a/src/liblzma/simple/arm64.c b/src/liblzma/simple/arm64.c index 05b4be29..f7ad6578 100644 --- a/src/liblzma/simple/arm64.c +++ b/src/liblzma/simple/arm64.c @@ -145,7 +145,7 @@ arm64_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &arm64_code, 0, 4, 4, is_encoder, true); + &arm64_code, 0, 4, 4, is_encoder); } diff --git a/src/liblzma/simple/armthumb.c b/src/liblzma/simple/armthumb.c index c559368e..a8da334a 100644 --- a/src/liblzma/simple/armthumb.c +++ b/src/liblzma/simple/armthumb.c @@ -54,7 +54,7 @@ armthumb_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &armthumb_code, 0, 4, 2, is_encoder, true); + &armthumb_code, 0, 4, 2, is_encoder); } diff --git a/src/liblzma/simple/ia64.c b/src/liblzma/simple/ia64.c index 6ca1a91b..6492d0a3 100644 --- a/src/liblzma/simple/ia64.c +++ b/src/liblzma/simple/ia64.c @@ -90,7 +90,7 @@ ia64_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &ia64_code, 0, 16, 16, is_encoder, true); + &ia64_code, 0, 16, 16, is_encoder); } diff --git a/src/liblzma/simple/powerpc.c b/src/liblzma/simple/powerpc.c index 51fa550a..0b60e9b3 100644 --- a/src/liblzma/simple/powerpc.c +++ b/src/liblzma/simple/powerpc.c @@ -54,7 +54,7 @@ powerpc_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &powerpc_code, 0, 4, 4, is_encoder, true); + &powerpc_code, 0, 4, 4, is_encoder); } diff --git a/src/liblzma/simple/simple_coder.c b/src/liblzma/simple/simple_coder.c index 59018366..4f499bef 100644 --- a/src/liblzma/simple/simple_coder.c +++ b/src/liblzma/simple/simple_coder.c @@ -237,7 +237,7 @@ lzma_simple_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, size_t (*filter)(void *simple, uint32_t now_pos, bool is_encoder, uint8_t *buffer, size_t size), size_t simple_size, size_t unfiltered_max, - uint32_t alignment, bool is_encoder, bool is_generic_bcj) + uint32_t alignment, bool is_encoder) { // Allocate memory for the lzma_simple_coder structure if needed. lzma_simple_coder *coder = next->coder; @@ -270,7 +270,7 @@ lzma_simple_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, } } - if (is_generic_bcj && filters[0].options != NULL) { + if (filters[0].options != NULL) { const lzma_options_bcj *simple = filters[0].options; coder->now_pos = simple->start_offset; if (coder->now_pos & (alignment - 1)) diff --git a/src/liblzma/simple/simple_private.h b/src/liblzma/simple/simple_private.h index 108f9ced..9d2c0fdd 100644 --- a/src/liblzma/simple/simple_private.h +++ b/src/liblzma/simple/simple_private.h @@ -69,6 +69,6 @@ extern lzma_ret lzma_simple_coder_init(lzma_next_coder *next, size_t (*filter)(void *simple, uint32_t now_pos, bool is_encoder, uint8_t *buffer, size_t size), size_t simple_size, size_t unfiltered_max, - uint32_t alignment, bool is_encoder, bool is_generic_bcj); + uint32_t alignment, bool is_encoder); #endif diff --git a/src/liblzma/simple/sparc.c b/src/liblzma/simple/sparc.c index 96934d04..74b2655f 100644 --- a/src/liblzma/simple/sparc.c +++ b/src/liblzma/simple/sparc.c @@ -61,7 +61,7 @@ sparc_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { return lzma_simple_coder_init(next, allocator, filters, - &sparc_code, 0, 4, 4, is_encoder, true); + &sparc_code, 0, 4, 4, is_encoder); } diff --git a/src/liblzma/simple/x86.c b/src/liblzma/simple/x86.c index 0e682922..0e78909c 100644 --- a/src/liblzma/simple/x86.c +++ b/src/liblzma/simple/x86.c @@ -128,8 +128,7 @@ x86_coder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, bool is_encoder) { const lzma_ret ret = lzma_simple_coder_init(next, allocator, filters, - &x86_code, sizeof(lzma_simple_x86), 5, 1, is_encoder, - true); + &x86_code, sizeof(lzma_simple_x86), 5, 1, is_encoder); if (ret == LZMA_OK) { lzma_simple_coder *coder = next->coder;