ntfs-3g_capture.c: cleanup

[wimlib] / include / wimlib / capture.h

diff --git a/include/wimlib/capture.h b/include/wimlib/capture.h
index ae2640a78ce6b9cded698c11773469f1e509fce0..9ab48f738d22759ebfa2dda994904b9bd6983044 100644 (file)
--- a/include/wimlib/capture.h
+++ b/include/wimlib/capture.h
@@ -9,7 +9,7 @@
 #include "wimlib/textfile.h"
 #include "wimlib/util.h"
 
-struct wim_lookup_table;
+struct blob_table;
 struct wim_dentry;
 struct wim_inode;
 
@@ -22,12 +22,12 @@ struct capture_config {
 /* Common parameters to implementations of building an in-memory dentry tree
  * from an on-disk directory structure. */
 struct capture_params {
-       /* Pointer to the lookup table of the WIM.  */
-       struct wim_lookup_table *lookup_table;
+       /* Pointer to the blob table of the WIM.  */
+       struct blob_table *blob_table;
 
-       /* List of streams that have been added so far, but without their SHA1
+       /* List of blobs that have been added so far, but without their SHA-1
         * message digests being calculated (as a shortcut).  */
-       struct list_head *unhashed_streams;
+       struct list_head *unhashed_blobs;
 
        /* Hash table of inodes that have been captured for this tree so far. */
        struct wim_inode_table *inode_table;
@@ -42,10 +42,6 @@ struct capture_params {
        /* Flags that affect the capture operation (WIMLIB_ADD_FLAG_*) */
        int add_flags;
 
-       /* Extra argument; set to point to a pointer to the ntfs_volume for
-        * libntfs-3g capture.  */
-       void *extra_arg;
-
        /* If non-NULL, the user-supplied progress function. */
        wimlib_progress_func_t progfunc;
        void *progctx;
@@ -93,9 +89,9 @@ typedef int (*capture_tree_t)(struct wim_dentry **, const tchar *,
 #ifdef WITH_NTFS_3G
 /* ntfs-3g_capture.c */
 extern int
-build_dentry_tree_ntfs(struct wim_dentry **root_p,
-                      const tchar *device,
-                      struct capture_params *params);
+ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret,
+                         const tchar *device,
+                         struct capture_params *params);
 #endif
 
 #ifdef __WIN32__