X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fheader.c;h=13b098dc8ea10f6a373d6abb3318a1e4245d4337;hb=af1a9f0d89f9d4428776238a561a6a5b6900f2d4;hp=73e0becaa8b2b29215b46c41053f6e0eb6c88fa1;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad;p=wimlib

diff --git a/src/header.c b/src/header.c
index 73e0beca..13b098dc 100644
--- a/src/header.c
+++ b/src/header.c
@@ -45,69 +45,6 @@
 #  include <stdlib.h>
 #endif
 
-/* On-disk format of the WIM header. */
-struct wim_header_disk {
-
-	/* Magic characters "MSWIM\0\0\0" */
-	le64 magic;
-
-	/* Size of the WIM header, in bytes; WIM_HEADER_DISK_SIZE expected
-	 * (currently the only supported value). */
-	u32 hdr_size;
-
-	/* Version of the WIM file; WIM_VERSION expected (currently the only
-	 * supported value). */
-	u32 wim_version;
-
-	/* Flags for the WIM file (WIM_HDR_FLAG_*) */
-	u32 wim_flags;
-
-	/* Uncompressed chunk size of resources in the WIM.  0 if the WIM is
-	 * uncompressed.  If compressed, WIM_CHUNK_SIZE is expected (currently
-	 * the only supported value).  */
-	u32 chunk_size;
-
-	/* Globally unique identifier for the WIM file.  Basically a bunch of
-	 * random bytes. */
-	u8 guid[WIM_GID_LEN];
-
-	/* Number of this WIM part in the split WIM file, indexed from 1, or 1
-	 * if the WIM is not split. */
-	u16 part_number;
-
-	/* Total number of parts of the split WIM file, or 1 if the WIM is not
-	 * split. */
-	u16 total_parts;
-
-	/* Number of images in the WIM. */
-	u32 image_count;
-
-	/* Location and size of the WIM's lookup table. */
-	struct resource_entry_disk lookup_table_res_entry;
-
-	/* Location and size of the WIM's XML data. */
-	struct resource_entry_disk xml_data_res_entry;
-
-	/* Location and size of metadata resource for the bootable image of the
-	 * WIM, or all zeroes if no image is bootable. */
-	struct resource_entry_disk boot_metadata_res_entry;
-
-	/* 1-based index of the bootable image of the WIM, or 0 if no image is
-	 * bootable. */
-	u32 boot_idx;
-
-	/* Location and size of the WIM's integrity table, or all zeroes if the
-	 * WIM has no integrity table.
-	 *
-	 * Note the integrity_table_res_entry here is 4-byte aligned even though
-	 * it would ordinarily be 8-byte aligned--- hence, the _packed_attribute
-	 * on the `struct wim_header_disk' is essential. */
-	struct resource_entry_disk integrity_table_res_entry;
-
-	/* Unused bytes. */
-	u8 unused[60];
-} _packed_attribute;
-
 /*
  * Reads the header from a WIM file.
  *
@@ -141,7 +78,7 @@ read_wim_header(const tchar *filename, struct filedes *in_fd,
 
 	if (!filename) {
 		pipe_str = alloca(40);
-		tsprintf(pipe_str, "[fd %d]", in_fd->fd);
+		tsprintf(pipe_str, T("[fd %d]"), in_fd->fd);
 		filename = pipe_str;
 	}