Rename transformer_aux_data_t -> transformer_state_t

[oweals/busybox.git] / archival / unzip.c

diff --git a/archival/unzip.c b/archival/unzip.c
index fcfc9a44812e12f475fb14a74905c6a69832a0fa..c622bde57573d16c5c703ea1e293fbfb3d93b045 100644 (file)
--- 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");