wimlib_write(): Update flags debugging statements

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 620f8c455afe4b605cff8b7789a8d4e73f8a745f..e7888cd4011227850b159201f2e9da4687cd16fd 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -613,7 +613,7 @@ end_write_resource(struct write_streams_ctx *ctx, struct wim_reshdr *out_reshdr)
 /* Begin processing a stream for writing.  */
 static int
 write_stream_begin_read(struct wim_lookup_table_entry *lte,
-                       bool is_partial_res, void *_ctx)
+                       u32 flags, void *_ctx)
 {
        struct write_streams_ctx *ctx = _ctx;
        int ret;
@@ -637,7 +637,7 @@ write_stream_begin_read(struct wim_lookup_table_entry *lte,
        ctx->stream_was_duplicate = false;
        if (ctx->lookup_table != NULL && lte->unhashed && !lte->unique_size) {
 
-               wimlib_assert(!is_partial_res);
+               wimlib_assert(!(flags & BEGIN_STREAM_FLAG_PARTIAL_RESOURCE));
 
                struct wim_lookup_table_entry *lte_new;
 
@@ -896,8 +896,8 @@ submit_chunk_for_compression(struct write_streams_ctx *ctx,
         * compressed chunk.  */
        while (!ctx->compressor->submit_chunk(ctx->compressor, chunk, size)) {
                const void *cchunk;
-               unsigned csize;
-               unsigned usize;
+               u32 csize;
+               u32 usize;
                bool bret;
                int ret;
 
@@ -1180,8 +1180,8 @@ static int
 finish_remaining_chunks(struct write_streams_ctx *ctx)
 {
        const void *cdata;
-       unsigned csize;
-       unsigned usize;
+       u32 csize;
+       u32 usize;
        int ret;
 
        if (ctx->compressor == NULL)
@@ -2565,8 +2565,14 @@ write_wim_part(WIMStruct *wim,
        if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)
                DEBUG("\tCHECK_INTEGRITY");
 
-       if (write_flags & WIMLIB_WRITE_FLAG_REBUILD)
-               DEBUG("\tREBUILD");
+       if (write_flags & WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY)
+               DEBUG("\tNO_CHECK_INTEGRITY");
+
+       if (write_flags & WIMLIB_WRITE_FLAG_PIPABLE)
+               DEBUG("\tPIPABLE");
+
+       if (write_flags & WIMLIB_WRITE_FLAG_NOT_PIPABLE)
+               DEBUG("\tNOT_PIPABLE");
 
        if (write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS)
                DEBUG("\tRECOMPRESS");
@@ -2574,17 +2580,20 @@ write_wim_part(WIMStruct *wim,
        if (write_flags & WIMLIB_WRITE_FLAG_FSYNC)
                DEBUG("\tFSYNC");
 
+       if (write_flags & WIMLIB_WRITE_FLAG_REBUILD)
+               DEBUG("\tREBUILD");
+
        if (write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE)
-               DEBUG("\tFSYNC");
+               DEBUG("\tSOFT_DELETE");
 
        if (write_flags & WIMLIB_WRITE_FLAG_IGNORE_READONLY_FLAG)
                DEBUG("\tIGNORE_READONLY_FLAG");
 
-       if (write_flags & WIMLIB_WRITE_FLAG_PIPABLE)
-               DEBUG("\tPIPABLE");
+       if (write_flags & WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS)
+               DEBUG("\tSKIP_EXTERNAL_WIMS");
 
-       if (write_flags & WIMLIB_WRITE_FLAG_NOT_PIPABLE)
-               DEBUG("\tNOT_PIPABLE");
+       if (write_flags & WIMLIB_WRITE_FLAG_STREAMS_OK)
+               DEBUG("\tSTREAMS_OK");
 
        if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS)
                DEBUG("\tPACK_STREAMS");