verify_swm_set(): Check chunk size

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 6f17b5bf28371cc3a91340ae88e7b77977075a03..728dae3f13b1c181bb5a98a619ebdd28deb3ffdc 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -153,9 +153,10 @@ static void
 wimlib_vmsg(const tchar *tag, const tchar *format,
            va_list va, bool perror)
 {
-#ifndef DEBUG
-       if (wimlib_print_errors) {
+#if !defined(ENABLE_DEBUG)
+       if (wimlib_print_errors)
 #endif
+       {
                int errno_save = errno;
                fflush(stdout);
                tfputs(tag, stderr);
@@ -178,9 +179,7 @@ wimlib_vmsg(const tchar *tag, const tchar *format,
                tputc(T('\n'), stderr);
                fflush(stderr);
                errno = errno_save;
-#ifndef DEBUG
        }
-#endif
 }
 #endif
 
@@ -286,6 +285,8 @@ static const tchar *error_strings[] = {
        [WIMLIB_ERR_FUSERMOUNT]
                = T("Could not execute the `fusermount' program, or it exited "
                        "with a failure status"),
+       [WIMLIB_ERR_GLOB_HAD_NO_MATCHES]
+               = T("The provided file glob did not match any files"),
        [WIMLIB_ERR_ICONV_NOT_AVAILABLE]
                = T("The iconv() function does not seem to work. "
                  "Maybe check to make sure the directory /usr/lib/gconv exists"),
@@ -301,8 +302,7 @@ static const tchar *error_strings[] = {
        [WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
                = T("The capture configuration string was invalid"),
        [WIMLIB_ERR_INVALID_CHUNK_SIZE]
-               = T("The WIM is compressed but does not have a chunk "
-                       "size of 32768"),
+               = T("The WIM chunk size was invalid"),
        [WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
                = T("The WIM is compressed, but is not marked as having LZX or "
                        "XPRESS compression"),
@@ -339,12 +339,16 @@ static const tchar *error_strings[] = {
                = T("A string in a WIM dentry is not a valid UTF-16LE string"),
        [WIMLIB_ERR_IS_DIRECTORY]
                = T("One of the specified paths to delete was a directory"),
+       [WIMLIB_ERR_IS_SPLIT_WIM]
+               = T("The WIM is part of a split WIM, which is not supported for this operation"),
        [WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE]
                = T("libxml2 was unable to find a character encoding conversion handler "
                  "for UTF-16LE"),
        [WIMLIB_ERR_LINK]
                = T("Failed to create a hard or symbolic link when extracting "
                        "a file from the WIM"),
+       [WIMLIB_ERR_METADATA_NOT_FOUND]
+               = T("A required metadata resource could not be located"),
        [WIMLIB_ERR_MKDIR]
                = T("Failed to create a directory"),
        [WIMLIB_ERR_MQUEUE]
@@ -398,8 +402,6 @@ static const tchar *error_strings[] = {
                = T("Failed to set timestamps on extracted file"),
        [WIMLIB_ERR_SPLIT_INVALID]
                = T("The WIM is part of an invalid split WIM"),
-       [WIMLIB_ERR_SPLIT_UNSUPPORTED]
-               = T("The WIM is part of a split WIM, which is not supported for this operation"),
        [WIMLIB_ERR_STAT]
                = T("Could not read the metadata for a file or directory"),
        [WIMLIB_ERR_TIMEOUT]