Fixes, comments

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 601a40c56256ac408b424cfcbcd8029c7de10765..299abc9fba37703bc3ef5d2813d5cc17feaa27b9 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -186,10 +186,6 @@ struct wim_dentry {
         * points. */
        u64 subdir_offset;
 
-       /* Number of references to the dentry tree itself, as in multiple
-        * WIMStructs */
-       u32 refcnt;
-
        /* Pointer to the UTF-16LE short filename (malloc()ed buffer) */
        utf16lechar *short_name;
 
@@ -197,7 +193,7 @@ struct wim_dentry {
        utf16lechar *file_name;
 
        /* Full path of this dentry */
-       tchar *full_path;
+       tchar *_full_path;
 };
 
 #define rbnode_dentry(node) container_of(node, struct wim_dentry, rb_node)
@@ -269,7 +265,10 @@ struct wim_inode {
         * link_count of them) */
        struct list_head i_dentry;
 
-       struct hlist_node i_hlist;
+       union {
+               struct hlist_node i_hlist;
+               struct list_head i_list;
+       };
 
        union {
                /* Used during image extraction to build a list of inodes that
@@ -346,9 +345,6 @@ for_dentry_in_tree_depth(struct wim_dentry *root,
                         int (*visitor)(struct wim_dentry*, void*),
                         void *args);
 
-extern int
-calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore);
-
 extern void
 calculate_subdir_offsets(struct wim_dentry *dentry, u64 *subdir_offset_p);
 
@@ -379,6 +375,9 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table);
 extern int
 print_dentry_full_path(struct wim_dentry *entry, void *ignore);
 
+extern tchar *
+dentry_full_path(struct wim_dentry *dentry);
+
 extern struct wim_inode *
 new_timeless_inode();
 
@@ -404,9 +403,6 @@ extern void
 free_dentry_tree(struct wim_dentry *root,
                 struct wim_lookup_table *lookup_table);
 
-extern int
-increment_dentry_refcnt(struct wim_dentry *dentry, void *ignore);
-
 extern void
 unlink_dentry(struct wim_dentry *dentry);