X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fheader.c;h=cbb1419978b663c5382a90d709039f95a5eff91c;hp=82088998010d87cdf54f13e782b90a022cd8482b;hb=bea6379a3694ecc958ea4dbce210606ca8c73485;hpb=3de1ec66f778edda19865482d685bc6f4e17faf7

diff --git a/src/header.c b/src/header.c
index 82088998..cbb14199 100644
--- a/src/header.c
+++ b/src/header.c
@@ -1,11 +1,11 @@
 /*
  * header.c
  *
- * Read, write, or create a WIM header.
+ * Read, write, or print a WIM header.
  */
 
 /*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2015 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -25,6 +25,7 @@
 #  include "config.h"
 #endif
 
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -216,66 +217,53 @@ write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd)
 			   offsetof(struct wim_header_disk, wim_flags));
 }
 
-int
-set_wim_hdr_cflags(int ctype, struct wim_header *hdr)
+void
+set_wim_hdr_cflags(enum wimlib_compression_type ctype, struct wim_header *hdr)
 {
 	hdr->flags &= ~(WIM_HDR_FLAG_COMPRESSION |
-			WIM_HDR_FLAG_COMPRESS_LZX |
 			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 0;
-
-	case WIMLIB_COMPRESSION_TYPE_LZX:
-		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZX;
-		return 0;
-
+		return;
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
 		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_XPRESS;
-		return 0;
-
+		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 0;
-
-	default:
-		return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+		return;
 	}
+	wimlib_assert(0);
 }
 
-/*
- * Initializes the header for a WIM file.
- */
-int
-init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
+/* 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;
-	if (set_wim_hdr_cflags(ctype, hdr)) {
-		ERROR("Invalid compression type specified (%d)", ctype);
-		return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
-	}
+	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));
-	return 0;
 }
 
-struct hdr_flag {
+static const struct {
 	u32 flag;
 	const char *name;
-};
-struct hdr_flag hdr_flags[] = {
+} hdr_flags[] = {
 	{WIM_HDR_FLAG_RESERVED,		"RESERVED"},
 	{WIM_HDR_FLAG_COMPRESSION,	"COMPRESSION"},
 	{WIM_HDR_FLAG_READONLY,		"READONLY"},
@@ -297,7 +285,15 @@ wimlib_print_header(const WIMStruct *wim)
 {
 	const struct wim_header *hdr = &wim->hdr;
 
-	tprintf(T("Magic Characters            = MSWIM\\000\\000\\000\n"));
+	tprintf(T("Magic Characters            = "));
+	for (int i = 0; i < sizeof(hdr->magic); i++) {
+		tchar c = (u8)(hdr->magic >> ((8 * i)));
+		if (istalpha(c))
+			tputchar(c);
+		else
+			tprintf(T("\\%o"), c);
+	}
+	tputchar(T('\n'));
 	tprintf(T("Header Size                 = %u\n"), WIM_HEADER_DISK_SIZE);
 	tprintf(T("Version                     = 0x%x\n"), hdr->wim_version);
 
@@ -313,13 +309,13 @@ wimlib_print_header(const WIMStruct *wim)
 	tprintf(T("Part Number                 = %hu\n"), hdr->part_number);
 	tprintf(T("Total Parts                 = %hu\n"), hdr->total_parts);
 	tprintf(T("Image Count                 = %u\n"), hdr->image_count);
-	tprintf(T("Blob Table Size           = %"PRIu64"\n"),
+	tprintf(T("Blob Table Size             = %"PRIu64"\n"),
 				(u64)hdr->blob_table_reshdr.size_in_wim);
-	tprintf(T("Blob Table Flags          = 0x%hhx\n"),
+	tprintf(T("Blob Table Flags            = 0x%hhx\n"),
 				(u8)hdr->blob_table_reshdr.flags);
-	tprintf(T("Blob Table Offset         = %"PRIu64"\n"),
+	tprintf(T("Blob Table Offset           = %"PRIu64"\n"),
 				hdr->blob_table_reshdr.offset_in_wim);
-	tprintf(T("Blob Table Original_size  = %"PRIu64"\n"),
+	tprintf(T("Blob Table Original_size    = %"PRIu64"\n"),
 				hdr->blob_table_reshdr.uncompressed_size);
 	tprintf(T("XML Data Size               = %"PRIu64"\n"),
 				(u64)hdr->xml_data_reshdr.size_in_wim);