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

Avoid unneeded function call in raw_common.c.

This commit is contained in:
Lasse Collin 2008-02-01 08:32:05 +02:00
parent b596fac963
commit 7dd48578a3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/liblzma/common/raw_common.c
View File

@ -28,7 +28,7 @@
/// \return true if error occurred, false on success. /// \return true if error occurred, false on success.
/// ///
static bool static bool
prepare(lzma_vli *id, lzma_vli *uncompressed_size, bool implicit) prepare(lzma_vli *id, lzma_vli *uncompressed_size, bool allow_implicit)
{ {
bool needs_end_of_input = false; bool needs_end_of_input = false;
@ -62,17 +62,19 @@ prepare(lzma_vli *id, lzma_vli *uncompressed_size, bool implicit)
// Is this the last filter in the chain? // Is this the last filter in the chain?
if (id[1] == LZMA_VLI_VALUE_UNKNOWN) { if (id[1] == LZMA_VLI_VALUE_UNKNOWN) {
if (!needs_end_of_input || !implicit || uncompressed_size[0] if (needs_end_of_input && allow_implicit
!= LZMA_VLI_VALUE_UNKNOWN) && uncompressed_size[0]
return false; == LZMA_VLI_VALUE_UNKNOWN) {
// Add implicit Subblock filter. // Add implicit Subblock filter.
id[1] = LZMA_FILTER_SUBBLOCK; id[1] = LZMA_FILTER_SUBBLOCK;
uncompressed_size[1] = LZMA_VLI_VALUE_UNKNOWN; uncompressed_size[1] = LZMA_VLI_VALUE_UNKNOWN;
id[2] = LZMA_VLI_VALUE_UNKNOWN; id[2] = LZMA_VLI_VALUE_UNKNOWN;
} }
return prepare(id + 1, uncompressed_size + 1, implicit); return false;
}
return prepare(id + 1, uncompressed_size + 1, allow_implicit);
} }