Rename _full_path => d_full_path

[wimlib] / src / error.c

diff --git a/src/error.c b/src/error.c
index 30087aefb66d6e4b4a046dfa2506fcee0b138993..ed9e6b72be56772f444c58932c79054e888370d9 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -43,9 +43,7 @@
 #include "wimlib.h"
 #include "wimlib/error.h"
 #include "wimlib/util.h"
-#ifdef __WIN32__
-#  include "wimlib/win32.h"
-#endif
+#include "wimlib/win32.h"
 
 #ifdef ENABLE_ERROR_MESSAGES
 bool wimlib_print_errors = false;
@@ -222,7 +220,7 @@ static const tchar * const error_strings[] = {
        [WIMLIB_ERR_INTEGRITY]
                = T("The WIM file is corrupted (failed integrity check)"),
        [WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
-               = T("The capture configuration string was invalid"),
+               = T("The contents of the capture configuration file were invalid"),
        [WIMLIB_ERR_INVALID_CHUNK_SIZE]
                = T("The compression chunk size was unrecognized"),
        [WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
@@ -250,7 +248,7 @@ static const tchar * const error_strings[] = {
        [WIMLIB_ERR_INVALID_REPARSE_DATA]
                = T("The reparse data of a reparse point was invalid"),
        [WIMLIB_ERR_INVALID_RESOURCE_HASH]
-               = T("The SHA1 message digest of a WIM resource did not match the expected value"),
+               = 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"),
        [WIMLIB_ERR_INVALID_UTF16_STRING]
@@ -356,6 +354,8 @@ static const tchar * const error_strings[] = {
                = 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"),
+       [WIMLIB_ERR_UNABLE_TO_READ_CAPTURE_CONFIG]
+               = T("The capture configuration file could not be read"),
 };
 
 WIMLIBAPI const tchar *