finish_write(): Reorganize

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index a7ac5dc2cf302e78630f9694cbea34885c839de8..44a2314d154717363ba5a1e3cbf11345601dbf2c 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -270,6 +270,10 @@ struct wim_image_metadata {
 
        /* 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
 };
 
 /* The opaque structure exposed to the wimlib API. */
@@ -310,10 +314,6 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
-#ifdef WITH_NTFS_3G
-       struct _ntfs_volume *ntfs_vol;
-#endif
-
        /* The currently selected image, indexed starting at 1.  If not 0,
         * subtract 1 from this to get the index of the current image in the
         * image_metadata array. */
@@ -369,6 +369,9 @@ resource_is_compressed(const struct resource_entry *entry)
 #define image_for_each_unhashed_stream(lte, imd) \
        list_for_each_entry(lte, &imd->unhashed_streams, unhashed_list)
 
+#define image_for_each_unhashed_stream_safe(lte, tmp, imd) \
+       list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+
 #if 1
 #  define copy_resource_entry(dst, src) memcpy(dst, src, sizeof(struct resource_entry))
 #else
@@ -549,6 +552,9 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
                       wimlib_progress_func_t progress_func,
                       void *extra_arg);
 
+extern int
+do_ntfs_umount(struct _ntfs_volume *vol);
+
 /* resource.c */
 
 #define WIMLIB_RESOURCE_FLAG_RAW               0x1
@@ -593,6 +599,9 @@ extern int
 extract_wim_resource_to_fd(const struct wim_lookup_table_entry *lte,
                           int fd, u64 size);
 
+extern int
+sha1_resource(struct wim_lookup_table_entry *lte);
+
 extern int
 copy_resource(struct wim_lookup_table_entry *lte, void *w);
 
@@ -660,6 +669,9 @@ new_image_metadata();
 extern struct wim_image_metadata **
 new_image_metadata_array(unsigned num_images);
 
+extern int
+wim_checksum_unhashed_streams(WIMStruct *w);
+
 /* write.c */
 
 /* Internal use only */