Update progress functions

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 2e780343408277613f7badaaeacfff7289f06eae..86926d8983232817d3f663814790f9477dfbdbd4 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -1,6 +1,7 @@
 #ifndef _WIMLIB_WIM_H
 #define _WIMLIB_WIM_H
 
+#include "wimlib.h"
 #include "wimlib/header.h"
 #include "wimlib/types.h"
 #include "wimlib/file_io.h"
@@ -43,7 +44,7 @@ struct WIMStruct {
        void *private;
 
        struct wimlib_decompressor *decompressor;
-       enum wimlib_compression_type decompressor_ctype;
+       u8 decompressor_ctype;
        u32 decompressor_max_block_size;
 
        struct list_head subwims;
@@ -67,8 +68,6 @@ struct WIMStruct {
 
        u8 wim_locked : 1;
 
-       u8 guid_set_explicitly : 1;
-
        /* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
        u8 compression_type;
 
@@ -93,6 +92,11 @@ struct WIMStruct {
        /* Chunk size for writing packed streams; can be set with
         * wimlib_set_output_pack_chunk_size().  */
        u32 out_pack_chunk_size;
+
+       /* Currently registered progress function for this WIMStruct, or NULL if
+        * no progress function is currently registered for this WIMStruct.  */
+       wimlib_progress_func_t progfunc;
+       void *progctx;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -132,9 +136,6 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 extern int
 write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd);
 
-extern int
-rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to);
-
 extern int
 select_wim_image(WIMStruct *wim, int image);
 
@@ -144,18 +145,14 @@ for_image(WIMStruct *wim, int image, int (*visitor)(WIMStruct *));
 extern int
 wim_checksum_unhashed_streams(WIMStruct *wim);
 
-extern int
-reopen_wim(WIMStruct *wim);
-
 /* Internal open flags (pass to open_wim_as_WIMStruct(), not wimlib_open_wim())
  */
 #define WIMLIB_OPEN_FLAG_FROM_PIPE     0x80000000
-#define WIMLIB_OPEN_MASK_PUBLIC                0x7fffffff
 
 extern int
 open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
                      WIMStruct **wim_ret,
-                     wimlib_progress_func_t progress_func);
+                     wimlib_progress_func_t progfunc, void *progctx);
 
 extern int
 close_wim(WIMStruct *wim);