Modify treatment of metadata entries

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index 0654fb0aa1e561c7344e2c992c954795a867a263..bd2a0631ea31460eb57daef87af9c22c34d1ce0f 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013 Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -32,7 +32,8 @@ static const u8 wim_magic_chars[WIM_MAGIC_LEN] = {
                        'M', 'S', 'W', 'I', 'M', '\0', '\0', '\0' };
 
 /* Reads the header for a WIM file.  */
-int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
+int
+read_header(FILE *fp, struct wim_header *hdr, int open_flags)
 {
        size_t bytes_read;
        u8 buf[WIM_HEADER_DISK_SIZE];
@@ -169,7 +170,8 @@ err:
  *             place (the beginning of the file).
  * @return:    Zero on success, nonzero on failure.
  */
-int write_header(const struct wim_header *hdr, FILE *out_fp)
+int
+write_header(const struct wim_header *hdr, FILE *out_fp)
 {
        u8 buf[WIM_HEADER_DISK_SIZE];
        u8 *p;
@@ -207,7 +209,8 @@ int write_header(const struct wim_header *hdr, FILE *out_fp)
 /*
  * Initializes the header for a WIM file.
  */
-int init_header(struct wim_header *hdr, int ctype)
+int
+init_header(struct wim_header *hdr, int ctype)
 {
        memset(hdr, 0, sizeof(struct wim_header));
        switch (ctype) {
@@ -251,57 +254,58 @@ struct hdr_flag hdr_flags[] = {
 };
 
 /* Prints information from the header of the WIM file associated with @w. */
-WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
+WIMLIBAPI void
+wimlib_print_header(const WIMStruct *w)
 {
        const struct wim_header *hdr = &w->hdr;
 
-       printf("Magic Characters            = MSWIM\\000\\000\\000\n");
-       printf("Header Size                 = %u\n", WIM_HEADER_DISK_SIZE);
-       printf("Version                     = 0x%x\n", WIM_VERSION);
+       tprintf(T("Magic Characters            = MSWIM\\000\\000\\000\n"));
+       tprintf(T("Header Size                 = %u\n"), WIM_HEADER_DISK_SIZE);
+       tprintf(T("Version                     = 0x%x\n"), WIM_VERSION);
 
-       printf("Flags                       = 0x%x\n", hdr->flags);
+       tprintf(T("Flags                       = 0x%x\n"), hdr->flags);
        for (size_t i = 0; i < ARRAY_LEN(hdr_flags); i++)
                if (hdr_flags[i].flag & hdr->flags)
-                       printf("    WIM_HDR_FLAG_%s is set\n", hdr_flags[i].name);
-
-       printf("Chunk Size                  = %u\n", WIM_CHUNK_SIZE);
-       fputs ("GUID                        = ", stdout);
-       print_byte_field(hdr->guid, WIM_GID_LEN);
-       putchar('\n');
-       printf("Part Number                 = %hu\n", w->hdr.part_number);
-       printf("Total Parts                 = %hu\n", w->hdr.total_parts);
-       printf("Image Count                 = %u\n", hdr->image_count);
-       printf("Lookup Table Size           = %"PRIu64"\n",
+                       tprintf(T("    WIM_HDR_FLAG_%s is set\n"), hdr_flags[i].name);
+
+       tprintf(T("Chunk Size                  = %u\n"), WIM_CHUNK_SIZE);
+       tfputs (T("GUID                        = "), stdout);
+       print_byte_field(hdr->guid, WIM_GID_LEN, stdout);
+       tputchar(T('\n'));
+       tprintf(T("Part Number                 = %hu\n"), w->hdr.part_number);
+       tprintf(T("Total Parts                 = %hu\n"), w->hdr.total_parts);
+       tprintf(T("Image Count                 = %u\n"), hdr->image_count);
+       tprintf(T("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);
-       printf("Lookup Table Offset         = %"PRIu64"\n",
+       tprintf(T("Lookup Table Flags          = 0x%hhx\n"),
+                               (u8)hdr->lookup_table_res_entry.flags);
+       tprintf(T("Lookup Table Offset         = %"PRIu64"\n"),
                                hdr->lookup_table_res_entry.offset);
-       printf("Lookup Table Original_size  = %"PRIu64"\n",
+       tprintf(T("Lookup Table Original_size  = %"PRIu64"\n"),
                                hdr->lookup_table_res_entry.original_size);
-       printf("XML Data Size               = %"PRIu64"\n",
+       tprintf(T("XML Data Size               = %"PRIu64"\n"),
                                (u64)hdr->xml_res_entry.size);
-       printf("XML Data Flags              = 0x%hhx\n",
-                               hdr->xml_res_entry.flags);
-       printf("XML Data Offset             = %"PRIu64"\n",
+       tprintf(T("XML Data Flags              = 0x%hhx\n"),
+                               (u8)hdr->xml_res_entry.flags);
+       tprintf(T("XML Data Offset             = %"PRIu64"\n"),
                                hdr->xml_res_entry.offset);
-       printf("XML Data Original Size      = %"PRIu64"\n",
+       tprintf(T("XML Data Original Size      = %"PRIu64"\n"),
                                hdr->xml_res_entry.original_size);
-       printf("Boot Metadata Size          = %"PRIu64"\n",
+       tprintf(T("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);
-       printf("Boot Metadata Offset        = %"PRIu64"\n",
+       tprintf(T("Boot Metadata Flags         = 0x%hhx\n"),
+                               (u8)hdr->boot_metadata_res_entry.flags);
+       tprintf(T("Boot Metadata Offset        = %"PRIu64"\n"),
                                hdr->boot_metadata_res_entry.offset);
-       printf("Boot Metadata Original Size = %"PRIu64"\n",
+       tprintf(T("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);
-       printf("Integrity Flags             = 0x%hhx\n",
-                                       hdr->integrity.flags);
-       printf("Integrity Offset            = %"PRIu64"\n",
-                                       hdr->integrity.offset);
-       printf("Integrity Original_size     = %"PRIu64"\n",
-                                       hdr->integrity.original_size);
+       tprintf(T("Boot Index                  = %u\n"), hdr->boot_idx);
+       tprintf(T("Integrity Size              = %"PRIu64"\n"),
+                               (u64)hdr->integrity.size);
+       tprintf(T("Integrity Flags             = 0x%hhx\n"),
+                               (u8)hdr->integrity.flags);
+       tprintf(T("Integrity Offset            = %"PRIu64"\n"),
+                               hdr->integrity.offset);
+       tprintf(T("Integrity Original_size     = %"PRIu64"\n"),
+                               hdr->integrity.original_size);
 }