X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Finode.h;h=2fd9f08357855c8e7a7ec3163a8779cbb43f609e;hp=21fb9f535f232a3f4045521afe69faaba2723700;hb=26a90546f2a8ded51376d631e5a13f3d7a84f8dc;hpb=846d3ae386f6c12953816108c04de244533e3a4a

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 21fb9f53..2fd9f083 100644
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -106,33 +106,31 @@ 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;
 
 	/* List of dentries that are aliases for this inode.  There will be
 	 * i_nlink dentries in this list.  */
-	struct hlist_head i_dentry;
+	struct hlist_head i_alias_list;
 
 	/* 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  */
@@ -180,13 +178,13 @@ struct wim_inode {
 		/* Device number, used only during image capture, so we can
 		 * identify hard linked files by the combination of inode number
 		 * and device number (rather than just inode number, which could
-		 * be ambigious if the captured tree spans a mountpoint).  Set
+		 * be ambiguous if the captured tree spans a mountpoint).  Set
 		 * to 0 otherwise.  */
 		u64 i_devno;
 
 		/* Fields used only during extraction  */
 		struct {
-			/* A singly linked list of aliases of this dentry that
+			/* A singly linked list of aliases of this inode that
 			 * are being extracted in the current extraction
 			 * operation.  This list may be shorter than the inode's
 			 * full alias list.  This list will be constructed
@@ -206,7 +204,7 @@ struct wim_inode {
 		 * WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES:  the number
 		 * of streams this inode has that have not yet been fully read.
 		 * */
-		u32 num_remaining_streams;
+		u32 i_num_remaining_streams;
 
 #ifdef WITH_FUSE
 		struct {
@@ -268,11 +266,11 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps);
 
 /* Iterate through each alias of the specified inode.  */
 #define inode_for_each_dentry(dentry, inode) \
-	hlist_for_each_entry((dentry), &(inode)->i_dentry, d_alias)
+	hlist_for_each_entry((dentry), &(inode)->i_alias_list, d_alias_node)
 
 /* Return an alias of the specified inode.  */
 #define inode_first_dentry(inode) \
-	hlist_entry(inode->i_dentry.first, struct wim_dentry, d_alias)
+	hlist_entry(inode->i_alias_list.first, struct wim_dentry, d_alias_node)
 
 /* Return the full path of an alias of the specified inode, or NULL if a full
  * path could not be determined.  */
@@ -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);