X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=e074b951e7d4864da2d898f4c3fa83fc9f92e4cf;hb=16a0ef18b1404aab857696ae479e246dfbcfbaa3;hp=60bab76acbb7abcc03c2aaaa1795d5ea497e19c2;hpb=7d7e51b225eb2a74d26c089929aadffb1f0549c6;p=wimlib

diff --git a/src/util.c b/src/util.c
index 60bab76a..e074b951 100644
--- a/src/util.c
+++ b/src/util.c
@@ -247,13 +247,13 @@ static const tchar *error_strings[] = {
 	[WIMLIB_ERR_INSUFFICIENT_PRIVILEGES]
 		= T("The user does not have sufficient privileges"),
 	[WIMLIB_ERR_INTEGRITY]
-		= T("The WIM failed an integrity check"),
+		= T("The WIM file is corrupted (failed integrity check)"),
 	[WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
 		= T("The capture configuration string was invalid"),
 	[WIMLIB_ERR_INVALID_CHUNK_SIZE]
-		= T("The WIM chunk size was invalid"),
+		= T("The compression chunk size was unrecognized"),
 	[WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
-		= T("The WIM compression type was invalid"),
+		= T("The compression type was unrecognized"),
 	[WIMLIB_ERR_INVALID_HEADER]
 		= T("The WIM header was invalid"),
 	[WIMLIB_ERR_INVALID_IMAGE]
@@ -381,22 +381,26 @@ static const tchar *error_strings[] = {
 		= T("There is not a WIM image mounted on the directory"),
 	[WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT]
 		= T("The current user does not have permission to unmount the WIM image"),
+	[WIMLIB_ERR_FVE_LOCKED_VOLUME]
+		= T("The volume must be unlocked before it can be used"),
 };
 
 /* API function documented in wimlib.h  */
 WIMLIBAPI const tchar *
-wimlib_get_error_string(enum wimlib_error_code code)
+wimlib_get_error_string(enum wimlib_error_code _code)
 {
-	if ((int)code < 0 || code >= ARRAY_LEN(error_strings))
-		return NULL;
-	else
-		return error_strings[code];
+	unsigned int code = (unsigned int)_code;
+
+	if (code >= ARRAY_LEN(error_strings) || error_strings[code] == NULL)
+		return T("Unknown error");
+
+	return error_strings[code];
 }
 
 
 
-static void *(*wimlib_malloc_func) (size_t)	     = malloc;
-static void  (*wimlib_free_func)   (void *)	     = free;
+static void *(*wimlib_malloc_func) (size_t)	    = malloc;
+static void  (*wimlib_free_func)   (void *)	    = free;
 static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
 
 void *