Use macros to iterate through extraction aliases

[wimlib] / include / wimlib / apply.h

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index 3d7873e7499fcc7c60e7b025159e56b8e2fa8972..f9a4a2f1bec077b0f44616536fe0b2503071405c 100644 (file)
--- 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;
@@ -103,10 +103,10 @@ maybe_do_file_progress(struct apply_ctx *ctx, enum wimlib_progress_msg msg)
 }
 
 extern int
-start_file_structure_phase(struct apply_ctx *ctx, uint64_t end_file_count);
+start_file_structure_phase(struct apply_ctx *ctx, u64 end_file_count);
 
 extern int
-start_file_metadata_phase(struct apply_ctx *ctx, uint64_t end_file_count);
+start_file_metadata_phase(struct apply_ctx *ctx, u64 end_file_count);
 
 /* Report that a file was created, prior to blob extraction.  */
 static inline int
@@ -139,9 +139,12 @@ report_apply_error(struct apply_ctx *ctx, int error_code, const tchar *path)
        list_first_entry(&(inode)->i_extraction_aliases,        \
                         struct wim_dentry, d_extraction_alias_node)
 
+#define inode_for_each_extraction_alias(dentry, inode)                 \
+       list_for_each_entry(dentry, &(inode)->i_extraction_aliases,     \
+                           d_extraction_alias_node)
+
 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.