Merge branch 'wimboot_fast'

[wimlib] / include / wimlib / resource.h

diff --git a/include/wimlib/resource.h b/include/wimlib/resource.h
index 38ce568c6a210b6c1bd0866c14f90987ea5ddb63..dfb2d0f43a6ad851cad3915ffca070ab6b8a1ef2 100644 (file)
--- a/include/wimlib/resource.h
+++ b/include/wimlib/resource.h
@@ -166,8 +166,8 @@ struct alt_chunk_table_header_disk {
 
        /* Compression format used for compressed chunks:
         * 0 = None
-        * 1 = LZX
-        * 2 = XPRESS
+        * 1 = XPRESS
+        * 2 = LZX
         * 3 = LZMS
         *
         * This overrides the compression type specified by the WIM header.  */
@@ -203,6 +203,10 @@ extern int
 wim_reshdr_to_data(const struct wim_reshdr *reshdr,
                   WIMStruct *wim, void **buf_ret);
 
+extern int
+wim_reshdr_to_hash(const struct wim_reshdr *reshdr, WIMStruct *wim,
+                  u8 hash[SHA1_HASH_SIZE]);
+
 extern int
 skip_wim_stream(struct wim_lookup_table_entry *lte);
 
@@ -212,11 +216,6 @@ skip_wim_stream(struct wim_lookup_table_entry *lte);
  * @lte:
  *     Stream that is about to be read.
  *
- * @is_partial_res:
- *     Set to true if the stream is just one of several being read from a
- *     single pack and therefore would be extra expensive to read
- *     independently.
- *
  * @ctx:
  *     User-provided context.
  *
@@ -226,7 +225,6 @@ skip_wim_stream(struct wim_lookup_table_entry *lte);
  * (without calling @consume_chunk or @end_stream).
  */
 typedef int (*read_stream_list_begin_stream_t)(struct wim_lookup_table_entry *lte,
-                                              bool is_partial_res,
                                               void *ctx);
 
 #define BEGIN_STREAM_STATUS_SKIP_STREAM        -1
@@ -300,9 +298,6 @@ extern int
 extract_full_stream_to_fd(struct wim_lookup_table_entry *lte,
                          struct filedes *fd);
 
-extern int
-extract_chunk_to_fd(const void *chunk, size_t size, void *_fd_p);
-
 /* Miscellaneous stream functions.  */
 
 extern int