X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwimlib%2Fwrite.h;h=af1a6353bc244dc859f730a112f92563dd909eda;hb=3de1ec66f778edda19865482d685bc6f4e17faf7;hp=190bf941cf30cd654ca2cbd66a9659c77d389296;hpb=668c363a59c521f48eecbc4dd549c07a3e36179e;p=wimlib

diff --git a/include/wimlib/write.h b/include/wimlib/write.h
index 190bf941..af1a6353 100644
--- a/include/wimlib/write.h
+++ b/include/wimlib/write.h
@@ -5,14 +5,13 @@
 #include "wimlib/types.h"
 
 /* Internal use only */
-#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE		0x80000000
+#define WIMLIB_WRITE_FLAG_NO_BLOB_TABLE			0x80000000
 #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML		0x40000000
-#define WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE		0x20000000
-#define WIMLIB_WRITE_FLAG_HEADER_AT_END			0x10000000
-#define WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR		0x08000000
-#define WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES	0x04000000
-#define WIMLIB_WRITE_FLAG_NO_METADATA			0x02000000
-#define WIMLIB_WRITE_FLAG_OVERWRITE			0x01000000
+#define WIMLIB_WRITE_FLAG_HEADER_AT_END			0x20000000
+#define WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR		0x10000000
+#define WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES	0x08000000
+#define WIMLIB_WRITE_FLAG_NO_METADATA			0x04000000
+#define WIMLIB_WRITE_FLAG_OVERWRITE			0x02000000
 
 /* Keep in sync with wimlib.h  */
 #define WIMLIB_WRITE_MASK_PUBLIC (			  \
@@ -27,21 +26,31 @@
 	WIMLIB_WRITE_FLAG_IGNORE_READONLY_FLAG		| \
 	WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS		| \
 	WIMLIB_WRITE_FLAG_STREAMS_OK			| \
-	WIMLIB_WRITE_FLAG_RESERVED			| \
-	WIMLIB_WRITE_FLAG_PACK_STREAMS)
+	WIMLIB_WRITE_FLAG_RETAIN_GUID			| \
+	WIMLIB_WRITE_FLAG_SOLID				| \
+	WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES	| \
+	WIMLIB_WRITE_FLAG_NO_SOLID_SORT)
 
 #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
 extern int
-lock_wim(WIMStruct *wim, int fd);
+lock_wim_for_append(WIMStruct *wim);
+extern void
+unlock_wim_for_append(WIMStruct *wim);
 #else
 static inline int
-lock_wim(WIMStruct *wim, int fd)
+lock_wim_for_append(WIMStruct *wim)
 {
 	return 0;
 }
+static inline void
+unlock_wim_for_append(WIMStruct *wim)
+{
+}
 #endif
 
+struct filedes;
 struct list_head;
+struct wim_reshdr;
 
 int
 write_wim_part(WIMStruct *wim,
@@ -49,10 +58,9 @@ write_wim_part(WIMStruct *wim,
 	       int image,
 	       int write_flags,
 	       unsigned num_threads,
-	       wimlib_progress_func_t progress_func,
 	       unsigned part_number,
 	       unsigned total_parts,
-	       struct list_head *stream_list_override,
+	       struct list_head *blob_list_override,
 	       const u8 *guid);
 
 int