Remove WIMLIB_COMPRESSION_TYPE_INVALID from library

[wimlib] / include / wimlib / header.h

diff --git a/include/wimlib/header.h b/include/wimlib/header.h
index 34e910cbb15fe1b338ce132bd053f6dadf70eebc..290e0b2cda2ed28544f0225c6c015ebee10110b1 100644 (file)
--- a/include/wimlib/header.h
+++ b/include/wimlib/header.h
@@ -5,8 +5,10 @@
 #include "wimlib/types.h"
 #include "wimlib/endianness.h"
 
+#include <limits.h>
+
 /* Length of "Globally Unique ID" field in WIM header.  */
-#define WIM_GID_LEN    16
+#define WIM_GUID_LEN    16
 
 /* Length of the WIM header on disk.  wimlib currently requires that the header
  * be exactly this size.  */
@@ -73,7 +75,7 @@ struct wim_header_disk {
 
        /* +0x18: Globally unique identifier for the WIM file.  Basically a
         * bunch of random bytes.  */
-       u8 guid[WIM_GID_LEN];
+       u8 guid[WIM_GUID_LEN];
 
        /* +0x28: Number of this WIM part in the split WIM file, indexed from 1,
         * or 1 if the WIM is not split.  */
@@ -115,6 +117,7 @@ struct wim_header_disk {
        /* +0xd0 (208)  */
 } _packed_attribute;
 
+#define MAX_IMAGES (((INT_MAX < INT32_MAX) ? INT_MAX : INT32_MAX) - 1)
 
 /* In-memory representation of a WIM header.  See `struct wim_header_disk' for
  * field descriptions.  */
@@ -123,7 +126,7 @@ struct wim_header {
        u32 wim_version;
        u32 flags;
        u32 chunk_size;
-       u8 guid[WIM_GID_LEN];
+       u8 guid[WIM_GUID_LEN];
        u16 part_number;
        u16 total_parts;
        u32 image_count;
@@ -190,4 +193,7 @@ struct wim_header {
  * wimlib v1.6.0 and later and WIMGAPI Windows 8 and later.  */
 #define WIM_HDR_FLAG_COMPRESS_LZMS      0x00080000
 
+/* XPRESS, with small chunk size???  */
+#define WIM_HDR_FLAG_COMPRESS_XPRESS_2 0x00200000
+
 #endif /* _WIMLIB_HEADER_H */