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

Take advantage of return_if_error() macro in 

lzma_info_metadata_set() in info.c.
This commit is contained in:
Lasse Collin 2008-01-23 00:21:04 +02:00
parent 863028cb7a
commit 67321de963
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/liblzma/common/info.c
View File

@ -406,28 +406,20 @@ lzma_info_metadata_set(lzma_info *info, lzma_allocator *allocator,
const lzma_vli size = metadata->header_metadata_size
!= LZMA_VLI_VALUE_UNKNOWN
? metadata->header_metadata_size : 0;
const lzma_ret ret = lzma_info_size_set(
info, LZMA_INFO_HEADER_METADATA, size);
if (ret != LZMA_OK)
return ret;
return_if_error(lzma_info_size_set(
info, LZMA_INFO_HEADER_METADATA, size));
}
// Total Size
if (metadata->total_size != LZMA_VLI_VALUE_UNKNOWN) {
const lzma_ret ret = lzma_info_size_set(info,
LZMA_INFO_TOTAL, metadata->total_size);
if (ret != LZMA_OK)
return ret;
}
if (metadata->total_size != LZMA_VLI_VALUE_UNKNOWN)
return_if_error(lzma_info_size_set(info,
LZMA_INFO_TOTAL, metadata->total_size));
// Uncompressed Size
if (metadata->uncompressed_size != LZMA_VLI_VALUE_UNKNOWN) {
const lzma_ret ret = lzma_info_size_set(info,
if (metadata->uncompressed_size != LZMA_VLI_VALUE_UNKNOWN)
return_if_error(lzma_info_size_set(info,
LZMA_INFO_UNCOMPRESSED,
metadata->uncompressed_size);
if (ret != LZMA_OK)
return ret;
}
metadata->uncompressed_size));
return LZMA_OK;
}