From 4802321d3a42c3116fddc9ea41a878d031defd61 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 09:43:34 -0500 Subject: [PATCH] Rename i_dentry => i_alias_list and d_alias => d_alias_node --- include/wimlib/dentry.h | 2 +- include/wimlib/inode.h | 10 +++++----- src/inode.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index c6d1f12d..025a56cd 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -57,7 +57,7 @@ struct wim_dentry { /* Linked list node that places this dentry in the list of aliases for * its inode (d_inode) */ - struct hlist_node d_alias; + struct hlist_node d_alias_node; /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL * if this dentry has no short name. */ diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h index 86d3feb3..01254c82 100644 --- a/include/wimlib/inode.h +++ b/include/wimlib/inode.h @@ -119,7 +119,7 @@ struct wim_inode { /* List of dentries that are aliases for this inode. There will be * i_nlink dentries in this list. */ - struct hlist_head i_dentry; + struct hlist_head i_alias_list; /* Field to place this inode into a list. While reading a WIM image or * adding files to a WIM image this is owned by the inode table; @@ -180,13 +180,13 @@ struct wim_inode { /* Device number, used only during image capture, so we can * identify hard linked files by the combination of inode number * and device number (rather than just inode number, which could - * be ambigious if the captured tree spans a mountpoint). Set + * be ambiguous if the captured tree spans a mountpoint). Set * to 0 otherwise. */ u64 i_devno; /* Fields used only during extraction */ struct { - /* A singly linked list of aliases of this dentry that + /* A singly linked list of aliases of this inode that * are being extracted in the current extraction * operation. This list may be shorter than the inode's * full alias list. This list will be constructed @@ -268,11 +268,11 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps); /* Iterate through each alias of the specified inode. */ #define inode_for_each_dentry(dentry, inode) \ - hlist_for_each_entry((dentry), &(inode)->i_dentry, d_alias) + hlist_for_each_entry((dentry), &(inode)->i_alias_list, d_alias_node) /* Return an alias of the specified inode. */ #define inode_first_dentry(inode) \ - hlist_entry(inode->i_dentry.first, struct wim_dentry, d_alias) + hlist_entry(inode->i_alias_list.first, struct wim_dentry, d_alias_node) /* Return the full path of an alias of the specified inode, or NULL if a full * path could not be determined. */ diff --git a/src/inode.c b/src/inode.c index a181e885..217d9d04 100644 --- a/src/inode.c +++ b/src/inode.c @@ -57,7 +57,7 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps) inode->i_security_id = -1; /*inode->i_nlink = 0;*/ inode->i_rp_flags = WIM_RP_FLAG_NOT_FIXED; - INIT_HLIST_HEAD(&inode->i_dentry); + INIT_HLIST_HEAD(&inode->i_alias_list); inode->i_streams = inode->i_embedded_streams; if (set_timestamps) { u64 now = now_as_wim_timestamp(); @@ -108,7 +108,7 @@ d_associate(struct wim_dentry *dentry, struct wim_inode *inode) { wimlib_assert(!dentry->d_inode); - hlist_add_head(&dentry->d_alias, &inode->i_dentry); + hlist_add_head(&dentry->d_alias_node, &inode->i_alias_list); dentry->d_inode = inode; inode->i_nlink++; } @@ -125,7 +125,7 @@ d_disassociate(struct wim_dentry *dentry) wimlib_assert(inode->i_nlink > 0); - hlist_del(&dentry->d_alias); + hlist_del(&dentry->d_alias_node); dentry->d_inode = NULL; inode->i_nlink--; -- 2.43.0