X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxpress-comp.c;h=057e016fb09eca8ee28d85477e39c2579502ad1e;hb=512d3f87a1e7b59ca19ae6d6965dbcf7f4a17c15;hp=9252eee1af21e9e0e9e8826645859d0a278d5643;hpb=81ea19151423fa87b8698dd3fa8a5274066a76c2;p=wimlib

diff --git a/src/xpress-comp.c b/src/xpress-comp.c
index 9252eee1..057e016f 100644
--- a/src/xpress-comp.c
+++ b/src/xpress-comp.c
@@ -3,27 +3,28 @@
  *
  * XPRESS compression routines.
  *
+ * See the comments in xpress-decomp.c about the XPRESS format.
+ */
+
+/*
  * Copyright (C) 2012 Eric Biggers
  *
- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.
  *
- * This library 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 2.1 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 library 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 Lesser General Public License along
- * with this library; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ * You should have received a copy of the GNU General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-/* See the comments in xpress-decomp.c about the XPRESS format. */
-
-
 #include "xpress.h"
 #include "comp.h"
 #include <stdlib.h>
@@ -189,7 +190,7 @@ int xpress_compress(const void *__uncompressed_data, uint uncompressed_len,
 	uint i;
 	int ret;
 
-	XPRESS_DEBUG("uncompressed_len = %u\n", uncompressed_len);
+	XPRESS_DEBUG("uncompressed_len = %u", uncompressed_len);
 
 	if (uncompressed_len < 300)
 		return 1;
@@ -202,7 +203,7 @@ int xpress_compress(const void *__uncompressed_data, uint uncompressed_len,
 					NULL, freq_tab,
 					&xpress_lz_params);
 
-	XPRESS_DEBUG("using %u matches\n", num_matches);
+	XPRESS_DEBUG("using %u matches", num_matches);
 
 	freq_tab[256]++;
 
@@ -239,32 +240,31 @@ int xpress_compress(const void *__uncompressed_data, uint uncompressed_len,
 
 	compressed_len = ostream.output - (u8*)__compressed_data;
 
-	XPRESS_DEBUG("Compressed %u => %u bytes\n",
-			uncompressed_len, compressed_len);
+	XPRESS_DEBUG("Compressed %u => %u bytes",
+		     uncompressed_len, compressed_len);
 
 	*compressed_len_ret = compressed_len;
 
 #ifdef ENABLE_VERIFY_COMPRESSION
 	/* Verify that we really get the same thing back when decompressing. */
-	XPRESS_DEBUG("Verifying the compressed data.\n");
+	XPRESS_DEBUG("Verifying the compressed data.");
 	u8 buf[uncompressed_len];
 	ret = xpress_decompress(__compressed_data, compressed_len, buf, 
 				uncompressed_len);
 	if (ret != 0) {
-		fprintf(stderr, "xpress_compress(): Failed to decompress data "
-				"we compressed!\n");
+		ERROR("xpress_compress(): Failed to decompress data we "
+		      "compressed");
 		abort();
 	}
 	for (i = 0; i < uncompressed_len; i++) {
 		if (buf[i] != uncompressed_data[i]) {
-			fprintf(stderr, "xpress_compress(): Data we compressed "
-					"didn't decompress to the original data "
-					"(difference at byte %u of %u)\n", 
-					i + 1, uncompressed_len);
+			ERROR("xpress_compress(): Data we compressed didn't "
+			      "decompress to the original data (difference at "
+			      "byte %u of %u)", i + 1, uncompressed_len);
 			abort();
 		}
 	}
-	XPRESS_DEBUG("Compression verified to be correct.\n");
+	XPRESS_DEBUG("Compression verified to be correct.");
 #endif
 
 	return 0;