resource: pass blob and offset to consume_chunk

[wimlib] / include / wimlib / apply.h

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index 071f5ed40173813d540cf6d6a3d5613065e02332..da9087a7b5080883a8735d29af55061c6a5e21c2 100644 (file)
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -11,9 +11,10 @@
 /* These can be treated as counts (for required_features) or booleans (for
  * supported_features).  */
 struct wim_features {
-       unsigned long archive_files;
+       unsigned long readonly_files;
        unsigned long hidden_files;
        unsigned long system_files;
+       unsigned long archive_files;
        unsigned long compressed_files;
        unsigned long encrypted_files;
        unsigned long encrypted_directories;
@@ -27,6 +28,7 @@ struct wim_features {
        unsigned long security_descriptors;
        unsigned long short_names;
        unsigned long unix_data;
+       unsigned long object_ids;
        unsigned long timestamps;
        unsigned long case_sensitive_filenames;
 };
@@ -70,8 +72,6 @@ struct apply_ctx {
        unsigned long num_blobs_remaining;
        struct list_head blob_list;
        const struct read_blob_callbacks *saved_cbs;
-       struct blob_descriptor *cur_blob;
-       u64 cur_blob_offset;
        struct filedes tmpfile_fd;
        tchar *tmpfile_name;
        unsigned int count_until_file_progress;
@@ -220,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.
         *
@@ -231,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