X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fntfs-3g_capture.c;h=066d38489fb999f46997d4acfb62d87daf06a1f7;hb=0e650cac77ac5a9e418300e50d7ddd7696a18531;hp=5a97cff04e560252fb13cbde6f7d0f8c5f92f53f;hpb=e925fcc4f725864e7bc8dc3dac3812480a1fe56d;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 5a97cff0..066d3848 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -521,14 +521,14 @@ set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map)
 {
 	const struct dos_name_node *node;
 
-	if (dentry->is_win32_name) {
+	if (dentry->d_is_win32_name) {
 		node = lookup_dos_name(map, dentry->d_inode->i_ino);
 		if (node) {
-			dentry->short_name = utf16le_dupz(node->dos_name,
-							  node->name_nbytes);
-			if (!dentry->short_name)
+			dentry->d_short_name = utf16le_dupz(node->dos_name,
+							    node->name_nbytes);
+			if (!dentry->d_short_name)
 				return WIMLIB_ERR_NOMEM;
-			dentry->short_name_nbytes = node->name_nbytes;
+			dentry->d_short_name_nbytes = node->name_nbytes;
 		} else {
 			WARNING("NTFS inode %"PRIu64" has Win32 name with no "
 				"corresponding DOS name",
@@ -675,10 +675,10 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	struct wim_inode *inode = NULL;
 	ntfs_inode *ni = NULL;
 
-	ret = try_exclude(path, path_len, params);
-	if (ret < 0) /* Excluded? */
+	ret = try_exclude(path, params);
+	if (unlikely(ret < 0)) /* Excluded? */
 		goto out_progress;
-	if (ret > 0) /* Error? */
+	if (unlikely(ret > 0)) /* Error? */
 		goto out;
 
 	ni = ntfs_inode_open(volume->vol, mref);
@@ -717,7 +717,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		goto out;
 
 	if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
-		root->is_win32_name = 1;
+		root->d_is_win32_name = 1;
 
 	inode = root->d_inode;