capture_ntfs_streams(): Set 'ret' properly

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 0442aaaca4b78ca20ae332f2eca268ca7a326225..34d43fdc73080434f42d5b9eb10fcf3435774447 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -31,7 +31,7 @@
 #include "list.h"
 #include "wimlib.h"
 
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
 #include <pthread.h>
 #endif
 
@@ -268,9 +268,6 @@ struct wim_image_metadata {
         * different WIM image. */
        u8 modified : 1;
 
-       /* 1 iff this image has been mounted read-write */
-       u8 has_been_mounted_rw : 1;
-
 #ifdef WITH_NTFS_3G
        struct _ntfs_volume *ntfs_vol;
 #endif
@@ -282,7 +279,7 @@ struct WIMStruct {
        /* A pointer to the file indicated by @filename, opened for reading. */
        FILE *fp;
 
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
        /* Extra file pointers to be used by concurrent readers */
        FILE **fp_tab;
        size_t num_allocated_fps;
@@ -298,9 +295,6 @@ struct WIMStruct {
        /* The lookup table for the WIM file. */
        struct wim_lookup_table *lookup_table;
 
-       /* Pointer to the XML data read from the WIM file (UTF16LE-encoded). */
-       utf16lechar *xml_data;
-
        /* Information retrieved from the XML data, arranged in an orderly
         * manner. */
        struct wim_info *wim_info;
@@ -530,6 +524,8 @@ struct apply_args {
                        /* Normal apply only (Win32) */
                        unsigned long num_set_sacl_priv_notheld;
                        unsigned long num_set_sd_access_denied;
+                       unsigned vol_flags;
+                       bool have_vol_flags;
                };
        };
 };
@@ -545,7 +541,6 @@ libntfs3g_global_init();
 
 /* ntfs-capture.c */
 
-/* The types of these two callbacks are intentionally the same. */
 typedef int (*consume_data_callback_t)(const void *buf, size_t len, void *ctx);
 
 extern int
@@ -565,15 +560,16 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
                       wimlib_progress_func_t progress_func,
                       void *extra_arg);
 
+#ifdef WITH_NTFS_3G
 extern int
 do_ntfs_umount(struct _ntfs_volume *vol);
+#endif
 
 /* resource.c */
 
 #define WIMLIB_RESOURCE_FLAG_RAW               0x1
 #define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ   0x2
 #define WIMLIB_RESOURCE_FLAG_RECOMPRESS                0x4
-//#define WIMLIB_RESOURCE_FLAG_OVERWRITE_INPLACE       0x8
 
 extern int
 read_resource_prefix(const struct wim_lookup_table_entry *lte,
@@ -700,7 +696,6 @@ wim_checksum_unhashed_streams(WIMStruct *w);
  * the WIM image */
 #define WIMLIB_ADD_IMAGE_FLAG_SOURCE    0x40000000
 
-
 extern int
 begin_write(WIMStruct *w, const tchar *path, int write_flags);