X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcompress_serial.c;h=b5eb951d8e0391a014311faa44481e3fede60bb5;hb=1afd794e3feb32e2984cc709213ad75232736003;hp=20e069c075358f804a12bed2bf8e21eaf5f615e2;hpb=f675c45459508d058aeda4869e2928be4b7ffd99;p=wimlib

diff --git a/src/compress_serial.c b/src/compress_serial.c
index 20e069c0..b5eb951d 100644
--- a/src/compress_serial.c
+++ b/src/compress_serial.c
@@ -7,39 +7,37 @@
 /*
  * Copyright (C) 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
  *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <string.h>
+
 #include "wimlib.h"
 #include "wimlib/assert.h"
 #include "wimlib/chunk_compressor.h"
 #include "wimlib/util.h"
 
-#include <string.h>
-
 struct serial_chunk_compressor {
 	struct chunk_compressor base;
 	struct wimlib_compressor *compressor;
 	u8 *udata;
 	u8 *cdata;
 	u32 ulen;
-	u32 clen;
 };
 
 static void
@@ -58,7 +56,7 @@ serial_chunk_compressor_destroy(struct chunk_compressor *_ctx)
 
 static bool
 serial_chunk_compressor_submit_chunk(struct chunk_compressor *_ctx,
-				     const void *chunk, size_t size)
+				     const void *chunk, u32 size)
 {
 	struct serial_chunk_compressor *ctx = (struct serial_chunk_compressor*)_ctx;
 
@@ -79,17 +77,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 +119,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;