Remove --enable-more-debug and --disable-custom-memory-allocator options

[wimlib] / include / wimlib / capture.h

diff --git a/include/wimlib/capture.h b/include/wimlib/capture.h
index b60c5c85a348bfc6aaea477fb72d294f5e9e2b33..9f9e4617fb44111b3fdcc3f2bfffdb84a7072666 100644 (file)
--- a/include/wimlib/capture.h
+++ b/include/wimlib/capture.h
@@ -8,6 +8,7 @@
 
 struct wim_lookup_table;
 struct wim_dentry;
+struct wim_inode;
 
 /* Hash table to find inodes, given an inode number (in the case of reading
  * a WIM images), or both an inode number and a device number (in the case of
@@ -47,25 +48,32 @@ struct add_image_params {
 
        /* Pointer to the capture configuration, which indicates whether any
         * files should be excluded from capture or not. */
-       const struct wimlib_capture_config *config;
+       struct wimlib_capture_config *config;
 
        /* Flags that affect the capture operation (WIMLIB_ADD_FLAG_*) */
        int add_flags;
 
-       /* If non-NULL, the user-supplied progress function. */
-       wimlib_progress_func_t progress_func;
-
        /* Extra argument; set to point to a pointer to the ntfs_volume for
         * libntfs-3g capture.  */
        void *extra_arg;
 
        u64 capture_root_ino;
        u64 capture_root_dev;
+
+       /* If non-NULL, the user-supplied progress function. */
+       wimlib_progress_func_t progress_func;
+
+       /* Progress data.  */
+       union wimlib_progress_info progress;
 };
 
 
 /* capture_common.c */
 
+extern void
+do_capture_progress(struct add_image_params *params, int status,
+                   const struct wim_inode *inode);
+
 extern bool
 exclude_path(const tchar *path, size_t path_len,
             const struct wimlib_capture_config *config,