- int (*visitor)(struct wim_dentry*, void*),
- void *args);
-
-extern int
-for_dentry_in_rbtree(struct rb_node *node,
- int (*visitor)(struct wim_dentry *, void *),
- void *arg);
-
-extern int
-for_dentry_child(const struct wim_dentry *dentry,
- int (*visitor)(struct wim_dentry *, void *),
- void *arg);
-
-extern int
-for_dentry_in_tree_depth(struct wim_dentry *root,
- int (*visitor)(struct wim_dentry*, void*),
- void *args);
-
-extern void
-calculate_subdir_offsets(struct wim_dentry *dentry, u64 *subdir_offset_p);
-
-extern int
-dentry_set_name(struct wim_dentry *dentry, const tchar *new_name);
-
-extern struct wim_dentry *
-get_dentry(struct 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,
+ int (*visitor)(struct wim_dentry *, void *), void *args);
+
+/* Iterate through each @child dentry of the @dir directory inode in
+ * collation order. */
+#define for_inode_child(child, dir) \
+ avl_tree_for_each_in_order((child), (dir)->i_children, \
+ struct wim_dentry, d_index_node)
+
+/* Iterate through each @child dentry of the @parent dentry in
+ * collation order. */
+#define for_dentry_child(child, parent) \
+ for_inode_child((child), (parent)->d_inode)
+
+/* Iterate through each @child dentry of the @dir directory inode in
+ * postorder (safe for freeing the child dentries). */
+#define for_inode_child_postorder(child, dir) \
+ avl_tree_for_each_in_postorder((child), (dir)->i_children, \
+ struct wim_dentry, d_index_node)
+
+/* Iterate through each @child dentry of the @parent dentry in
+ * postorder (safe for freeing the child dentries). */
+#define for_dentry_child_postorder(child, parent) \
+ for_inode_child_postorder((child), (parent)->d_inode)
+
+/* Get any child dentry of the @dir directory inode. Requires
+ * inode_has_children(@dir) == true. */
+#define inode_any_child(dir) \
+ avl_tree_entry((dir)->i_children, struct wim_dentry, d_index_node)
+
+/* Get any child dentry of the @parent dentry. Requires
+ * dentry_has_children(@parent) == true. */
+#define dentry_any_child(parent) \
+ inode_any_child((parent)->d_inode)
+
+struct wim_dentry *
+dentry_get_first_ci_match(struct wim_dentry *dentry);
+
+struct wim_dentry *
+dentry_get_next_ci_match(struct wim_dentry *dentry,
+ struct wim_dentry *ci_match);
+
+/* Iterate through all other dentries which have the same case insensitive name
+ * as the one given. */
+#define dentry_for_each_ci_match(ci_match, dentry) \
+ for ((ci_match) = dentry_get_first_ci_match((dentry)); \
+ (ci_match); \
+ (ci_match) = dentry_get_next_ci_match((dentry), (ci_match)))
+
+void
+calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
+
+int
+dentry_set_name(struct wim_dentry *dentry, const tchar *name);
+
+int
+dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *name,
+ size_t name_nbytes);
+
+struct wim_dentry *
+get_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type);
+
+struct wim_dentry *
+get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name,