From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 31 May 2015 16:00:01 +0000 (-0500)
Subject: Rename inode_first_dentry() => inode_any_dentry()
X-Git-Tag: v1.8.2~76
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=588b06dbb0267153119678118a9cd618bfa01c19

Rename inode_first_dentry() => inode_any_dentry()
---

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 2fd9f083..51462126 100644
--- 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 03db2fb1..034b9a11 100644
--- 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 03df7c79..51893fc1 100644
--- 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 7e0b92c0..1a9a2069 100644
--- 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 5dcb3864..122e1163 100644
--- 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;
 		}