Non-recursive for_dentry_in_tree()

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 841c9ca935bda23c420bff4b841cb099b7e4a222..733cb2eea36ed5a074df72df2f8c135531b6eeed 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -161,13 +161,7 @@ struct dentry {
 
        /* Byte 48 */
 
-       union {
-               struct list_head tmp_list;
-               struct {
-                       void *tmp_ptr_1;
-                       void *tmp_ptr_2;
-               };
-       };
+       struct list_head tmp_list;
 
        /* Byte 64 */
 
@@ -208,6 +202,8 @@ struct dentry {
         * WIMStructs */
        u32 refcnt;
 
+       u32   full_path_utf8_len;
+
        /* Pointer to the UTF-16 short filename (malloc()ed buffer) */
        char *short_name;
 
@@ -216,7 +212,6 @@ struct dentry {
 
        /* Full path (UTF-8) to this dentry (malloc()ed buffer). */
        char *full_path_utf8;
-       u32   full_path_utf8_len;
 };
 
 #define rbnode_dentry(node) container_of(node, struct dentry, rb_node)