root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xz: Move the setting of "check" in coder_set_compression_settings() 

It's more logical to do it in the beginning instead of in the middle
of the filter chain handling.

Fixes: d6af7f3470
(cherry picked from commit 32500dfaad)
This commit is contained in:
Lasse Collin 2024-05-12 17:14:43 +03:00
parent 067961ee0e
commit 3eb7cf9dd5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xz/coder.c
View File

@ -290,6 +290,15 @@ coder_set_compression_settings(void)
assert(opt_format != FORMAT_LZIP); assert(opt_format != FORMAT_LZIP);
#endif #endif
// The default check type is CRC64, but fallback to CRC32
// if CRC64 isn't supported by the copy of liblzma we are
// using. CRC32 is always supported.
if (check_default) {
check = LZMA_CHECK_CRC64;
if (!lzma_check_is_supported(check))
check = LZMA_CHECK_CRC32;
}
#ifdef HAVE_ENCODERS #ifdef HAVE_ENCODERS
if (opt_block_list != NULL) { if (opt_block_list != NULL) {
// args.c ensures these. // args.c ensures these.
@ -332,15 +341,6 @@ coder_set_compression_settings(void)
} }
#endif #endif
// The default check type is CRC64, but fallback to CRC32
// if CRC64 isn't supported by the copy of liblzma we are
// using. CRC32 is always supported.
if (check_default) {
check = LZMA_CHECK_CRC64;
if (!lzma_check_is_supported(check))
check = LZMA_CHECK_CRC32;
}
// Options for LZMA1 or LZMA2 in case we are using a preset. // Options for LZMA1 or LZMA2 in case we are using a preset.
static lzma_options_lzma opt_lzma; static lzma_options_lzma opt_lzma;