Rename _full_path => d_full_path

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 15d7f7491fab3e82b5314067af9b5ee0886dca84..c15a31b0fa3b40d810fc9f576db05c318c3111c7 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -181,8 +181,8 @@ free_update_command_journal(struct update_command_journal *j)
        /* Free orphaned dentry trees  */
        while (!list_empty(&j->orphans)) {
                orphan = list_first_entry(&j->orphans,
-                                         struct wim_dentry, tmp_list);
-               list_del(&orphan->tmp_list);
+                                         struct wim_dentry, d_tmp_list);
+               list_del(&orphan->d_tmp_list);
                free_dentry_tree(orphan, j->blob_table);
        }
 
@@ -266,8 +266,8 @@ rollback_link(struct wim_dentry *subject, struct wim_dentry *parent,
        do_unlink(subject, parent, root_p);
 
        /* @subject is now unlinked.  Add it to orphans. */
-       list_add(&subject->tmp_list, orphans);
-       subject->is_orphan = 1;
+       list_add(&subject->d_tmp_list, orphans);
+       subject->d_is_orphan = 1;
 }
 
 /* Undo an unlink operation.  */
@@ -279,8 +279,8 @@ rollback_unlink(struct wim_dentry *subject, struct wim_dentry *parent,
        do_link(subject, parent, root_p);
 
        /* @subject is no longer unlinked.  Delete it from orphans. */
-       list_del(&subject->tmp_list);
-       subject->is_orphan = 0;
+       list_del(&subject->d_tmp_list);
+       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) {
-               list_del(&subject->tmp_list);
-               subject->is_orphan = 0;
+       if (subject->d_is_orphan) {
+               list_del(&subject->d_tmp_list);
+               subject->d_is_orphan = 0;
        }
        return 0;
 }
@@ -394,8 +394,8 @@ 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;
+       list_add(&subject->d_tmp_list, &j->orphans);
+       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) {
@@ -550,7 +550,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
                if (add_flags & WIMLIB_ADD_FLAG_VERBOSE) {
                        union wimlib_progress_info info;
 
-                       info.replace.path_in_wim = existing->_full_path;
+                       info.replace.path_in_wim = existing->d_full_path;
                        ret = call_progress(progfunc,
                                            WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,
                                            &info, progctx);
@@ -919,8 +919,8 @@ execute_delete_command(struct update_command_journal *j,
 static int
 free_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
 {
-       FREE(dentry->_full_path);
-       dentry->_full_path = NULL;
+       FREE(dentry->d_full_path);
+       dentry->d_full_path = NULL;
        return 0;
 }
 
@@ -1017,7 +1017,7 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to,
                unlink_dentry(src);
                dentry_add_child(parent_of_dst, src);
        }
-       if (src->_full_path)
+       if (src->d_full_path)
                for_dentry_in_tree(src, free_dentry_full_path, NULL);
        return 0;
 }