From 6acd361e1439ace91468735bd286d69d23fd86af Mon Sep 17 00:00:00 2001 From: Wiimm Date: Tue, 24 Oct 2023 19:17:33 +0200 Subject: SZS v2.39a --- project/src/lib-szs.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'project/src/lib-szs.c') diff --git a/project/src/lib-szs.c b/project/src/lib-szs.c index 639bcc5..06eda8c 100644 --- a/project/src/lib-szs.c +++ b/project/src/lib-szs.c @@ -2208,6 +2208,12 @@ enumError CompressBZ ( szs_file_t * szs, int compr, bool remove_uncompressed ) if ( !szs->size || !szs->data || szs->cdata ) return ERR_OK; + if ( compr < 1 || compr == BZIP2_DEFAULT_COMPR ) + { + if (CheckSZSCacheSZS(szs,FF_BZ,".bz",remove_uncompressed)) + return ERR_OK; + } + c_bzip2_t c = get_compressed_bzip2(szs,sizeof(wbz_header_t),compr); if (c.err) return c.err; @@ -2341,7 +2347,13 @@ enumError CompressLZ ( szs_file_t * szs, int compr, bool remove_uncompressed ) else if (!compr) compr = opt_compr_mode > 0 ? opt_compr : LZMA_DEFAULT_COMPR; compr = CalcCompressionLevelLZMA(compr); - PRINT0(" => USE LZMA COMPRESSION %u\n",compr); + PRINT0(" => USE LZ COMPRESSION %u\n",compr); + + if ( compr == LZMA_DEFAULT_COMPR + && CheckSZSCacheSZS(szs,FF_LZ,".lz",remove_uncompressed)) + { + return ERR_OK; + } u8 *cdata; uint csize; @@ -2410,7 +2422,6 @@ enumError CompressLZMA ( szs_file_t * szs, int compr, bool remove_uncompressed ) else if (!compr) compr = opt_compr_mode > 0 ? opt_compr : LZMA_DEFAULT_COMPR; compr = CalcCompressionLevelLZMA(compr); - PRINT0(" => USE LZMA COMPRESSION %u\n",compr); if ( compr == LZMA_DEFAULT_COMPR -- cgit v1.3.1