Add WIMLIB_EXTRACT_FLAG_WIMBOOT

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index fd14e1fedeb1c8200bd2e32ef28f40feffec662a..3053fd9e6d2bccbd76e1b15459ee30c0fd33ddf3 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -153,17 +153,18 @@ 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);
                wimlib_vfprintf(stderr, format, va);
                if (perror && errno_save != 0) {
-                       tchar buf[50];
+                       tchar buf[64];
                        int res;
-                       res = tstrerror_r(errno_save, buf, sizeof(buf));
+                       res = tstrerror_r(errno_save, buf, ARRAY_LEN(buf));
                        if (res) {
                                tsprintf(buf,
                                         T("unknown error (errno=%d)"),
@@ -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
 
@@ -303,11 +302,9 @@ 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"),
+               = T("The WIM compression type was invalid"),
        [WIMLIB_ERR_INVALID_HEADER]
                = T("The WIM header was invalid"),
        [WIMLIB_ERR_INVALID_IMAGE]
@@ -426,6 +423,10 @@ static const tchar *error_strings[] = {
                = T("Failed to write data to a file"),
        [WIMLIB_ERR_XML]
                = T("The XML data of the WIM is invalid"),
+       [WIMLIB_ERR_WIM_IS_ENCRYPTED]
+               = T("The WIM file (or parts of it) is encrypted"),
+       [WIMLIB_ERR_WIMBOOT]
+               = T("Failed to set WIMBoot pointer data"),
 };
 
 /* API function documented in wimlib.h  */
@@ -440,7 +441,6 @@ wimlib_get_error_string(enum wimlib_error_code code)
 
 
 
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 static void *(*wimlib_malloc_func) (size_t)         = malloc;
 static void  (*wimlib_free_func)   (void *)         = free;
 static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
@@ -511,8 +511,6 @@ wimlib_wcsdup(const wchar_t *str)
 }
 #endif
 
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
 void *
 memdup(const void *mem, size_t size)
 {
@@ -528,7 +526,6 @@ wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
                            void (*free_func)(void *),
                            void *(*realloc_func)(void *, size_t))
 {
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
        wimlib_malloc_func  = malloc_func  ? malloc_func  : malloc;
        wimlib_free_func    = free_func    ? free_func    : free;
        wimlib_realloc_func = realloc_func ? realloc_func : realloc;
@@ -536,12 +533,6 @@ wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
        xml_set_memory_allocator(wimlib_malloc_func, wimlib_free_func,
                                 wimlib_realloc_func);
        return 0;
-#else
-       ERROR("Cannot set custom memory allocator functions:");
-       ERROR("wimlib was compiled with the --without-custom-memory-allocator "
-             "flag");
-       return WIMLIB_ERR_UNSUPPORTED;
-#endif
 }
 
 static bool seeded = false;