Clean up setting of compression type

[wimlib] / include / wimlib / write.h

diff --git a/include/wimlib/write.h b/include/wimlib/write.h
index 61f3bc670e88627f783a336006cdb29e3867b4ff..82e5576b17074fb98bb950a238cf17fd6b9c48f1 100644 (file)
--- a/include/wimlib/write.h
+++ b/include/wimlib/write.h
@@ -5,7 +5,7 @@
 #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_HEADER_AT_END                        0x20000000
 #define WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR              0x10000000
@@ -27,8 +27,9 @@
        WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS            | \
        WIMLIB_WRITE_FLAG_STREAMS_OK                    | \
        WIMLIB_WRITE_FLAG_RETAIN_GUID                   | \
-       WIMLIB_WRITE_FLAG_PACK_STREAMS                  | \
-       WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES)
+       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
@@ -47,7 +48,9 @@ unlock_wim_for_append(WIMStruct *wim)
 }
 #endif
 
+struct filedes;
 struct list_head;
+struct wim_reshdr;
 
 int
 write_wim_part(WIMStruct *wim,
@@ -57,16 +60,18 @@ write_wim_part(WIMStruct *wim,
               unsigned num_threads,
               unsigned part_number,
               unsigned total_parts,
-              struct list_head *stream_list_override,
+              struct list_head *blob_list_override,
               const u8 *guid);
 
 int
-write_wim_resource_from_buffer(const void *buf, size_t buf_size,
-                              int reshdr_flags, struct filedes *out_fd,
+write_wim_resource_from_buffer(const void *buf,
+                              size_t buf_size,
+                              bool is_metadata,
+                              struct filedes *out_fd,
                               int out_ctype,
                               u32 out_chunk_size,
                               struct wim_reshdr *out_reshdr,
-                              u8 *hash,
+                              u8 *hash_ret,
                               int write_resource_flags);
 
 #endif /* _WIMLIB_WRITE_H */