Update Linux packaging

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 7916f40a77b8a0b333af90c163e4b6d2ca8458a5..54e29444655ada8905f3ca5f377a89e099821dbd 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/assert.h"
 #include "wimlib/compiler.h"
 #include "wimlib/encoding.h"
 #include "wimlib/error.h"
@@ -193,17 +194,8 @@ static const tchar *error_strings[] = {
                = T("The WIM is already locked for writing"),
        [WIMLIB_ERR_DECOMPRESSION]
                = T("Failed to decompress compressed data"),
-       [WIMLIB_ERR_DELETE_STAGING_DIR]
-               = T("Failed to delete staging directory"),
-       [WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED]
-               = T("The process servicing the mounted WIM has crashed"),
-       [WIMLIB_ERR_FORK]
-               = T("Failed to fork another process"),
        [WIMLIB_ERR_FUSE]
                = T("An error was returned by fuse_main()"),
-       [WIMLIB_ERR_FUSERMOUNT]
-               = T("Could not execute the `fusermount' program, or it exited "
-                       "with a failure status"),
        [WIMLIB_ERR_GLOB_HAD_NO_MATCHES]
                = T("The provided file glob did not match any files"),
        [WIMLIB_ERR_ICONV_NOT_AVAILABLE]
@@ -232,6 +224,8 @@ static const tchar *error_strings[] = {
                = T("The WIM's integrity table is invalid"),
        [WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
                = T("An entry in the WIM's lookup table is invalid"),
+       [WIMLIB_ERR_INVALID_METADATA_RESOURCE]
+               = T("The metadata resource is invalid"),
        [WIMLIB_ERR_INVALID_MULTIBYTE_STRING]
                = T("A string was not valid in the current locale's character encoding"),
        [WIMLIB_ERR_INVALID_OVERLAY]
@@ -246,11 +240,6 @@ static const tchar *error_strings[] = {
                = 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"),
-       [WIMLIB_ERR_INVALID_METADATA_RESOURCE]
-               = T("The metadata resource is invalid"),
-       [WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
-               = T("The version of wimlib that has mounted a WIM image is incompatible with the "
-                 "version being used to unmount it"),
        [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]
@@ -277,12 +266,12 @@ static const tchar *error_strings[] = {
                = T("Expected a directory"),
        [WIMLIB_ERR_NOTEMPTY]
                = T("Directory was not empty"),
-       [WIMLIB_ERR_NOT_A_WIM_FILE]
-               = T("The file did not begin with the magic characters that "
-                       "identify a WIM file"),
        [WIMLIB_ERR_NOT_A_REGULAR_FILE]
                = T("One of the specified paths to extract did not "
                    "correspond to a regular file"),
+       [WIMLIB_ERR_NOT_A_WIM_FILE]
+               = T("The file did not begin with the magic characters that "
+                       "identify a WIM file"),
        [WIMLIB_ERR_NO_FILENAME]
                = T("The WIM is not identified with a filename"),
        [WIMLIB_ERR_NOT_PIPABLE]
@@ -322,8 +311,6 @@ static const tchar *error_strings[] = {
                = T("The WIM is part of an invalid split WIM"),
        [WIMLIB_ERR_STAT]
                = T("Could not read the metadata for a file or directory"),
-       [WIMLIB_ERR_TIMEOUT]
-               = T("Timed out while waiting for a message to arrive from another process"),
        [WIMLIB_ERR_UNEXPECTED_END_OF_FILE]
                = T("Unexpectedly reached the end of the file"),
        [WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE]
@@ -334,8 +321,6 @@ static const tchar *error_strings[] = {
                = T("The requested operation is unsupported"),
        [WIMLIB_ERR_UNSUPPORTED_FILE]
                = T("A file in the directory tree to archive was not of a supported type"),
-       [WIMLIB_ERR_VOLUME_LACKS_FEATURES]
-               = T("The volume did not support a feature necessary to complete the operation"),
        [WIMLIB_ERR_WIM_IS_READONLY]
                = T("The WIM is read-only (file permissions, header flag, or split WIM)"),
        [WIMLIB_ERR_WRITE]
@@ -352,6 +337,12 @@ static const tchar *error_strings[] = {
                = T("The user-provided progress function returned an unrecognized value"),
        [WIMLIB_ERR_MKNOD]
                = T("Unable to create a special file (e.g. device node or socket)"),
+       [WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY]
+               = T("There are still files open on the mounted WIM image"),
+       [WIMLIB_ERR_NOT_A_MOUNTPOINT]
+               = 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"),
 };
 
 /* API function documented in wimlib.h  */
@@ -442,6 +433,36 @@ wimlib_wcsdup(const wchar_t *str)
 }
 #endif
 
+void *
+wimlib_aligned_malloc(size_t size, size_t alignment)
+{
+       u8 *raw_ptr;
+       u8 *ptr;
+       uintptr_t mask;
+
+       wimlib_assert(alignment != 0 && is_power_of_2(alignment) &&
+                     alignment <= 4096);
+       mask = alignment - 1;
+
+       raw_ptr = MALLOC(size + alignment - 1 + sizeof(size_t));
+       if (!raw_ptr)
+               return NULL;
+
+       ptr = (u8 *)raw_ptr + sizeof(size_t);
+       while ((uintptr_t)ptr & mask)
+               ptr++;
+       *((size_t *)ptr - 1) = (ptr - raw_ptr);
+
+       return ptr;
+}
+
+void
+wimlib_aligned_free(void *ptr)
+{
+       if (ptr)
+               FREE((u8 *)ptr - *((size_t *)ptr - 1));
+}
+
 void *
 memdup(const void *mem, size_t size)
 {