Rename tmp_list => d_tmp_list

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index e58b22dcf5ae57c49ef31e9b301bf4d4ab472ff5..82da53f4b3968fba37e2c252dbf41f7fe67f256d 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.  */
@@ -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;
 }