X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=e5b0d9e7ad586728387a06dd18f7c1f5515707f6;hb=774e09230145ee2d8ba58868573213da84a348eb;hp=8bcfa2028807422302fa543c1c1dcb9c53bd763a;hpb=b1c4e6a269ae4c969060e33685db12f76a204a58;p=wimlib

diff --git a/src/util.c b/src/util.c
index 8bcfa202..e5b0d9e7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -25,6 +25,8 @@
 #include "wimlib_internal.h"
 #include "endianness.h"
 #include "sha1.h"
+#include "timestamp.h"
+#include <sys/time.h>
 
 
 #include <iconv.h>
@@ -49,7 +51,7 @@ void wimlib_error(const char *format, ...)
 
 		va_start(va, format);
 		errno_save = errno;
-		fputs("ERROR: ", stderr);
+		fputs("[ERROR] ", stderr);
 		vfprintf(stderr, format, va);
 		putc('\n', stderr);
 		errno = errno_save;
@@ -65,7 +67,7 @@ void wimlib_error_with_errno(const char *format, ...)
 
 		va_start(va, format);
 		errno_save = errno;
-		fputs("ERROR: ", stderr);
+		fputs("[ERROR] ", stderr);
 		vfprintf(stderr, format, va);
 		fprintf(stderr, ": %s\n", strerror(errno_save));
 		errno = errno_save;
@@ -81,7 +83,7 @@ void wimlib_warning(const char *format, ...)
 
 		va_start(va, format);
 		errno_save = errno;
-		fputs("WARNING: ", stderr);
+		fputs("[WARNING] ", stderr);
 		vfprintf(stderr, format, va);
 		putc('\n', stderr);
 		errno = errno_save;
@@ -141,6 +143,8 @@ static const char *error_strings[] = {
 		= "The WIM's integrity table is invalid",
 	[WIMLIB_ERR_INVALID_PARAM] 
 		= "An invalid parameter was given",
+	[WIMLIB_ERR_INVALID_RESOURCE_HASH]
+		= "The SHA1 message digest of a WIM resource did not match the expected value",
 	[WIMLIB_ERR_INVALID_RESOURCE_SIZE] 
 		= "A resource entry in the WIM is invalid",
 	[WIMLIB_ERR_LINK] 
@@ -159,6 +163,8 @@ static const char *error_strings[] = {
 			"identify a WIM file",
 	[WIMLIB_ERR_NO_FILENAME] 
 		= "The WIM is not identified with a filename",
+	[WIMLIB_ERR_NOT_ROOT]
+		= "Root privileges are required for this operation",
 	[WIMLIB_ERR_NTFS_3G]
 		= "NTFS-3g encountered an error (check errno)",
 	[WIMLIB_ERR_OPEN] 
@@ -503,3 +509,12 @@ void print_string(const void *string, size_t len)
 		p++;
 	}
 }
+
+u64 get_wim_timestamp()
+{
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	return timeval_to_wim_timestamp(&tv);
+}
+
+