X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;fp=src%2Fupdate_image.c;h=82da53f4b3968fba37e2c252dbf41f7fe67f256d;hb=c5fd49890aca1059262b986942a66542127c63af;hp=359dffe304ed77cc448c6fbdb73d68f17fa9fde7;hpb=96038b4b60c2b97a83301357b35cc56950eb39b1;p=wimlib diff --git a/src/update_image.c b/src/update_image.c index 359dffe3..82da53f4 100644 --- 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,7 +266,7 @@ 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); + list_add(&subject->d_tmp_list, orphans); subject->d_is_orphan = 1; } @@ -279,7 +279,7 @@ 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); + list_del(&subject->d_tmp_list); subject->d_is_orphan = 0; } @@ -363,7 +363,7 @@ journaled_link(struct update_command_journal *j, do_link(subject, parent, j->root_p); if (subject->d_is_orphan) { - list_del(&subject->tmp_list); + list_del(&subject->d_tmp_list); subject->d_is_orphan = 0; } return 0; @@ -394,7 +394,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); + list_add(&subject->d_tmp_list, &j->orphans); subject->d_is_orphan = 1; return 0; }