Clean up setting of compression type

[wimlib] / src / header.c

diff --git a/src/header.c b/src/header.c
index 21dec59a9345a55322c5a6b94cb5538827d76c4e..254b48bdbd7551002ad57bbb5f3f91ca1109b14f 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -216,66 +216,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"},