Remove WIMLIB_COMPRESSION_TYPE_INVALID from library
authorEric Biggers <ebiggers3@gmail.com>
Fri, 13 Jun 2014 04:04:05 +0000 (23:04 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Fri, 13 Jun 2014 04:04:05 +0000 (23:04 -0500)
This is actually only used in wimlib-imagex

include/wimlib.h
programs/imagex.c
src/wim.c
src/write.c

index 5e49f92eaec78c12c8bbcf970ae7bde807d072ff..3cc833505072eaffb9590fb0a16a95b09dec4706 100644 (file)
@@ -424,9 +424,6 @@ typedef char wimlib_tchar;
  * Specifies the compression type of a WIM file.
  */
 enum wimlib_compression_type {
-       /** An invalid compression type. */
-       WIMLIB_COMPRESSION_TYPE_INVALID = -1,
-
        /** The WIM does not include any compressed resources. */
        WIMLIB_COMPRESSION_TYPE_NONE = 0,
 
index 81f2f9f6a7b9aa392488e8e930dd6657dbed5133..508030148b1e15925b4fd062347a0741f7642dfb 100644 (file)
@@ -46,6 +46,8 @@
 #  include <alloca.h>
 #endif
 
+#define WIMLIB_COMPRESSION_TYPE_INVALID (-1)
+
 #ifdef __WIN32__
 #  include "imagex-win32.h"
 #  define print_security_descriptor     win32_print_security_descriptor
index 2dd0787238863a7dac8dafbe003f0ba41b2bbea9..cf7965e7168ffa6c237e96d79e505da9d161ab56 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -549,8 +549,6 @@ static int
 set_out_ctype(int ctype, u8 *out_ctype_p)
 {
        switch (ctype) {
-       case WIMLIB_COMPRESSION_TYPE_INVALID:
-               break;
        case WIMLIB_COMPRESSION_TYPE_NONE:
        case WIMLIB_COMPRESSION_TYPE_LZX:
        case WIMLIB_COMPRESSION_TYPE_XPRESS:
index aa3585a75b9fa7fd82c59cbed03a26539e3d2dc7..5bca038a61afd909b5d868391ed21ebf37d49a5c 100644 (file)
@@ -1261,9 +1261,8 @@ remove_zero_length_streams(struct list_head *stream_list)
  *
  * @out_ctype
  *     Compression format to use to write the output streams, specified as one
- *     of the WIMLIB_COMPRESSION_TYPE_* constants, excepting
- *     WIMLIB_COMPRESSION_TYPE_INVALID but including
- *     WIMLIB_COMPRESSION_TYPE_NONE.
+ *     of the WIMLIB_COMPRESSION_TYPE_* constants.
+ *     WIMLIB_COMPRESSION_TYPE_NONE is allowed.
  *
  * @out_chunk_size
  *     Chunk size to use to write the streams.  It must be a valid chunk size