X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=7858a1c9bbd6e3f86b0c5b7f27cbd2a9ce823568;hb=6461b7e0a98286fa4dca4ede22cdbd07c6240e5d;hp=01ba8f36ffd0b6f3ecdb7ab4c76112aa95d3833e;hpb=034fd063f956d0806e557680a36a69a42556a776;p=wimlib

diff --git a/src/util.c b/src/util.c
index 01ba8f36..7858a1c9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -120,6 +120,8 @@ static const char *error_strings[] = {
 		= "Failed to decompress compressed data",
 	[WIMLIB_ERR_DELETE_STAGING_DIR]
 		= "Failed to delete staging directory",
+	[WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED]
+		= "The process servicing the mounted WIM has crashed",
 	[WIMLIB_ERR_FORK]
 		= "Failed to fork another process",
 	[WIMLIB_ERR_FUSE]
@@ -160,6 +162,9 @@ static const char *error_strings[] = {
 		= "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 has an invalid size",
+	[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",
 	[WIMLIB_ERR_LINK]
 		= "Failed to create a hard or symbolic link when extracting "
 			"a file from the WIM",
@@ -200,8 +205,6 @@ 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",
 	[WIMLIB_ERR_UNKNOWN_VERSION]
 		= "The WIM file is marked with an unknown version number",
 	[WIMLIB_ERR_UNSUPPORTED]
@@ -360,31 +363,6 @@ char *utf8_to_utf16(const char *utf8_str, size_t utf8_len,
 	return orig_utf16_str;
 }
 
-/* Write @n bytes from @buf to the file descriptor @fd, retrying on interupt and
- * on short writes.
- *
- * Returns short count and set errno on failure. */
-ssize_t full_write(int fd, const void *buf, size_t n)
-{
-	const char *p = buf;
-	ssize_t ret;
-	ssize_t total = 0;
-
-	while (total != n) {
-		ret = write(fd, p, n);
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
-			else
-				break;
-		}
-		total += ret;
-		p += ret;
-	}
-	return total;
-}
-
-
 static bool seeded = false;
 
 static void seed_random()