write.c: Do not raw-copy packed resources

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 8416bb463ed498a1fa721274f2535a177a978bf1..27f01c415ff240594d22ed6d7fe5be18fb566f3d 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
 
@@ -303,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"),
@@ -341,6 +339,8 @@ 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"),
@@ -402,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]
@@ -440,7 +438,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 +508,6 @@ wimlib_wcsdup(const wchar_t *str)
 }
 #endif
 
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
 void *
 memdup(const void *mem, size_t size)
 {
@@ -528,7 +523,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 +530,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;