X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Ferror.c;h=26fc10a4511e395b16b7faec8a6ebb785d888f1f;hp=af212db04b3f3f117470699ae40155be88a98de2;hb=90f1e04a2a143876a4413577b25db60b5ba0fe97;hpb=89698ed953532a5ccbeca5414cc10873aa33af71

diff --git a/src/error.c b/src/error.c
index af212db0..26fc10a4 100644
--- a/src/error.c
+++ b/src/error.c
@@ -42,6 +42,7 @@
 
 #include "wimlib.h"
 #include "wimlib/error.h"
+#include "wimlib/test_support.h"
 #include "wimlib/util.h"
 #include "wimlib/win32.h"
 
@@ -181,14 +182,11 @@ static const tchar * const error_strings[] = {
 	[WIMLIB_ERR_ALREADY_LOCKED]
 		= T("The WIM is already locked for writing"),
 	[WIMLIB_ERR_DECOMPRESSION]
-		= T("Failed to decompress compressed data"),
+		= T("The WIM contains invalid compressed data"),
 	[WIMLIB_ERR_FUSE]
 		= T("An error was returned by fuse_main()"),
 	[WIMLIB_ERR_GLOB_HAD_NO_MATCHES]
 		= T("The provided file glob did not match any files"),
-	[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
-		= T("The iconv() function does not seem to work. "
-		  "Maybe check to make sure the directory /usr/lib/gconv exists"),
 	[WIMLIB_ERR_IMAGE_COUNT]
 		= T("Inconsistent image count among the metadata "
 			"resources, the WIM header, and/or the XML data"),
@@ -214,8 +212,6 @@ static const tchar * const error_strings[] = {
 		= T("An entry in the WIM's lookup table is invalid"),
 	[WIMLIB_ERR_INVALID_METADATA_RESOURCE]
 		= T("The metadata resource is invalid"),
-	[WIMLIB_ERR_INVALID_MULTIBYTE_STRING]
-		= T("A string was not valid in the current locale's character encoding"),
 	[WIMLIB_ERR_INVALID_OVERLAY]
 		= T("Conflicting files in overlay when creating a WIM image"),
 	[WIMLIB_ERR_INVALID_PARAM]
@@ -229,9 +225,9 @@ static const tchar * const error_strings[] = {
 	[WIMLIB_ERR_INVALID_RESOURCE_HASH]
 		= T("The SHA-1 message digest of a WIM resource did not match the expected value"),
 	[WIMLIB_ERR_INVALID_UTF8_STRING]
-		= T("A string provided as input by the user was not a valid UTF-8 string"),
+		= T("A string was not a valid UTF-8 string"),
 	[WIMLIB_ERR_INVALID_UTF16_STRING]
-		= T("A string in a WIM dentry is not a valid UTF-16LE string"),
+		= T("A string was not a valid UTF-16 string"),
 	[WIMLIB_ERR_IS_DIRECTORY]
 		= T("One of the specified paths to delete was a directory"),
 	[WIMLIB_ERR_IS_SPLIT_WIM]
@@ -240,7 +236,7 @@ static const tchar * const error_strings[] = {
 		= T("Failed to create a hard or symbolic link when extracting "
 			"a file from the WIM"),
 	[WIMLIB_ERR_METADATA_NOT_FOUND]
-		= T("A required metadata resource could not be located"),
+		= T("The WIM does not contain image metadata; it only contains file data"),
 	[WIMLIB_ERR_MKDIR]
 		= T("Failed to create a directory"),
 	[WIMLIB_ERR_MQUEUE]
@@ -263,7 +259,7 @@ static const tchar * const error_strings[] = {
 		= T("The WIM was not captured such that it can be "
 		    "applied from a pipe"),
 	[WIMLIB_ERR_NTFS_3G]
-		= T("NTFS-3g encountered an error (check errno)"),
+		= T("NTFS-3G encountered an error (check errno)"),
 	[WIMLIB_ERR_OPEN]
 		= T("Failed to open a file"),
 	[WIMLIB_ERR_OPENDIR]
@@ -340,6 +336,16 @@ static const tchar * const error_strings[] = {
 	[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"),
+	[WIMLIB_ERR_CONCURRENT_MODIFICATION_DETECTED]
+		= T("A file being added to a WIM image was concurrently modified"),
+	[WIMLIB_ERR_SNAPSHOT_FAILURE]
+		= T("Unable to create a filesystem snapshot"),
+#ifdef ENABLE_TEST_SUPPORT
+	[WIMLIB_ERR_IMAGES_ARE_DIFFERENT]
+		= T("A difference was detected between the two images being compared"),
+#endif
 };
 
 WIMLIBAPI const tchar *