x86_cpu_features.c: cpuid fix for x86_32 PIC with old GCC versions

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index 0e16e6ca911cbb59af23881ad65f9c3648d7ddb3..d5449507974292560824f3ff8c829e5ae8fdf07c 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -78,8 +78,6 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 
        BUILD_BUG_ON(sizeof(struct wim_header_disk) != WIM_HEADER_DISK_SIZE);
 
-       DEBUG("Reading WIM header from \"%"TS"\"", filename);
-
        ret = full_read(in_fd, &disk_hdr, sizeof(disk_hdr));
        if (ret)
                goto read_error;
@@ -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,16 +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);
        disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size);
-       memcpy(disk_hdr.guid, hdr->guid, WIM_GUID_LEN);
+       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);
@@ -249,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);