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

liblzma: Index hash: Change return value type of hash_append() to void.

This commit is contained in:
Lasse Collin 2022-03-06 15:18:58 +02:00
parent 7c3ce02df0
commit 4125667311
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/liblzma/common/index_hash.c
View File

@ -122,7 +122,7 @@ lzma_index_hash_size(const lzma_index_hash *index_hash)
/// Updates the sizes and the hash without any validation. /// Updates the sizes and the hash without any validation.
static lzma_ret static void
hash_append(lzma_index_hash_info *info, lzma_vli unpadded_size, hash_append(lzma_index_hash_info *info, lzma_vli unpadded_size,
lzma_vli uncompressed_size) lzma_vli uncompressed_size)
{ {
@ -136,7 +136,7 @@ hash_append(lzma_index_hash_info *info, lzma_vli unpadded_size,
lzma_check_update(&info->check, LZMA_CHECK_BEST, lzma_check_update(&info->check, LZMA_CHECK_BEST,
(const uint8_t *)(sizes), sizeof(sizes)); (const uint8_t *)(sizes), sizeof(sizes));
return LZMA_OK; return;
} }
@ -152,8 +152,7 @@ lzma_index_hash_append(lzma_index_hash *index_hash, lzma_vli unpadded_size,
return LZMA_PROG_ERROR; return LZMA_PROG_ERROR;
// Update the hash. // Update the hash.
return_if_error(hash_append(&index_hash->blocks, hash_append(&index_hash->blocks, unpadded_size, uncompressed_size);
unpadded_size, uncompressed_size));
// Validate the properties of *info are still in allowed limits. // Validate the properties of *info are still in allowed limits.
if (index_hash->blocks.blocks_size > LZMA_VLI_MAX if (index_hash->blocks.blocks_size > LZMA_VLI_MAX
@ -239,9 +238,9 @@ lzma_index_hash_decode(lzma_index_hash *index_hash, const uint8_t *in,
index_hash->sequence = SEQ_UNCOMPRESSED; index_hash->sequence = SEQ_UNCOMPRESSED;
} else { } else {
// Update the hash. // Update the hash.
return_if_error(hash_append(&index_hash->records, hash_append(&index_hash->records,
index_hash->unpadded_size, index_hash->unpadded_size,
index_hash->uncompressed_size)); index_hash->uncompressed_size);
// Verify that we don't go over the known sizes. Note // Verify that we don't go over the known sizes. Note
// that this validation is simpler than the one used // that this validation is simpler than the one used