Rename is_orphan => d_is_orphan

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index f36f9ecf9c8436a52b23076aa18d901b3c5e084e..359dffe304ed77cc448c6fbdb73d68f17fa9fde7 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -267,7 +267,7 @@ rollback_link(struct wim_dentry *subject, struct wim_dentry *parent,
 
        /* @subject is now unlinked.  Add it to orphans. */
        list_add(&subject->tmp_list, orphans);
-       subject->is_orphan = 1;
+       subject->d_is_orphan = 1;
 }
 
 /* Undo an unlink operation.  */
@@ -280,7 +280,7 @@ rollback_unlink(struct wim_dentry *subject, struct wim_dentry *parent,
 
        /* @subject is no longer unlinked.  Delete it from orphans. */
        list_del(&subject->tmp_list);
-       subject->is_orphan = 0;
+       subject->d_is_orphan = 0;
 }
 
 /* Rollback a name change operation.  */
@@ -315,13 +315,13 @@ rollback_update_primitive(const struct update_primitive *prim,
                break;
        case CHANGE_FILE_NAME:
                rollback_name_change(prim->name.old_name,
-                                    &prim->name.subject->file_name,
-                                    &prim->name.subject->file_name_nbytes);
+                                    &prim->name.subject->d_name,
+                                    &prim->name.subject->d_name_nbytes);
                break;
        case CHANGE_SHORT_NAME:
                rollback_name_change(prim->name.old_name,
-                                    &prim->name.subject->short_name,
-                                    &prim->name.subject->short_name_nbytes);
+                                    &prim->name.subject->d_short_name,
+                                    &prim->name.subject->d_short_name_nbytes);
                break;
        }
 }
@@ -362,9 +362,9 @@ journaled_link(struct update_command_journal *j,
 
        do_link(subject, parent, j->root_p);
 
-       if (subject->is_orphan) {
+       if (subject->d_is_orphan) {
                list_del(&subject->tmp_list);
-               subject->is_orphan = 0;
+               subject->d_is_orphan = 0;
        }
        return 0;
 }
@@ -395,7 +395,7 @@ journaled_unlink(struct update_command_journal *j, struct wim_dentry *subject)
        do_unlink(subject, parent, j->root_p);
 
        list_add(&subject->tmp_list, &j->orphans);
-       subject->is_orphan = 1;
+       subject->d_is_orphan = 1;
        return 0;
 }
 
@@ -420,26 +420,26 @@ journaled_change_name(struct update_command_journal *j,
 
        prim.type = CHANGE_FILE_NAME;
        prim.name.subject = dentry;
-       prim.name.old_name = dentry->file_name;
+       prim.name.old_name = dentry->d_name;
        ret = record_update_primitive(j, prim);
        if (ret) {
                FREE(new_name);
                return ret;
        }
 
-       dentry->file_name = new_name;
-       dentry->file_name_nbytes = new_name_nbytes;
+       dentry->d_name = new_name;
+       dentry->d_name_nbytes = new_name_nbytes;
 
        /* Clear the short name.  */
        prim.type = CHANGE_SHORT_NAME;
        prim.name.subject = dentry;
-       prim.name.old_name = dentry->short_name;
+       prim.name.old_name = dentry->d_short_name;
        ret = record_update_primitive(j, prim);
        if (ret)
                return ret;
 
-       dentry->short_name = NULL;
-       dentry->short_name_nbytes = 0;
+       dentry->d_short_name = NULL;
+       dentry->d_short_name_nbytes = 0;
        return 0;
 }
 
@@ -513,8 +513,8 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
 
                        existing_child =
                                get_dentry_child_with_utf16le_name(existing,
-                                                                  new_child->file_name,
-                                                                  new_child->file_name_nbytes,
+                                                                  new_child->d_name,
+                                                                  new_child->d_name_nbytes,
                                                                   WIMLIB_CASE_PLATFORM_DEFAULT);
                        unlink_dentry(new_child);
                        if (existing_child) {
@@ -803,7 +803,7 @@ execute_add_command(struct update_command_journal *j,
 
 #ifdef WITH_NTFS_3G
        if (add_flags & WIMLIB_ADD_FLAG_NTFS)
-               capture_tree = build_dentry_tree_ntfs;
+               capture_tree = ntfs_3g_build_dentry_tree;
 #endif
 
        ret = get_capture_config(config_file, &config,