bitops: rename bit scan functions

[wimlib] / include / wimlib / dentry.h

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 4adc5fed761d67e96b5832e2ad4fe8351a5bcbaf..9f4f4666e4d1f5915827b4b7bd7df24bc2a9ed52 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -73,23 +73,27 @@ struct wim_dentry {
        /* Length of 'd_short_name' in bytes, excluding the terminating null  */
        u16 d_short_name_nbytes;
 
-       /* When capturing from an NTFS volume using NTFS-3g, this flag is set on
+       /* (Extraction only) Length of 'd_extraction_name' in _characters_,
+        * excluding the terminating null  */
+       u16 d_extraction_name_nchars;
+
+       /* 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.  */
-       u8 d_is_win32_name : 1;
+       u16 d_is_win32_name : 1;
 
        /* Temporary flag; always reset to 0 when done using.  */
-       u8 d_tmp_flag : 1;
+       u16 d_tmp_flag : 1;
 
        /* Used by wimlib_update_image()  */
-       u8 d_is_orphan : 1;
+       u16 d_is_orphan : 1;
 
        union {
-               /* 'subdir_offset' is only used while reading and writing this
+               /* The subdir offset is only used while reading and writing this
                 * dentry.  See the corresponding field in `struct
                 * wim_dentry_on_disk' for explanation.  */
-               u64 subdir_offset;
+               u64 d_subdir_offset;
 
                /* Temporary list field  */
                struct list_head d_tmp_list;
@@ -99,7 +103,7 @@ struct wim_dentry {
         * that can be printed without conversion.  By default this field will
         * be NULL and will only be calculated on-demand by the
         * calculate_dentry_full_path() or dentry_full_path() functions.  */
-       tchar *_full_path;
+       tchar *d_full_path;
 
        /* (Extraction only) Actual name to extract this dentry as.  This may be
         * either in 'tchars' or in 'utf16lechars', depending on what encoding
@@ -107,17 +111,18 @@ struct wim_dentry {
         * doesn't, it is an allocated buffer which must be freed.  */
        void *d_extraction_name;
 
-       /* (Extraction only) Number of characters in d_extraction_name.  */
-       size_t d_extraction_name_nchars;
-
        /* (Extraction only) Linked list node that connects all dentries being
         * extracted as part of the current extraction operation.  */
        struct list_head d_extraction_list_node;
 
-       /* (Extraction only) Pointer to the next alias for this dentry's inode
+       /* (Extraction only) Pointer to the next alias of this dentry's inode
         * 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
@@ -131,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.  */
@@ -181,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 *
@@ -203,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
@@ -220,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);
 
@@ -230,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);
@@ -283,4 +281,5 @@ dentry_has_short_name(const struct wim_dentry *dentry)
 {
        return dentry->d_short_name_nbytes != 0;
 }
+
 #endif /* _WIMLIB_DENTRY_H */