template.c: iterate through inodes instead of dentries

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index a1a312dbc300cd14fede4339e08b6b6c654a4e7e..01945b2a33062b80b8a53f1c830ab8441d30795e 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -472,10 +472,10 @@ for_dentry_in_tree_depth(struct wim_dentry *root,
 /*
  * Calculate the full path to @dentry within the WIM image, if not already done.
  *
- * The full name will be saved in the cached value 'dentry->_full_path'.
+ * The full name will be saved in the cached value 'dentry->d_full_path'.
  *
  * Whenever possible, use dentry_full_path() instead of calling this and
- * accessing _full_path directly.
+ * accessing d_full_path directly.
  *
  * Returns 0 or an error code resulting from a failed string conversion.
  */
@@ -486,7 +486,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry)
        size_t dummy;
        const struct wim_dentry *d;
 
-       if (dentry->_full_path)
+       if (dentry->d_full_path)
                return 0;
 
        ulen = 0;
@@ -511,7 +511,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry)
        wimlib_assert(p == ubuf);
 
        return utf16le_to_tstr(ubuf, ulen * sizeof(utf16lechar),
-                              &dentry->_full_path, &dummy);
+                              &dentry->d_full_path, &dummy);
 }
 
 /*
@@ -525,7 +525,7 @@ tchar *
 dentry_full_path(struct wim_dentry *dentry)
 {
        calculate_dentry_full_path(dentry);
-       return dentry->_full_path;
+       return dentry->d_full_path;
 }
 
 static int
@@ -666,10 +666,10 @@ struct wim_dentry *
 get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry,
                                   const utf16lechar *name,
                                   size_t name_nbytes,
-                                  CASE_SENSITIVITY_TYPE case_ctype)
+                                  CASE_SENSITIVITY_TYPE case_type)
 {
        const struct wim_inode *dir = dentry->d_inode;
-       bool ignore_case = will_ignore_case(case_ctype);
+       bool ignore_case = will_ignore_case(case_type);
        struct wim_dentry dummy;
        struct wim_dentry *child;
 
@@ -982,19 +982,6 @@ new_filler_directory(struct wim_dentry **dentry_ret)
        return 0;
 }
 
-static int
-dentry_clear_inode_visited(struct wim_dentry *dentry, void *_ignore)
-{
-       dentry->d_inode->i_visited = 0;
-       return 0;
-}
-
-void
-dentry_tree_clear_inode_visited(struct wim_dentry *root)
-{
-       for_dentry_in_tree(root, dentry_clear_inode_visited, NULL);
-}
-
 /*
  * Free a WIM dentry.
  *
@@ -1008,7 +995,7 @@ free_dentry(struct wim_dentry *dentry)
                d_disassociate(dentry);
                FREE(dentry->d_name);
                FREE(dentry->d_short_name);
-               FREE(dentry->_full_path);
+               FREE(dentry->d_full_path);
                FREE(dentry);
        }
 }