X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=c15a31b0fa3b40d810fc9f576db05c318c3111c7;hb=ee547cc83f231d727e4d9984c23e86d96d3da769;hp=359dffe304ed77cc448c6fbdb73d68f17fa9fde7;hpb=96038b4b60c2b97a83301357b35cc56950eb39b1;p=wimlib

diff --git a/src/update_image.c b/src/update_image.c
index 359dffe3..c15a31b0 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;
 }
@@ -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;
 }