Fix a few format strings

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index 90d40ded2b17f8284ec0d0ca638f42ab2231393c..e4c6d67c092aa98a1ac3dc71f5cf4ce5090f4a15 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -117,7 +117,8 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
        if (hdr->wim_version != WIM_VERSION_DEFAULT &&
            hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
        {
-               ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
+               ERROR("\"%"TS"\": Unknown WIM version: %u",
+                     filename, hdr->wim_version);
                return WIMLIB_ERR_UNKNOWN_VERSION;
        }
 
@@ -226,7 +227,8 @@ set_wim_hdr_cflags(int ctype, struct wim_header *hdr)
                        WIM_HDR_FLAG_COMPRESS_LZX |
                        WIM_HDR_FLAG_COMPRESS_RESERVED |
                        WIM_HDR_FLAG_COMPRESS_XPRESS |
-                       WIM_HDR_FLAG_COMPRESS_LZMS);
+                       WIM_HDR_FLAG_COMPRESS_LZMS |
+                       WIM_HDR_FLAG_COMPRESS_XPRESS_2);
        switch (ctype) {
 
        case WIMLIB_COMPRESSION_TYPE_NONE:
@@ -257,7 +259,11 @@ init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
 {
        memset(hdr, 0, sizeof(struct wim_header));
        hdr->magic = WIM_MAGIC;
-       hdr->wim_version = WIM_VERSION_DEFAULT;
+
+       if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
+               hdr->wim_version = WIM_VERSION_PACKED_STREAMS;
+       else
+               hdr->wim_version = WIM_VERSION_DEFAULT;
        if (set_wim_hdr_cflags(ctype, hdr)) {
                ERROR("Invalid compression type specified (%d)", ctype);
                return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
@@ -285,6 +291,8 @@ struct hdr_flag hdr_flags[] = {
        {WIM_HDR_FLAG_COMPRESS_RESERVED,"COMPRESS_RESERVED"},
        {WIM_HDR_FLAG_COMPRESS_LZX,     "COMPRESS_LZX"},
        {WIM_HDR_FLAG_COMPRESS_XPRESS,  "COMPRESS_XPRESS"},
+       {WIM_HDR_FLAG_COMPRESS_LZMS,    "COMPRESS_LZMS"},
+       {WIM_HDR_FLAG_COMPRESS_XPRESS_2,"COMPRESS_XPRESS_2"},
 };
 
 /* API function documented in wimlib.h  */