emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename transformer_aux_data_t -> transformer_state_t

Browse Source 
No code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2014-12-07 00:42:49 +01:00
parent 476654cdbe
commit e7800f351a
13 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
archival/libarchive/decompress_gunzip.c
View File

@@ -1034,22 +1034,22 @@ inflate_unzip_internal(STATE_PARAM int in, int out)
/* For unzip */
IF_DESKTOP(long long) int FAST_FUNC
inflate_unzip(transformer_aux_data_t *aux, int in, int out)
inflate_unzip(transformer_state_t *xstate, int in, int out)
{
IF_DESKTOP(long long) int n;
DECLARE_STATE;
ALLOC_STATE;
to_read = aux->bytes_in;
to_read = xstate->bytes_in;
// bytebuffer_max = 0x8000;
bytebuffer_offset = 4;
bytebuffer = xmalloc(bytebuffer_max);
n = inflate_unzip_internal(PASS_STATE in, out);
free(bytebuffer);
aux->crc32 = gunzip_crc;
aux->bytes_out = gunzip_bytes_out;
xstate->crc32 = gunzip_crc;
xstate->bytes_out = gunzip_bytes_out;
DEALLOC_STATE;
return n;
}
@@ -1107,7 +1107,7 @@ static uint32_t buffer_read_le_u32(STATE_PARAM_ONLY)
return res;
}
static int check_header_gzip(STATE_PARAM transformer_aux_data_t *aux)
static int check_header_gzip(STATE_PARAM transformer_state_t *xstate)
{
union {
unsigned char raw[8];
@@ -1169,8 +1169,8 @@ static int check_header_gzip(STATE_PARAM transformer_aux_data_t *aux)
}
}
if (aux)
aux->mtime = SWAP_LE32(header.formatted.mtime);
if (xstate)
xstate->mtime = SWAP_LE32(header.formatted.mtime);
/* Read the header checksum */
if (header.formatted.flags & 0x02) {
@@ -1182,17 +1182,17 @@ static int check_header_gzip(STATE_PARAM transformer_aux_data_t *aux)
}
IF_DESKTOP(long long) int FAST_FUNC
unpack_gz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
unpack_gz_stream(transformer_state_t *xstate, int src_fd, int dst_fd)
{
uint32_t v32;
IF_DESKTOP(long long) int total, n;
DECLARE_STATE;
#if !ENABLE_FEATURE_SEAMLESS_Z
if (check_signature16(aux, src_fd, GZIP_MAGIC))
if (check_signature16(xstate, src_fd, GZIP_MAGIC))
return -1;
#else
if (aux && aux->check_signature) {
if (xstate && xstate->check_signature) {
uint16_t magic2;
if (full_read(src_fd, &magic2, 2) != 2) {
@@ -1201,8 +1201,8 @@ unpack_gz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
return -1;
}
if (magic2 == COMPRESS_MAGIC) {
aux->check_signature = 0;
return unpack_Z_stream(aux, src_fd, dst_fd);
xstate->check_signature = 0;
return unpack_Z_stream(xstate, src_fd, dst_fd);
}
if (magic2 != GZIP_MAGIC)
goto bad_magic;
@@ -1218,7 +1218,7 @@ unpack_gz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
gunzip_src_fd = src_fd;
again:
if (!check_header_gzip(PASS_STATE aux)) {
if (!check_header_gzip(PASS_STATE xstate)) {
bb_error_msg("corrupted data");
total = -1;
goto ret;