ntfs-3g_apply.c: Do not use i_visited

[wimlib] / include / wimlib / inode.h

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 01254c82d1ccd9a7f9453ba7c345727e934ddc34..2fd9f08357855c8e7a7ec3163a8779cbb43f609e 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -106,13 +106,13 @@ struct wim_inode {
        u32 i_attributes;
 
        /* Root of a balanced binary search tree storing the child directory
-        * entries of this inode, if any.  Keyed by wim_dentry->file_name, case
+        * entries of this inode, if any.  Keyed by wim_dentry->d_name, case
         * sensitively.  If this inode is not a directory or if it has no
         * children then this will be an empty tree (NULL).  */
        struct avl_tree_node *i_children;
 
        /* Root of a balanced binary search tree storing the child directory
-        * entries of this inode, if any.  Keyed by wim_dentry->file_name, case
+        * entries of this inode, if any.  Keyed by wim_dentry->d_name, case
         * insensitively.  If this inode is not a directory or if it has no
         * children then this will be an empty tree (NULL).  */
        struct avl_tree_node *i_children_ci;
@@ -124,15 +124,13 @@ struct wim_inode {
        /* Field to place this inode into a list.  While reading a WIM image or
         * adding files to a WIM image this is owned by the inode table;
         * otherwise this links the inodes for the WIM image.  */
-       struct hlist_node i_hlist;
+       struct hlist_node i_hlist_node;
 
        /* Number of dentries that are aliases for this inode.  */
        u32 i_nlink : 30;
 
-       /* Flag used to mark this inode as visited; this is used when visiting
-        * all the inodes in a dentry tree exactly once.  It will be 0 by
-        * default and must be cleared following the tree traversal, even in
-        * error paths.  */
+       /* Flag used by some code to mark this inode as visited.  It will be 0
+        * by default, and it always must be cleared after use.  */
        u32 i_visited : 1;
 
        /* Cached value  */
@@ -359,8 +357,8 @@ inode_replace_stream_data(struct wim_inode *inode,
                          struct blob_table *blob_table);
 
 extern bool
-inode_add_stream_with_data(struct wim_inode *inode, int stream_type,
-                          const utf16lechar *stream_name,
+inode_add_stream_with_data(struct wim_inode *inode,
+                          int stream_type, const utf16lechar *stream_name,
                           const void *data, size_t size,
                           struct blob_table *blob_table);
 
@@ -397,8 +395,8 @@ extern bool
 inode_has_named_data_stream(const struct wim_inode *inode);
 
 extern int
-inode_resolve_streams(struct wim_inode *inode,
-                     struct blob_table *table, bool force);
+inode_resolve_streams(struct wim_inode *inode, struct blob_table *table,
+                     bool force);
 
 extern int
 blob_not_found_error(const struct wim_inode *inode, const u8 *hash);