X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=841c9ca935bda23c420bff4b841cb099b7e4a222;hp=1e8724cbc973e9665b24321a1297f96aeaa10f69;hb=45c3ad86e44a05a169bfb1fa8ff318861bbf9fbf;hpb=d5b841b4d3243c7c6922d9254fb4e5b9f0b58d41

diff --git a/src/dentry.h b/src/dentry.h
index 1e8724cb..841c9ca9 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -128,14 +128,55 @@ static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1,
  * hardlink.c).
  */
 struct dentry {
+	/* Byte 0 */
+
 	/* The inode for this dentry */
 	struct inode *d_inode;
 
-	/* The parent of this directory entry. */
-	struct dentry *parent;
+	/* Byte 8 */
 
+	/* Red-black tree of sibling dentries */
 	struct rb_node rb_node;
 
+	/* Byte 32 */
+
+	/* Length of short filename, in bytes, not including the terminating
+	 * zero wide-character. */
+	u16 short_name_len;
+
+	/* Length of file name, in bytes, not including the terminating zero
+	 * wide-character. */
+	u16 file_name_len;
+
+	/* Length of the filename converted into UTF-8, in bytes, not including
+	 * the terminating zero byte. */
+	u16 file_name_utf8_len;
+
+	u8 is_extracted : 1;
+
+	/* Byte 40 */
+
+	/* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
+	char *file_name_utf8;
+
+	/* Byte 48 */
+
+	union {
+		struct list_head tmp_list;
+		struct {
+			void *tmp_ptr_1;
+			void *tmp_ptr_2;
+		};
+	};
+
+	/* Byte 64 */
+
+	/* List of dentries in the inode (hard link set)  */
+	struct list_head inode_dentry_list;
+
+	/* The parent of this directory entry. */
+	struct dentry *parent;
+
 	/*
 	 * Size of directory entry on disk, in bytes.  Typical size is around
 	 * 104 to 120 bytes.
@@ -156,48 +197,26 @@ struct dentry {
 	 */
 	u64 length;
 
+
 	/* The offset, from the start of the uncompressed WIM metadata resource
 	 * for this image, of this dentry's child dentries.  0 if the directory
 	 * entry has no children, which is the case for regular files or reparse
 	 * points. */
 	u64 subdir_offset;
 
-	/* Length of short filename, in bytes, not including the terminating
-	 * zero wide-character. */
-	u16 short_name_len;
-
-	/* Length of file name, in bytes, not including the terminating zero
-	 * wide-character. */
-	u16 file_name_len;
-
-	/* Length of the filename converted into UTF-8, in bytes, not including
-	 * the terminating zero byte. */
-	u16 file_name_utf8_len;
+	/* Number of references to the dentry tree itself, as in multiple
+	 * WIMStructs */
+	u32 refcnt;
 
-	/* Pointer to the short filename (malloc()ed buffer) */
+	/* Pointer to the UTF-16 short filename (malloc()ed buffer) */
 	char *short_name;
 
-	/* Pointer to the filename (malloc()ed buffer). */
+	/* Pointer to the UTF-16 filename (malloc()ed buffer). */
 	char *file_name;
 
-	/* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
-	char *file_name_utf8;
-
-	/* Full path to this dentry (malloc()ed buffer). */
+	/* Full path (UTF-8) to this dentry (malloc()ed buffer). */
 	char *full_path_utf8;
 	u32   full_path_utf8_len;
-
-	/* Number of references to the dentry tree itself, as in multiple
-	 * WIMStructs */
-	u32 refcnt;
-
-	/* List of dentries in the inode (hard link set)  */
-	struct list_head inode_dentry_list;
-
-	union {
-		struct list_head tmp_list;
-		bool is_extracted;
-	};
 };
 
 #define rbnode_dentry(node) container_of(node, struct dentry, rb_node)
@@ -355,9 +374,6 @@ extern void unlink_dentry(struct dentry *dentry);
 extern bool dentry_add_child(struct dentry * restrict parent,
 			     struct dentry * restrict child);
 
-// XXX
-#define link_dentry(child, parent) dentry_add_child(parent, child)
-
 extern int verify_dentry(struct dentry *dentry, void *wim);