bitops: rename bit scan functions

[wimlib] / include / wimlib / dentry.h

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index ad4e73ece91139e37443d10616df418d7ac530b2..9f4f4666e4d1f5915827b4b7bd7df24bc2a9ed52 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -77,7 +77,7 @@ struct wim_dentry {
         * excluding the terminating null  */
        u16 d_extraction_name_nchars;
 
-       /* When capturing from an NTFS volume using NTFS-3g, this flag is set on
+       /* When capturing from an NTFS volume using NTFS-3G, this flag is set on
         * dentries that were created from a filename in the WIN32 or WIN32+DOS
         * namespaces rather than the POSIX namespace.  Otherwise this will
         * always be 0.  */
@@ -119,6 +119,10 @@ struct wim_dentry {
         * that needs to be extracted as part of the current extraction
         * operation, or NULL if this is the last alias.  */
        struct wim_dentry *d_next_extraction_alias;
+
+#ifdef ENABLE_TEST_SUPPORT
+       struct wim_dentry *d_corresponding;
+#endif
 };
 
 static inline bool
@@ -132,8 +136,7 @@ dentry_out_total_length(const struct wim_dentry *dentry);
 
 extern int
 for_dentry_in_tree(struct wim_dentry *root,
-                  int (*visitor)(struct wim_dentry*, void*),
-                  void *args);
+                  int (*visitor)(struct wim_dentry *, void *), void *args);
 
 /* Iterate through each @child dentry of the @dir directory inode,
  * in sorted order by case sensitive name.  */
@@ -182,19 +185,17 @@ extern void
 calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
 
 extern int
-dentry_set_name(struct wim_dentry *dentry, const tchar *new_name);
+dentry_set_name(struct wim_dentry *dentry, const tchar *name);
 
 extern int
-dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *new_name,
-                       size_t new_name_nbytes);
+dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *name,
+                       size_t name_nbytes);
 
 extern struct wim_dentry *
-get_dentry(struct WIMStruct *wim, const tchar *path,
-          CASE_SENSITIVITY_TYPE case_type);
+get_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
-get_dentry_child_with_name(const struct wim_dentry *dentry,
-                          const tchar *name,
+get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name,
                           CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
@@ -204,7 +205,7 @@ get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry,
                                   CASE_SENSITIVITY_TYPE case_type);
 
 extern struct wim_dentry *
-get_parent_dentry(struct WIMStruct *wim, const tchar *path,
+get_parent_dentry(WIMStruct *wim, const tchar *path,
                  CASE_SENSITIVITY_TYPE case_type);
 
 extern int
@@ -221,9 +222,6 @@ extern int
 new_dentry_with_existing_inode(const tchar *name, struct wim_inode *inode,
                               struct wim_dentry **dentry_ret);
 
-extern void
-dentry_tree_clear_inode_visited(struct wim_dentry *root);
-
 extern int
 new_filler_directory(struct wim_dentry **dentry_ret);
 
@@ -231,8 +229,7 @@ extern void
 free_dentry(struct wim_dentry *dentry);
 
 extern void
-free_dentry_tree(struct wim_dentry *root,
-                struct blob_table *blob_table);
+free_dentry_tree(struct wim_dentry *root, struct blob_table *blob_table);
 
 extern void
 unlink_dentry(struct wim_dentry *dentry);
@@ -284,4 +281,5 @@ dentry_has_short_name(const struct wim_dentry *dentry)
 {
        return dentry->d_short_name_nbytes != 0;
 }
+
 #endif /* _WIMLIB_DENTRY_H */