X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fapply.h;h=f36f0b3f0e188c89d6934a07d35b60598f53fd38;hp=e4c741b88c39c9ebdc488083c19508276f7fbbdf;hb=8b709192cd2811b83c248fbe61ca4f11ee9de797;hpb=8eb500e74f1508c4722df217fb60bdf4710fbff6

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index e4c741b8..f36f0b3f 100644
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -32,7 +32,7 @@ struct wim_features {
 };
 
 struct blob_descriptor;
-struct read_blob_list_callbacks;
+struct read_blob_callbacks;
 struct apply_operations;
 struct wim_dentry;
 
@@ -69,7 +69,7 @@ struct apply_ctx {
 	unsigned long invalid_sequence;
 	unsigned long num_blobs_remaining;
 	struct list_head blob_list;
-	const struct read_blob_list_callbacks *saved_cbs;
+	const struct read_blob_callbacks *saved_cbs;
 	struct blob_descriptor *cur_blob;
 	u64 cur_blob_offset;
 	struct filedes tmpfile_fd;
@@ -134,14 +134,16 @@ report_apply_error(struct apply_ctx *ctx, int error_code, const tchar *path)
 	return report_error(ctx->progfunc, ctx->progctx, error_code, path);
 }
 
-/* Returns any of the aliases of an inode that are being extracted.  */
-#define inode_first_extraction_dentry(inode)		\
-	list_first_entry(&(inode)->i_extraction_aliases,	\
-			 struct wim_dentry, d_extraction_alias_node)
+#define inode_first_extraction_dentry(inode)				\
+	((inode)->i_first_extraction_alias)
+
+#define inode_for_each_extraction_alias(dentry, inode)			\
+	for (dentry = inode_first_extraction_dentry(inode);		\
+	     dentry != NULL;						\
+	     dentry = dentry->d_next_extraction_alias)
 
 extern int
-extract_blob_list(struct apply_ctx *ctx,
-		    const struct read_blob_list_callbacks *cbs);
+extract_blob_list(struct apply_ctx *ctx, const struct read_blob_callbacks *cbs);
 
 /*
  * Represents an extraction backend.
@@ -196,14 +198,13 @@ struct apply_operations {
 	 *
 	 * 'd_extraction_name' and 'd_extraction_name_nchars' of each dentry
 	 * will be set to indicate the actual name with which the dentry should
-	 * be extracted.  This may or may not be the same as 'file_name'.
-	 * TODO: really, the extraction backends should be responsible for
-	 * generating 'd_extraction_name'.
+	 * be extracted.  This may or may not be the same as 'd_name'.  TODO:
+	 * really, the extraction backends should be responsible for generating
+	 * 'd_extraction_name'.
 	 *
-	 * Each dentry will refer to a valid inode in 'd_inode'.
-	 * 'd_inode->i_extraction_aliases' will contain a list of just the
-	 * dentries of that inode being extracted.  This will be a (possibly
-	 * nonproper) subset of the 'd_inode->i_dentry' list.
+	 * Each dentry will refer to a valid inode in 'd_inode'.  Each inode
+	 * will contain a list of dentries of that inode being extracted; this
+	 * list may be shorter than the inode's full dentry list.
 	 *
 	 * The blobs required to be extracted will already be prepared in
 	 * 'apply_ctx'.  The extraction backend should call extract_blob_list()
@@ -219,9 +220,10 @@ struct apply_operations {
 
 	/*
 	 * Query whether the unnamed data stream of the specified file will be
-	 * extracted as "externally backed".  If so, the extraction backend is
-	 * assumed to handle this separately, and the common extraction code
-	 * will not register a usage of the unnamed data stream's blob.
+	 * extracted as "externally backed" from the WIM archive itself.  If so,
+	 * then the extraction backend is assumed to handle this separately, and
+	 * the common extraction code will not register a usage of the unnamed
+	 * data stream's blob.
 	 *
 	 * This routine is optional.
 	 *
@@ -230,7 +232,7 @@ struct apply_operations {
 	 *	= 0 if the file will be externally backed.
 	 *	> 0 (wimlib error code) if another error occurred.
 	 */
-	int (*will_externally_back)(struct wim_dentry *dentry, struct apply_ctx *ctx);
+	int (*will_back_from_wim)(struct wim_dentry *dentry, struct apply_ctx *ctx);
 
 	/*
 	 * Size of the backend-specific extraction context.  It must contain