security.c: align total_length immediately after reading

[wimlib] / src / ntfs-3g_capture.c

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 7ad99768fc8dab8204056ac5fefafbba227b949a..066d38489fb999f46997d4acfb62d87daf06a1f7 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -521,7 +521,7 @@ 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->d_short_name = utf16le_dupz(node->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;