X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fwim.h;h=587e2f694bf4b595594f27dcbc6c870a08eab62f;hp=3fdc7d2d28ab45cc6dd62f3269708f707aa1af4d;hb=471905f062792c0dfdd21aaae1172d94c2e0369c;hpb=1fc939b7bd0b37900d974b1cd5b11df128df71f5

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 3fdc7d2d..587e2f69 100644
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -66,9 +66,8 @@ struct WIMStruct {
 	 * generates WIMs with invalid reference counts.)  */
 	u8 refcnts_ok : 1;
 
-	u8 wim_locked : 1;
-
-	u8 guid_set_explicitly : 1;
+	/* Has the underlying WIM file been locked for appending?  */
+	u8 locked_for_append : 1;
 
 	/* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
 	u8 compression_type;
@@ -94,6 +93,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)
@@ -142,21 +146,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);
-
-extern int
-close_wim(WIMStruct *wim);
+		      wimlib_progress_func_t progfunc, void *progctx);
 
 extern int
 can_modify_wim(WIMStruct *wim);