X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcompress_serial.c;h=01187ad383f2f2a8c4ad7f6bc54aca5ea4a158fd;hb=337c5372b2c013ddd73e93bc96feaf5dfe6266d9;hp=7885a97e286b7795bd6f21ff7b2f35caa4e81aae;hpb=72a2079aa02bcb86051dc527cc1c21fc77bc3695;p=wimlib diff --git a/src/compress_serial.c b/src/compress_serial.c index 7885a97e..01187ad3 100644 --- a/src/compress_serial.c +++ b/src/compress_serial.c @@ -39,7 +39,6 @@ struct serial_chunk_compressor { u8 *udata; u8 *cdata; u32 ulen; - u32 clen; }; static void @@ -79,17 +78,18 @@ serial_chunk_compressor_get_chunk(struct chunk_compressor *_ctx, u32 *usize_ret) { struct serial_chunk_compressor *ctx = (struct serial_chunk_compressor*)_ctx; + u32 clen; if (ctx->ulen == 0) return false; - ctx->clen = wimlib_compress(ctx->udata, ctx->ulen, - ctx->cdata, ctx->ulen - 1, - ctx->compressor); + clen = wimlib_compress(ctx->udata, ctx->ulen, + ctx->cdata, ctx->ulen - 1, + ctx->compressor); - if (ctx->clen) { + if (clen) { *cdata_ret = ctx->cdata; - *csize_ret = ctx->clen; + *csize_ret = clen; } else { *cdata_ret = ctx->udata; *csize_ret = ctx->ulen; @@ -120,9 +120,8 @@ new_serial_chunk_compressor(int out_ctype, u32 out_chunk_size, ctx->base.submit_chunk = serial_chunk_compressor_submit_chunk; ctx->base.get_chunk = serial_chunk_compressor_get_chunk; - ret = wimlib_create_compressor(out_ctype, out_chunk_size, - NULL, &ctx->compressor); + 0, &ctx->compressor); if (ret) goto err;