Rename inode_first_dentry() => inode_any_dentry()

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 2fd9f08357855c8e7a7ec3163a8779cbb43f609e..514621264f17cb58e5a349bfa6b0cdc072585075 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -269,13 +269,13 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps);
        hlist_for_each_entry((dentry), &(inode)->i_alias_list, d_alias_node)
 
 /* Return an alias of the specified inode.  */
-#define inode_first_dentry(inode) \
+#define inode_any_dentry(inode) \
        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.  */
-#define inode_first_full_path(inode) \
-       dentry_full_path(inode_first_dentry(inode))
+#define inode_any_full_path(inode) \
+       dentry_full_path(inode_any_dentry(inode))
 
 extern void
 d_associate(struct wim_dentry *dentry, struct wim_inode *inode);

diff --git a/src/inode.c b/src/inode.c
index 03db2fb1d9fba62e907c600e3ac5fd081189ec28..034b9a11f3ec1d70b58df2f3a4eef1af147b2355 100644 (file)
--- a/src/inode.c
+++ b/src/inode.c
@@ -267,7 +267,7 @@ inode_add_stream(struct wim_inode *inode, int stream_type,
 {
        if (inode->i_num_streams >= 0xFFFF) {
                ERROR("Inode has too many streams! Path=\"%"TS"\"",
-                     inode_first_full_path(inode));
+                     inode_any_full_path(inode));
                errno = EFBIG;
                return NULL;
        }
@@ -492,7 +492,7 @@ blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
                ERROR("\"%"TS"\": blob not found\n"
                      "        SHA-1 message digest of missing blob:\n"
                      "        %"TS"",
-                     inode_first_full_path(inode), hashstr);
+                     inode_any_full_path(inode), hashstr);
        }
        return WIMLIB_ERR_RESOURCE_NOT_FOUND;
 }

diff --git a/src/inode_fixup.c b/src/inode_fixup.c
index 03df7c796cc589d200cbbba8f6463cd17a134c89..51893fc19096463098f32151bef7304839abdf7a 100644 (file)
--- a/src/inode_fixup.c
+++ b/src/inode_fixup.c
@@ -91,7 +91,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params)
                                WARNING("Unsupported directory hard link "
                                        "\"%"TS"\" <=> \"%"TS"\"",
                                        dentry_full_path(dentry),
-                                       inode_first_full_path(inode));
+                                       inode_any_full_path(inode));
                        } else if (params->num_dir_hard_links ==
                                   MAX_DIR_HARD_LINK_WARNINGS + 1)
                        {

diff --git a/src/template.c b/src/template.c
index 7e0b92c04177e22054a8a4ee0e1b433c24704e26..1a9a20690b6da7ebc7f1e120325e8b8a9a4c3140 100644 (file)
--- a/src/template.c
+++ b/src/template.c
@@ -123,7 +123,7 @@ static int
 reference_template_file(struct wim_inode *inode, WIMStruct *wim,
                        WIMStruct *template_wim)
 {
-       struct wim_dentry *dentry = inode_first_dentry(inode);
+       struct wim_dentry *dentry = inode_any_dentry(inode);
        struct wim_dentry *template_dentry;
        int ret;
 

diff --git a/src/unix_apply.c b/src/unix_apply.c
index 5dcb38641c2ea03d61057bf99b5d430327ad38d4..122e1163580b3397ab1d733de984c877844a83ff 100644 (file)
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -546,7 +546,7 @@ unix_begin_extract_blob_instance(const struct blob_descriptor *blob,
                if (blob->size > REPARSE_DATA_MAX_SIZE) {
                        ERROR_WITH_ERRNO("Reparse data of \"%s\" has size "
                                         "%"PRIu64" bytes (exceeds %u bytes)",
-                                        inode_first_full_path(inode),
+                                        inode_any_full_path(inode),
                                         blob->size, REPARSE_DATA_MAX_SIZE);
                        return WIMLIB_ERR_INVALID_REPARSE_DATA;
                }