Fix glob()

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index bb17209117d6f74e03198447bad08981accfa8e4..7ac84160d210828901c06b2c2c78141e01043b20 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -5,8 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010 Carl Thijssen
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -25,7 +24,7 @@
  */
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
 #include <limits.h>
 
 /* First 8 bytes in every WIM file. */
@@ -114,8 +113,8 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
                return WIMLIB_ERR_INVALID_PART_NUMBER;
        }
 
-       if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK)
-           && (hdr->part_number != 1 || hdr->total_parts != 1))
+       if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK) &&
+           hdr->total_parts != 1)
        {
                ERROR("This WIM is part %u of a %u-part WIM",
                      hdr->part_number, hdr->total_parts);
@@ -275,7 +274,7 @@ WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
        printf("Lookup Table Size           = %"PRIu64"\n",
                                (u64)hdr->lookup_table_res_entry.size);
        printf("Lookup Table Flags          = 0x%hhx\n",
-                               hdr->lookup_table_res_entry.flags);
+                               (u8)hdr->lookup_table_res_entry.flags);
        printf("Lookup Table Offset         = %"PRIu64"\n",
                                hdr->lookup_table_res_entry.offset);
        printf("Lookup Table Original_size  = %"PRIu64"\n",
@@ -283,7 +282,7 @@ WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
        printf("XML Data Size               = %"PRIu64"\n",
                                (u64)hdr->xml_res_entry.size);
        printf("XML Data Flags              = 0x%hhx\n",
-                               hdr->xml_res_entry.flags);
+                               (u8)hdr->xml_res_entry.flags);
        printf("XML Data Offset             = %"PRIu64"\n",
                                hdr->xml_res_entry.offset);
        printf("XML Data Original Size      = %"PRIu64"\n",
@@ -291,18 +290,18 @@ WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
        printf("Boot Metadata Size          = %"PRIu64"\n",
                                (u64)hdr->boot_metadata_res_entry.size);
        printf("Boot Metadata Flags         = 0x%hhx\n",
-                               hdr->boot_metadata_res_entry.flags);
+                               (u8)hdr->boot_metadata_res_entry.flags);
        printf("Boot Metadata Offset        = %"PRIu64"\n",
                                hdr->boot_metadata_res_entry.offset);
        printf("Boot Metadata Original Size = %"PRIu64"\n",
                                hdr->boot_metadata_res_entry.original_size);
        printf("Boot Index                  = %u\n", hdr->boot_idx);
        printf("Integrity Size              = %"PRIu64"\n",
-                                       (u64)hdr->integrity.size);
+                               (u64)hdr->integrity.size);
        printf("Integrity Flags             = 0x%hhx\n",
-                                       hdr->integrity.flags);
+                               (u8)hdr->integrity.flags);
        printf("Integrity Offset            = %"PRIu64"\n",
-                                       hdr->integrity.offset);
+                               hdr->integrity.offset);
        printf("Integrity Original_size     = %"PRIu64"\n",
-                                       hdr->integrity.original_size);
+                               hdr->integrity.original_size);
 }