From 80b48ed7aeb8e6c9460ab254920818f9e36d656e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 10:02:39 -0500 Subject: [PATCH] Rename is_win32_name => d_is_win32_name --- include/wimlib/dentry.h | 2 +- src/ntfs-3g_capture.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index 2e35c758..0908b445 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -77,7 +77,7 @@ struct wim_dentry { * dentries that were created from a filename in the WIN32 or WIN32+DOS * namespaces rather than the POSIX namespace. Otherwise this will * always be 0. */ - u8 is_win32_name : 1; + u8 d_is_win32_name : 1; /* Temporary flag; always reset to 0 when done using. */ u8 tmp_flag : 1; diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index 7ad99768..0180a488 100644 --- 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, @@ -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; -- 2.46.1