inode/blob cleanups

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index e223ce9fa291f1e3756fa0eae2c400cadf1c6996..21dec59a9345a55322c5a6b94cb5538827d76c4e 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -7,27 +7,30 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file 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 3 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.
- *
- * 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
+ * This file 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "wimlib.h"
+#include "wimlib/alloca.h"
 #include "wimlib/assert.h"
 #include "wimlib/endianness.h"
 #include "wimlib/error.h"
@@ -36,15 +39,6 @@
 #include "wimlib/util.h"
 #include "wimlib/wim.h"
 
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#else
-#  include <stdlib.h>
-#endif
-
 /*
  * Reads the header from a WIM file.
  *
@@ -117,7 +111,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_PACKED_STREAMS)
+           hdr->wim_version != WIM_VERSION_SOLID)
        {
                ERROR("\"%"TS"\": Unknown WIM version: %u",
                      filename, hdr->wim_version);
@@ -149,7 +143,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
                return WIMLIB_ERR_IMAGE_COUNT;
        }
 
-       get_wim_reshdr(&disk_hdr.lookup_table_reshdr, &hdr->lookup_table_reshdr);
+       get_wim_reshdr(&disk_hdr.blob_table_reshdr, &hdr->blob_table_reshdr);
        get_wim_reshdr(&disk_hdr.xml_data_reshdr, &hdr->xml_data_reshdr);
        get_wim_reshdr(&disk_hdr.boot_metadata_reshdr, &hdr->boot_metadata_reshdr);
        hdr->boot_idx = le32_to_cpu(disk_hdr.boot_idx);
@@ -188,7 +182,7 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
        disk_hdr.part_number = cpu_to_le16(hdr->part_number);
        disk_hdr.total_parts = cpu_to_le16(hdr->total_parts);
        disk_hdr.image_count = cpu_to_le32(hdr->image_count);
-       put_wim_reshdr(&hdr->lookup_table_reshdr, &disk_hdr.lookup_table_reshdr);
+       put_wim_reshdr(&hdr->blob_table_reshdr, &disk_hdr.blob_table_reshdr);
        put_wim_reshdr(&hdr->xml_data_reshdr, &disk_hdr.xml_data_reshdr);
        put_wim_reshdr(&hdr->boot_metadata_reshdr, &disk_hdr.boot_metadata_reshdr);
        disk_hdr.boot_idx = cpu_to_le32(hdr->boot_idx);
@@ -263,7 +257,7 @@ init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
        hdr->magic = WIM_MAGIC;
 
        if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
-               hdr->wim_version = WIM_VERSION_PACKED_STREAMS;
+               hdr->wim_version = WIM_VERSION_SOLID;
        else
                hdr->wim_version = WIM_VERSION_DEFAULT;
        if (set_wim_hdr_cflags(ctype, hdr)) {
@@ -319,14 +313,14 @@ wimlib_print_header(const WIMStruct *wim)
        tprintf(T("Part Number                 = %hu\n"), hdr->part_number);
        tprintf(T("Total Parts                 = %hu\n"), hdr->total_parts);
        tprintf(T("Image Count                 = %u\n"), hdr->image_count);
-       tprintf(T("Lookup Table Size           = %"PRIu64"\n"),
-                               (u64)hdr->lookup_table_reshdr.size_in_wim);
-       tprintf(T("Lookup Table Flags          = 0x%hhx\n"),
-                               (u8)hdr->lookup_table_reshdr.flags);
-       tprintf(T("Lookup Table Offset         = %"PRIu64"\n"),
-                               hdr->lookup_table_reshdr.offset_in_wim);
-       tprintf(T("Lookup Table Original_size  = %"PRIu64"\n"),
-                               hdr->lookup_table_reshdr.uncompressed_size);
+       tprintf(T("Blob Table Size             = %"PRIu64"\n"),
+                               (u64)hdr->blob_table_reshdr.size_in_wim);
+       tprintf(T("Blob Table Flags            = 0x%hhx\n"),
+                               (u8)hdr->blob_table_reshdr.flags);
+       tprintf(T("Blob Table Offset           = %"PRIu64"\n"),
+                               hdr->blob_table_reshdr.offset_in_wim);
+       tprintf(T("Blob Table Original_size    = %"PRIu64"\n"),
+                               hdr->blob_table_reshdr.uncompressed_size);
        tprintf(T("XML Data Size               = %"PRIu64"\n"),
                                (u64)hdr->xml_data_reshdr.size_in_wim);
        tprintf(T("XML Data Flags              = 0x%hhx\n"),