X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=9db817ac5549d666a646280a154893a0fd7eec86;hb=399e095d7d2e245634b53d7771217bd7614347a3;hp=f915f2fe855b2f67db21e5b0be1365acfd0d943a;hpb=34e8ed1d4d8caf88cb92028a30ce6a51a9120db9;p=wimlib

diff --git a/src/util.c b/src/util.c
index f915f2fe..9db817ac 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -137,6 +137,9 @@ static const char *error_strings[] = {
 	[WIMLIB_ERR_FUSERMOUNT]
 		= "Could not execute the `fusermount' program, or it exited "
 			"with a failure status",
+	[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
+		= "The iconv() function does not seem to work. "
+		  "Maybe check to make sure the directory /usr/lib/gconv exists",
 	[WIMLIB_ERR_IMAGE_COUNT]
 		= "Inconsistent image count among the metadata "
 			"resources, the WIM header, and/or the XML data",
@@ -162,17 +165,18 @@ static const char *error_strings[] = {
 		= "The WIM's integrity table is invalid",
 	[WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
 		= "An entry in the WIM's lookup table is invalid",
+	[WIMLIB_ERR_INVALID_OVERLAY]
+		= "Conflicting files in overlay when creating a WIM image",
 	[WIMLIB_ERR_INVALID_PARAM]
 		= "An invalid parameter was given",
 	[WIMLIB_ERR_INVALID_PART_NUMBER]
 		= "The part number or total parts of the WIM is invalid",
 	[WIMLIB_ERR_INVALID_RESOURCE_HASH]
 		= "The SHA1 message digest of a WIM resource did not match the expected value",
-	[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
-		= "The iconv() function does not seem to work. "
-		  "Maybe check to make sure the directory /usr/lib/gconv exists",
 	[WIMLIB_ERR_INVALID_RESOURCE_SIZE]
 		= "A resource entry in the WIM has an invalid size",
+	[WIMLIB_ERR_INVALID_SECURITY_DATA]
+		= "The table of security descriptors in the WIM is invalid",
 	[WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
 		= "The version of wimlib that has mounted a WIM image is incompatible with the "
 		  "version being used to unmount it",
@@ -223,6 +227,8 @@ static const char *error_strings[] = {
 		= "The WIM is part of a split WIM, which is not supported for this operation",
 	[WIMLIB_ERR_STAT]
 		= "Could not read the metadata for a file or directory",
+	[WIMLIB_ERR_TIMEOUT]
+		= "Timed out while waiting for a message to arrive from another process",
 	[WIMLIB_ERR_UNKNOWN_VERSION]
 		= "The WIM file is marked with an unknown version number",
 	[WIMLIB_ERR_UNSUPPORTED]