diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-12-07 00:42:49 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-12-07 00:42:49 +0100 |
commit | e7800f351ad9eca012fe27a1c9234692a04419e7 (patch) | |
tree | 4b40f6fb63492c8325bb7b58c5812f0258adbb7b /archival/unzip.c | |
parent | 476654cdbeb2923fc5d2485701587b42579e1635 (diff) | |
download | busybox-w32-e7800f351ad9eca012fe27a1c9234692a04419e7.tar.gz busybox-w32-e7800f351ad9eca012fe27a1c9234692a04419e7.tar.bz2 busybox-w32-e7800f351ad9eca012fe27a1c9234692a04419e7.zip |
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 fcfc9a448..c622bde57 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) | |||
280 | bb_copyfd_exact_size(zip_fd, dst_fd, size); | 280 | bb_copyfd_exact_size(zip_fd, dst_fd, size); |
281 | } else { | 281 | } else { |
282 | /* Method 8 - inflate */ | 282 | /* Method 8 - inflate */ |
283 | transformer_aux_data_t aux; | 283 | transformer_state_t xstate; |
284 | init_transformer_aux_data(&aux); | 284 | init_transformer_state(&xstate); |
285 | aux.bytes_in = zip_header->formatted.cmpsize; | 285 | xstate.bytes_in = zip_header->formatted.cmpsize; |
286 | if (inflate_unzip(&aux, zip_fd, dst_fd) < 0) | 286 | if (inflate_unzip(&xstate, zip_fd, dst_fd) < 0) |
287 | bb_error_msg_and_die("inflate error"); | 287 | bb_error_msg_and_die("inflate error"); |
288 | /* Validate decompression - crc */ | 288 | /* Validate decompression - crc */ |
289 | if (zip_header->formatted.crc32 != (aux.crc32 ^ 0xffffffffL)) { | 289 | if (zip_header->formatted.crc32 != (xstate.crc32 ^ 0xffffffffL)) { |
290 | bb_error_msg_and_die("crc error"); | 290 | bb_error_msg_and_die("crc error"); |
291 | } | 291 | } |
292 | /* Validate decompression - size */ | 292 | /* Validate decompression - size */ |
293 | if (zip_header->formatted.ucmpsize != aux.bytes_out) { | 293 | if (zip_header->formatted.ucmpsize != xstate.bytes_out) { |
294 | /* Don't die. Who knows, maybe len calculation | 294 | /* Don't die. Who knows, maybe len calculation |
295 | * was botched somewhere. After all, crc matched! */ | 295 | * was botched somewhere. After all, crc matched! */ |
296 | bb_error_msg("bad length"); | 296 | bb_error_msg("bad length"); |