Header fixes

[wimlib] / include / wimlib / resource.h

diff --git a/include/wimlib/resource.h b/include/wimlib/resource.h
index ae0775536b726e138000cfc4fd77dcbbd8feba48..61ce69b5e22f337affc15bea35288162923089e3 100644 (file)
--- a/include/wimlib/resource.h
+++ b/include/wimlib/resource.h
@@ -2,11 +2,11 @@
 #define _WIMLIB_RESOURCE_H
 
 #include "wimlib/callback.h"
-#include "wimlib/file_io.h"
 #include "wimlib/list.h"
 #include "wimlib/sha1.h"
 #include "wimlib/types.h"
 
+struct filedes;
 struct wim_lookup_table_entry;
 struct wim_image_metadata;
 
@@ -216,10 +216,6 @@ skip_wim_stream(struct wim_lookup_table_entry *lte);
  * @lte:
  *     Stream that is about to be read.
  *
- * @flags:
- *     Bitwise OR of BEGIN_STREAM_FLAG_PARTIAL_RESOURCE and/or
- *     BEGIN_STREAM_FLAG_WHOLE_STREAM.
- *
  * @ctx:
  *     User-provided context.
  *
@@ -229,17 +225,8 @@ 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,
-                                              u32 flags,
                                               void *ctx);
 
-/* 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.  */
-#define BEGIN_STREAM_FLAG_PARTIAL_RESOURCE     0x00000001
-
-/* This is purely advisory and indicates that the entire stream data will be
- * provided in one call to consume_chunk().  */
-#define BEGIN_STREAM_FLAG_WHOLE_STREAM         0x00000002
-
 #define BEGIN_STREAM_STATUS_SKIP_STREAM        -1
 
 /*
@@ -311,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
@@ -322,8 +306,7 @@ sha1_stream(struct wim_lookup_table_entry *lte);
 /* Functions to read/write metadata resources.  */
 
 extern int
-read_metadata_resource(WIMStruct *wim,
-                      struct wim_image_metadata *image_metadata);
+read_metadata_resource(struct wim_image_metadata *imd);
 
 extern int
 write_metadata_resource(WIMStruct *wim, int image, int write_resource_flags);