]> wimlib.net Git - wimlib/blobdiff - src/mount_image.c
Remove some dead assignments
[wimlib] / src / mount_image.c
index 3aac49d11d6942797b51b5174ad09cc5042588a7..f8e733d872116cb3b0aa455d632f87e8320d4199 100644 (file)
@@ -31,6 +31,7 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/error.h"
 
 #ifdef WITH_FUSE
 
@@ -378,16 +379,16 @@ wim_pathname_to_stream(const struct wimfs_context *ctx, const char *path,
        struct wim_dentry *dentry;
        struct wim_lookup_table_entry *lte;
        u16 stream_idx;
-       const tchar *stream_name = NULL;
+       const char *stream_name = NULL;
        struct wim_inode *inode;
-       tchar *p = NULL;
+       char *p = NULL;
 
        lookup_flags |= ctx->default_lookup_flags;
 
        if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
                stream_name = path_stream_name(path);
                if (stream_name) {
-                       p = (tchar*)stream_name - 1;
+                       p = (char *)stream_name - 1;
                        *p = T('\0');
                }
        }
@@ -2415,7 +2416,8 @@ do_unmount_commit(const char *dir, int unmount_flags,
                ret = do_unmount(dir);
        if (progfunc) {
                /* Terminate the progress thread.  */
-               mq_send(mq, NULL, 0, 1);
+               char empty[0];
+               mq_send(mq, empty, 0, 1);
                pthread_join(commit_progress_tid, NULL);
        }
 out_delete_mq: