X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fheader.c;h=37ba6ed260e1d14ab61c1f4edfbe0858bc9eb348;hb=80b48ed7aeb8e6c9460ab254920818f9e36d656e;hp=cbb1419978b663c5382a90d709039f95a5eff91c;hpb=bea6379a3694ecc958ea4dbce210606ca8c73485;p=wimlib

diff --git a/src/header.c b/src/header.c
index cbb14199..37ba6ed2 100644
--- a/src/header.c
+++ b/src/header.c
@@ -121,7 +121,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);
 
@@ -160,8 +160,8 @@ read_error:
  * specified is the current one, the position is advanced by the size of the
  * header.  */
 int
-write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
-			   off_t offset)
+write_wim_header(const struct wim_header *hdr, struct filedes *out_fd,
+		 off_t offset)
 {
 	struct wim_header_disk disk_hdr _aligned_attribute(8);
 	int ret;
@@ -174,12 +174,8 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 	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);
@@ -199,14 +195,6 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 	return ret;
 }
 
-/* Writes the header for a WIM file at the output file descriptor's current
- * offset.  */
-int
-write_wim_header(const struct wim_header *hdr, struct filedes *out_fd)
-{
-	return write_wim_header_at_offset(hdr, out_fd, out_fd->offset);
-}
-
 /* Update just the wim_flags field. */
 int
 write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd)
@@ -217,49 +205,6 @@ write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd)
 			   offsetof(struct wim_header_disk, wim_flags));
 }
 
-void
-set_wim_hdr_cflags(enum wimlib_compression_type ctype, struct wim_header *hdr)
-{
-	hdr->flags &= ~(WIM_HDR_FLAG_COMPRESSION |
-			WIM_HDR_FLAG_COMPRESS_RESERVED |
-			WIM_HDR_FLAG_COMPRESS_XPRESS |
-			WIM_HDR_FLAG_COMPRESS_LZX |
-			WIM_HDR_FLAG_COMPRESS_LZMS |
-			WIM_HDR_FLAG_COMPRESS_XPRESS_2);
-	switch (ctype) {
-	case WIMLIB_COMPRESSION_TYPE_NONE:
-		return;
-	case WIMLIB_COMPRESSION_TYPE_XPRESS:
-		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_XPRESS;
-		return;
-	case WIMLIB_COMPRESSION_TYPE_LZX:
-		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZX;
-		return;
-	case WIMLIB_COMPRESSION_TYPE_LZMS:
-		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZMS;
-		return;
-	}
-	wimlib_assert(0);
-}
-
-/* Initialize the header for a WIM file.  */
-void
-init_wim_header(struct wim_header *hdr,
-		enum wimlib_compression_type ctype, u32 chunk_size)
-{
-	memset(hdr, 0, sizeof(struct wim_header));
-	hdr->magic = WIM_MAGIC;
-	if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
-		hdr->wim_version = WIM_VERSION_SOLID;
-	else
-		hdr->wim_version = WIM_VERSION_DEFAULT;
-	set_wim_hdr_cflags(ctype, hdr);
-	hdr->chunk_size = chunk_size;
-	hdr->total_parts = 1;
-	hdr->part_number = 1;
-	randomize_byte_array(hdr->guid, sizeof(hdr->guid));
-}
-
 static const struct {
 	u32 flag;
 	const char *name;
@@ -304,7 +249,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);