diff options
| author | Denys Vlasenko | 2014-12-07 00:42:49 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2014-12-07 00:42:49 +0100 |
| commit | e7800f351ad9eca012fe27a1c9234692a04419e7 (patch) | |
| tree | 4b40f6fb63492c8325bb7b58c5812f0258adbb7b /archival/unzip.c | |
| parent | 476654cdbeb2923fc5d2485701587b42579e1635 (diff) | |
| download | busybox-e7800f351ad9eca012fe27a1c9234692a04419e7.zip busybox-e7800f351ad9eca012fe27a1c9234692a04419e7.tar.gz | |
Rename transformer_aux_data_t -> transformer_state_t
No code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/unzip.c')
| -rw-r--r-- | archival/unzip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index fcfc9a4..c622bde 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -280,17 +280,17 @@ static void unzip_extract(zip_header_t *zip_header, int dst_fd) bb_copyfd_exact_size(zip_fd, dst_fd, size); } else { /* Method 8 - inflate */ - transformer_aux_data_t aux; - init_transformer_aux_data(&aux); - aux.bytes_in = zip_header->formatted.cmpsize; - if (inflate_unzip(&aux, zip_fd, dst_fd) < 0) + transformer_state_t xstate; + init_transformer_state(&xstate); + xstate.bytes_in = zip_header->formatted.cmpsize; + if (inflate_unzip(&xstate, zip_fd, dst_fd) < 0) bb_error_msg_and_die("inflate error"); /* Validate decompression - crc */ - if (zip_header->formatted.crc32 != (aux.crc32 ^ 0xffffffffL)) { + if (zip_header->formatted.crc32 != (xstate.crc32 ^ 0xffffffffL)) { bb_error_msg_and_die("crc error"); } /* Validate decompression - size */ - if (zip_header->formatted.ucmpsize != aux.bytes_out) { + if (zip_header->formatted.ucmpsize != xstate.bytes_out) { /* Don't die. Who knows, maybe len calculation * was botched somewhere. After all, crc matched! */ bb_error_msg("bad length"); |