X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=2d151478164f247bca678f6583d7ae71a86550fa;hb=637f86d129be63bb9dc431e8e2ead370330ca5ce;hp=262fa1e1fa65d96c186d7753279beda6c72a6efa;hpb=49a63aa13cdeb4c1348697ccd92207a1a65ec7b0;p=wimlib

diff --git a/src/util.c b/src/util.c
index 262fa1e1..2d151478 100644
--- 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
 
@@ -425,6 +424,8 @@ 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"),
 };
 
 /* API function documented in wimlib.h  */
@@ -439,7 +440,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;
@@ -510,8 +510,6 @@ wimlib_wcsdup(const wchar_t *str)
 }
 #endif
 
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
 void *
 memdup(const void *mem, size_t size)
 {
@@ -527,7 +525,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;
@@ -535,12 +532,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;