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)"),
tputc(T('\n'), stderr);
fflush(stderr);
errno = errno_save;
-#ifndef DEBUG
}
-#endif
}
#endif
[WIMLIB_ERR_INVALID_CHUNK_SIZE]
= 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]
= 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 */
-#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;
}
#endif
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
void *
memdup(const void *mem, size_t size)
{
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;
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;