avl_tree: Fix comments

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index feea7c68c0b6ecc4418976ada0782246e41d2e13..0f9555195238e170aee895c640f96f9292b4cb80 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -89,8 +89,10 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
        if (ret)
                goto read_error;
 
-       if (disk_hdr.magic != WIM_MAGIC) {
-               if (disk_hdr.magic == PWM_MAGIC) {
+       hdr->magic = le64_to_cpu(disk_hdr.magic);
+
+       if (hdr->magic != WIM_MAGIC) {
+               if (hdr->magic == PWM_MAGIC) {
                        /* Pipable WIM:  Use header at end instead, unless
                         * actually reading from a pipe.  */
                        if (!in_fd->is_pipe) {
@@ -104,7 +106,6 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
                        return WIMLIB_ERR_NOT_A_WIM_FILE;
                }
        }
-       hdr->magic = disk_hdr.magic;
 
        if (le32_to_cpu(disk_hdr.hdr_size) != sizeof(struct wim_header_disk)) {
                ERROR("\"%"TS"\": Header size is invalid (%u bytes)",
@@ -114,7 +115,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 
        hdr->wim_version = le32_to_cpu(disk_hdr.wim_version);
        if (hdr->wim_version != WIM_VERSION_DEFAULT &&
-           hdr->wim_version != WIM_VERSION_STREAM_CONCAT)
+           hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
        {
                ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
                return WIMLIB_ERR_UNKNOWN_VERSION;
@@ -171,7 +172,7 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
              ((hdr->magic == PWM_MAGIC) ? "pipable " : ""),
              offset);
 
-       disk_hdr.magic = hdr->magic;
+       disk_hdr.magic = cpu_to_le64(hdr->magic);
        disk_hdr.hdr_size = cpu_to_le32(sizeof(struct wim_header_disk));
        disk_hdr.wim_version = cpu_to_le32(hdr->wim_version);
        disk_hdr.wim_flags = cpu_to_le32(hdr->flags);
@@ -256,7 +257,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;
@@ -273,7 +278,7 @@ struct hdr_flag {
        const char *name;
 };
 struct hdr_flag hdr_flags[] = {
-       {WIM_HDR_FLAG_RESERVED,         "RESERVED"},
+       {WIM_HDR_FLAG_RESERVED,         "RESERVED"},
        {WIM_HDR_FLAG_COMPRESSION,      "COMPRESSION"},
        {WIM_HDR_FLAG_READONLY,         "READONLY"},
        {WIM_HDR_FLAG_SPANNED,          "SPANNED"},