Clean up other compression/decompression code

[wimlib] / include / wimlib / xpress.h

diff --git a/include/wimlib/xpress.h b/include/wimlib/xpress.h
index c07dbae859aedebcf74d774e643068c387eed207..2b57bae7a05bca34e21e31de049f4bbed6e71cc8 100644 (file)
--- a/include/wimlib/xpress.h
+++ b/include/wimlib/xpress.h
@@ -1,13 +1,16 @@
 #ifndef _WIMLIB_XPRESS_H
 #define _WIMLIB_XPRESS_H
 
-/* See the comments in xpress-decompress.c about the XPRESS format. */
+/* Constants for the XPRESS data compression format.  See the comments in
+ * xpress-decompress.c for more information about this format.  */
 
 //#define ENABLE_XPRESS_DEBUG
 #ifdef ENABLE_XPRESS_DEBUG
 #      define XPRESS_DEBUG DEBUG
+#       define XPRESS_ASSERT wimlib_assert
 #else
 #      define XPRESS_DEBUG(format, ...)
+#      define XPRESS_ASSERT(...)
 #endif
 
 #define XPRESS_NUM_CHARS       256
@@ -20,7 +23,7 @@
 #define XPRESS_MIN_OFFSET      1
 #define XPRESS_MAX_OFFSET      65535
 
-#define XPRESS_MIN_MATCH       3
-#define XPRESS_MAX_MATCH       65538
+#define XPRESS_MIN_MATCH_LEN   3
+#define XPRESS_MAX_MATCH_LEN   65538
 
 #endif /* _WIMLIB_XPRESS_H */