Rename is_orphan => d_is_orphan

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 9a2b1bd80c79920403e1fea81f3be50cd32380ab..ba61018acf6e7238075b2d831ff9c035da3d140a 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -83,7 +83,7 @@ struct wim_dentry {
        u8 d_tmp_flag : 1;
 
        /* Used by wimlib_update_image()  */
-       u8 is_orphan : 1;
+       u8 d_is_orphan : 1;
 
        union {
                /* 'subdir_offset' is only used while reading and writing this

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