X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fapply.h;h=ad21418ef5f92f6516914dff6c2ebeef5271c894;hp=f9a4a2f1bec077b0f44616536fe0b2503071405c;hb=846d3ae386f6c12953816108c04de244533e3a4a;hpb=aac0f095b5ed1273f91d87009f3b551eedcee085

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index f9a4a2f1..ad21418e 100644
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -134,14 +134,13 @@ 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)			\
-	list_for_each_entry(dentry, &(inode)->i_extraction_aliases,	\
-			    d_extraction_alias_node)
+	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_callbacks *cbs);
@@ -203,10 +202,9 @@ struct apply_operations {
 	 * 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()