X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=8408a461f01fb9604437ea3a537f4c4145ec173b;hb=8a1b5f46145cc8be56ce09eec1513db079b86bc7;hp=93d71e55bcefd951b84c5d57a271cd03285badff;hpb=51829aecdac415b417ab5b8ac897014bb780de10;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 93d71e55..8408a461 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -39,7 +39,6 @@
 #include "wimlib/alloca.h"
 #include "wimlib/assert.h"
 #include "wimlib/blob_table.h"
-#include "wimlib/capture.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/endianness.h"
@@ -48,12 +47,13 @@
 #include "wimlib/object_id.h"
 #include "wimlib/paths.h"
 #include "wimlib/reparse.h"
+#include "wimlib/scan.h"
 #include "wimlib/security.h"
 
-/* NTFS-3g 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY.  We can't check for the
+/* NTFS-3G 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY.  We can't check for the
  * existence of NTFS_MNT_RDONLY at compilation time because it's an enum.  We
  * also can't check for MS_RDONLY being missing because it's also a system
- * constant.  So check if the NTFS-3g specific MS_IGNORE_HIBERFILE is defined;
+ * constant.  So check if the NTFS-3G specific MS_IGNORE_HIBERFILE is defined;
  * if yes, then we need to use the old MS_RDONLY.  */
 #ifdef MS_IGNORE_HIBERFILE
 #  define NTFS_MNT_RDONLY MS_RDONLY
@@ -271,7 +271,7 @@ set_attr_sort_key(ntfs_inode *ni, struct ntfs_location *loc)
 /*
  * Add a new stream to the specified inode, with duplicate checking.
  *
- * This works around a problem where NTFS-3g can list multiple unnamed data
+ * This works around a problem where NTFS-3G can list multiple unnamed data
  * streams for a single file.  In this case we can only keep one.  We'll prefer
  * one that is nonempty.
  */
@@ -611,7 +611,7 @@ struct readdir_ctx {
 	size_t path_len;
 	struct dos_name_map dos_name_map;
 	struct ntfs_volume_wrapper *volume;
-	struct capture_params *params;
+	struct scan_params *params;
 	int ret;
 };
 
@@ -622,7 +622,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_p,
 				    size_t path_len,
 				    int name_type,
 				    struct ntfs_volume_wrapper *volume,
-				    struct capture_params *params);
+				    struct scan_params *params);
 
 static int
 filldir(void *_ctx, const ntfschar *name, const int name_nchars,
@@ -676,7 +676,7 @@ static int
 ntfs_3g_recurse_directory(ntfs_inode *ni, char *path, size_t path_len,
 			  struct wim_dentry *parent,
 			  struct ntfs_volume_wrapper *volume,
-			  struct capture_params *params)
+			  struct scan_params *params)
 {
 	int ret;
 	s64 pos = 0;
@@ -721,7 +721,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				    size_t path_len,
 				    int name_type,
 				    struct ntfs_volume_wrapper *volume,
-				    struct capture_params *params)
+				    struct scan_params *params)
 {
 	u32 attributes;
 	int ret;
@@ -753,13 +753,13 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	if (unlikely(attributes & FILE_ATTRIBUTE_ENCRYPTED)) {
 		if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
 		{
-			ERROR("Can't archive \"%s\" because NTFS-3g capture mode "
+			ERROR("Can't archive \"%s\" because NTFS-3G capture mode "
 			      "does not support encrypted files and directories", path);
 			ret = WIMLIB_ERR_UNSUPPORTED_FILE;
 			goto out;
 		}
 		params->progress.scan.cur_path = path;
-		ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
+		ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
 		goto out;
 	}
 
@@ -812,7 +812,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	if (ret)
 		goto out;
 
-	/* Reparse-point fixups are a no-op because in NTFS-3g capture mode we
+	/* Reparse-point fixups are a no-op because in NTFS-3G capture mode we
 	 * only allow capturing an entire volume. */
 	if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
 	    inode_is_symlink(inode))
@@ -838,16 +838,16 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 out_progress:
 	params->progress.scan.cur_path = path;
 	if (root == NULL)
-		ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
+		ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 	else
-		ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+		ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
 out:
 	if (ni)
 		ntfs_inode_close(ni);
 	if (unlikely(ret)) {
 		free_dentry_tree(root, params->blob_table);
 		root = NULL;
-		ret = report_capture_error(params, ret, path);
+		ret = report_scan_error(params, ret, path);
 	}
 	*root_ret = root;
 	return ret;
@@ -855,8 +855,7 @@ out:
 
 int
 ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret,
-			  const char *device,
-			  struct capture_params *params)
+			  const char *device, struct scan_params *params)
 {
 	struct ntfs_volume_wrapper *volume;
 	ntfs_volume *vol;