X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwimlib%2Fdentry.h;h=b5771b63f69ed9e19addac8d1b53ea85e5ca9146;hb=a8343baff22193be4651a3a63b07cb1520ced4e8;hp=40a4c8e67d7e259a5be7a69a2dd2e5a6dc63fa71;hpb=aa3a2830cd4154238bc6a342ffea43d9ac69a14c;p=wimlib

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 40a4c8e6..b5771b63 100644
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -57,77 +57,70 @@ struct wim_dentry {
 
 	/* Linked list node that places this dentry in the list of aliases for
 	 * its inode (d_inode) */
-	struct list_head d_alias;
+	struct hlist_node d_alias_node;
+
+	/* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
+	 * dentry has no filename.  */
+	utf16lechar *d_name;
 
 	/* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
 	 * if this dentry has no short name.  */
-	utf16lechar *short_name;
+	utf16lechar *d_short_name;
 
-	/* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
-	 * dentry has no filename.  */
-	utf16lechar *file_name;
+	/* Length of 'd_name' in bytes, excluding the terminating null  */
+	u16 d_name_nbytes;
 
-	/* Length of UTF-16LE encoded short filename, in bytes, not including
-	 * the terminating zero wide-character. */
-	u16 short_name_nbytes;
+	/* Length of 'd_short_name' in bytes, excluding the terminating null  */
+	u16 d_short_name_nbytes;
 
-	/* Length of UTF-16LE encoded "long" file name, in bytes, not including
-	 * the terminating null character. */
-	u16 file_name_nbytes;
+	/* (Extraction only) Length of 'd_extraction_name' in _characters_,
+	 * excluding the terminating null  */
+	u16 d_extraction_name_nchars;
 
 	/* When capturing from an NTFS volume using NTFS-3g, this flag is set on
 	 * 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;
+	u16 d_is_win32_name : 1;
 
 	/* Temporary flag; always reset to 0 when done using.  */
-	u8 tmp_flag : 1;
+	u16 d_tmp_flag : 1;
 
 	/* Used by wimlib_update_image()  */
-	u8 is_orphan : 1;
+	u16 d_is_orphan : 1;
 
 	union {
-		/* 'subdir_offset' is only used while reading and writing this
+		/* The subdir offset is only used while reading and writing this
 		 * dentry.  See the corresponding field in `struct
 		 * wim_dentry_on_disk' for explanation.  */
-		u64 subdir_offset;
+		u64 d_subdir_offset;
 
 		/* Temporary list field  */
-		struct list_head tmp_list;
+		struct list_head d_tmp_list;
 	};
 
 	/* Full path to this dentry in the WIM, in platform-dependent tchars
 	 * that can be printed without conversion.  By default this field will
 	 * be NULL and will only be calculated on-demand by the
 	 * calculate_dentry_full_path() or dentry_full_path() functions.  */
-	tchar *_full_path;
+	tchar *d_full_path;
 
 	/* (Extraction only) Actual name to extract this dentry as.  This may be
 	 * either in 'tchars' or in 'utf16lechars', depending on what encoding
-	 * the extraction backend needs.  This may alias 'file_name'.  If it
+	 * the extraction backend needs.  This may alias 'd_name'.  If it
 	 * doesn't, it is an allocated buffer which must be freed.  */
 	void *d_extraction_name;
 
-	/* (Extraction only) Number of characters in d_extraction_name.  */
-	size_t d_extraction_name_nchars;
-
 	/* (Extraction only) Linked list node that connects all dentries being
 	 * extracted as part of the current extraction operation.  */
 	struct list_head d_extraction_list_node;
 
-	/* (Extraction only) Linked list node that connects all dentries being
-	 * extracted as aliases of the same inode as part of the current
-	 * extraction operation.  */
-	struct list_head d_extraction_alias_node;
+	/* (Extraction only) Pointer to the next alias of this dentry's inode
+	 * that needs to be extracted as part of the current extraction
+	 * operation, or NULL if this is the last alias.  */
+	struct wim_dentry *d_next_extraction_alias;
 };
 
-static inline bool
-dentry_is_first_in_inode(const struct wim_dentry *dentry)
-{
-	return inode_first_dentry(dentry->d_inode) == dentry;
-}
-
 static inline bool
 will_extract_dentry(const struct wim_dentry *dentry)
 {
@@ -139,8 +132,7 @@ dentry_out_total_length(const struct wim_dentry *dentry);
 
 extern int
 for_dentry_in_tree(struct wim_dentry *root,
-		   int (*visitor)(struct wim_dentry*, void*),
-		   void *args);
+		   int (*visitor)(struct wim_dentry *, void *), void *args);
 
 /* Iterate through each @child dentry of the @dir directory inode,
  * in sorted order by case sensitive name.  */
@@ -189,19 +181,17 @@ extern void
 calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
 
 extern int
-dentry_set_name(struct wim_dentry *dentry, const tchar *new_name);
+dentry_set_name(struct wim_dentry *dentry, const tchar *name);
 
 extern int
-dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *new_name,
-			size_t new_name_nbytes);
+dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *name,
+			size_t name_nbytes);
 
 extern struct wim_dentry *
-get_dentry(struct WIMStruct *wim, const tchar *path,
-	   CASE_SENSITIVITY_TYPE case_type);
+get_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
-get_dentry_child_with_name(const struct wim_dentry *dentry,
-			   const tchar *name,
+get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name,
 			   CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
@@ -211,7 +201,7 @@ get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry,
 				   CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
-get_parent_dentry(struct WIMStruct *wim, const tchar *path,
+get_parent_dentry(WIMStruct *wim, const tchar *path,
 		  CASE_SENSITIVITY_TYPE case_type);
 
 extern int
@@ -228,9 +218,6 @@ extern int
 new_dentry_with_existing_inode(const tchar *name, struct wim_inode *inode,
 			       struct wim_dentry **dentry_ret);
 
-extern void
-dentry_tree_clear_inode_visited(struct wim_dentry *root);
-
 extern int
 new_filler_directory(struct wim_dentry **dentry_ret);
 
@@ -238,8 +225,7 @@ extern void
 free_dentry(struct wim_dentry *dentry);
 
 extern void
-free_dentry_tree(struct wim_dentry *root,
-		 struct blob_table *blob_table);
+free_dentry_tree(struct wim_dentry *root, struct blob_table *blob_table);
 
 extern void
 unlink_dentry(struct wim_dentry *dentry);
@@ -281,14 +267,15 @@ dentry_has_children(const struct wim_dentry *dentry)
 }
 
 static inline bool
-dentry_has_short_name(const struct wim_dentry *dentry)
+dentry_has_long_name(const struct wim_dentry *dentry)
 {
-	return dentry->short_name_nbytes != 0;
+	return dentry->d_name_nbytes != 0;
 }
 
 static inline bool
-dentry_has_long_name(const struct wim_dentry *dentry)
+dentry_has_short_name(const struct wim_dentry *dentry)
 {
-	return dentry->file_name_nbytes != 0;
+	return dentry->d_short_name_nbytes != 0;
 }
+
 #endif /* _WIMLIB_DENTRY_H */