X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fheader.c;h=cf19396317ca3af6da227c6b4b60d1bd180b4b06;hp=a88c9272f452f51c1836bf650f5ec8e3b6ec3ba8;hb=181cc78dc68e62f3e005e1590f5cda12d3e287f5;hpb=a4204528d3fbd8b959025b897493cf68d5cbfc0f

diff --git a/src/header.c b/src/header.c
index a88c9272..cf193963 100644
--- a/src/header.c
+++ b/src/header.c
@@ -76,9 +76,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 		filename = pipe_str;
 	}
 
-	BUILD_BUG_ON(sizeof(struct wim_header_disk) != WIM_HEADER_DISK_SIZE);
-
-	DEBUG("Reading WIM header from \"%"TS"\"", filename);
+	STATIC_ASSERT(sizeof(struct wim_header_disk) == WIM_HEADER_DISK_SIZE);
 
 	ret = full_read(in_fd, &disk_hdr, sizeof(disk_hdr));
 	if (ret)
@@ -121,7 +119,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 
 	hdr->flags = le32_to_cpu(disk_hdr.wim_flags);
 	hdr->chunk_size = le32_to_cpu(disk_hdr.chunk_size);
-	memcpy(hdr->guid, disk_hdr.guid, WIM_GUID_LEN);
+	copy_guid(hdr->guid, disk_hdr.guid);
 	hdr->part_number = le16_to_cpu(disk_hdr.part_number);
 	hdr->total_parts = le16_to_cpu(disk_hdr.total_parts);
 
@@ -135,9 +133,6 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 
 	hdr->image_count = le32_to_cpu(disk_hdr.image_count);
 
-	DEBUG("part_number = %u, total_parts = %u, image_count = %u",
-	      hdr->part_number, hdr->total_parts, hdr->image_count);
-
 	if (unlikely(hdr->image_count > MAX_IMAGES)) {
 		ERROR("\"%"TS"\": Invalid image count (%u)",
 		      filename, hdr->image_count);
@@ -166,20 +161,12 @@ write_wim_header(const struct wim_header *hdr, struct filedes *out_fd,
 	struct wim_header_disk disk_hdr _aligned_attribute(8);
 	int ret;
 
-	DEBUG("Writing %sWIM header at offset %"PRIu64,
-	      ((hdr->magic == PWM_MAGIC) ? "pipable " : ""),
-	      offset);
-
 	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);
-	if (hdr->flags & WIM_HDR_FLAG_COMPRESSION)
-		disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size);
-	else
-		disk_hdr.chunk_size = 0;
-	memcpy(disk_hdr.guid, hdr->guid, WIM_GUID_LEN);
-
+	disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size);
+	copy_guid(disk_hdr.guid, hdr->guid);
 	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);
@@ -253,7 +240,7 @@ wimlib_print_header(const WIMStruct *wim)
 
 	tprintf(T("Chunk Size                  = %u\n"), hdr->chunk_size);
 	tfputs (T("GUID                        = "), stdout);
-	print_byte_field(hdr->guid, WIM_GUID_LEN, stdout);
+	print_byte_field(hdr->guid, GUID_SIZE, stdout);
 	tputchar(T('\n'));
 	tprintf(T("Part Number                 = %hu\n"), hdr->part_number);
 	tprintf(T("Total Parts                 = %hu\n"), hdr->total_parts);