wimlib_export_image(): improve duplicate image detection

[wimlib] / src / error.c

diff --git a/src/error.c b/src/error.c
index ed9e6b72be56772f444c58932c79054e888370d9..ea434912cc59184e2c5ca4cbfb975c5fe95f91ce 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -49,16 +49,12 @@
 bool wimlib_print_errors = false;
 FILE *wimlib_error_file = NULL; /* Set in wimlib_global_init() */
 static bool wimlib_owns_error_file = false;
-#endif
 
-#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
 static void
 wimlib_vmsg(const tchar *tag, const tchar *format, va_list va, bool perror)
 {
-#ifndef ENABLE_DEBUG
        if (!wimlib_print_errors)
                return;
-#endif
        int errno_save = errno;
        fflush(stdout);
        tfputs(tag, wimlib_error_file);
@@ -82,9 +78,7 @@ wimlib_vmsg(const tchar *tag, const tchar *format, va_list va, bool perror)
        fflush(wimlib_error_file);
        errno = errno_save;
 }
-#endif
 
-#ifdef ENABLE_ERROR_MESSAGES
 void
 wimlib_error(const tchar *format, ...)
 {
@@ -124,22 +118,7 @@ wimlib_warning_with_errno(const tchar *format, ...)
        wimlib_vmsg(T("\r[WARNING] "), format, va, true);
        va_end(va);
 }
-
-#endif
-
-#ifdef ENABLE_DEBUG
-void wimlib_debug(const tchar *filename, int line, const char *func,
-                 const tchar *format, ...)
-{
-       va_list va;
-       tchar buf[tstrlen(filename) + strlen(func) + 30];
-
-       tsprintf(buf, T("[%"TS" %d] %s(): "), filename, line, func);
-       va_start(va, format);
-       wimlib_vmsg(buf, format, va, false);
-       va_end(va);
-}
-#endif
+#endif /* ENABLE_ERROR_MESSAGES */
 
 void
 print_byte_field(const u8 *field, size_t len, FILE *out)
@@ -257,9 +236,6 @@ static const tchar * const error_strings[] = {
                = 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"),
@@ -356,6 +332,16 @@ static const tchar * const error_strings[] = {
                = T("The volume must be unlocked before it can be used"),
        [WIMLIB_ERR_UNABLE_TO_READ_CAPTURE_CONFIG]
                = T("The capture configuration file could not be read"),
+       [WIMLIB_ERR_WIM_IS_INCOMPLETE]
+               = T("The WIM file is incomplete"),
+       [WIMLIB_ERR_COMPACTION_NOT_POSSIBLE]
+               = T("The WIM file cannot be compacted because of its format, "
+                   "its layout, or the write parameters specified by the user"),
+       [WIMLIB_ERR_IMAGE_HAS_MULTIPLE_REFERENCES]
+               = T("The WIM image cannot be modified because it is currently "
+                   "referenced from multiple places"),
+       [WIMLIB_ERR_DUPLICATE_EXPORTED_IMAGE]
+               = T("The destination WIM already contains one of the source images"),
 };
 
 WIMLIBAPI const tchar *