security.c: align total_length immediately after reading

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 49c0cdf14784337e49b289b298eb4bff198ee251..5c6f97566f74510eb460f84b8ff2792ce8a0fdb3 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -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.
  *
@@ -1655,8 +1642,6 @@ read_dentry_tree(const u8 *buf, size_t buf_len,
        int ret;
        struct wim_dentry *root;
 
-       DEBUG("Reading dentry tree (root_offset=%"PRIu64")", root_offset);
-
        ret = read_dentry(buf, buf_len, &root_offset, &root);
        if (ret)
                return ret;
@@ -1903,10 +1888,6 @@ write_dir_dentries(struct wim_dentry *dir, void *_pp)
 u8 *
 write_dentry_tree(struct wim_dentry *root, u8 *p)
 {
-       DEBUG("Writing dentry tree.");
-
-       wimlib_assert(root != NULL);
-
        /* write root dentry and end-of-directory entry following it */
        p = write_dentry(root, p);
        *(u64*)p = 0;