overwrite_wim_inplace(): cleanup

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 385dc2a604412e6fe663f03bf79f28a4ccdd2e42..eb8f3484936364edfc9b68b9b33f2793c953239b 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -28,10 +28,6 @@
 #include "xml.h"
 #include "buffer_io.h"
 
-#if TCHAR_IS_UTF16LE
-#  include <wchar.h>
-#endif
-
 struct split_args {
        WIMStruct *w;
        tchar *swm_base_name;
@@ -54,9 +50,9 @@ finish_swm(WIMStruct *w, struct list_head *lte_list,
        int ret;
        struct wim_lookup_table_entry *lte;
 
-       list_for_each_entry(lte, lte_list, staging_list) {
+       list_for_each_entry(lte, lte_list, swm_stream_list) {
                ret = write_lookup_table_entry(lte, w->out_fp);
-               if (ret != 0)
+               if (ret)
                        return ret;
        }
 
@@ -94,7 +90,7 @@ copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args)
 
                ret = finish_swm(w, &args->lte_list, args->write_flags,
                                 args->progress_func);
-               if (ret != 0)
+               if (ret)
                        return ret;
 
                if (args->progress_func) {
@@ -117,13 +113,13 @@ copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args)
                }
 
                ret = begin_write(w, args->swm_base_name, args->write_flags);
-               if (ret != 0)
+               if (ret)
                        return ret;
                args->size_remaining = args->part_size;
        }
        args->size_remaining -= lte->resource_entry.size;
        args->progress.split.completed_bytes += lte->resource_entry.size;
-       list_add(&lte->staging_list, &args->lte_list);
+       list_add_tail(&lte->swm_stream_list, &args->lte_list);
        return copy_resource(lte, w);
 }
 
@@ -149,6 +145,10 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
 
        write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
 
+       ret = wim_checksum_unhashed_streams(w);
+       if (ret)
+               return ret;
+
        swm_name_len = tstrlen(swm_name);
        tchar swm_base_name[swm_name_len + 20];
 
@@ -157,7 +157,7 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
        w->hdr.boot_idx = 0;
        randomize_byte_array(w->hdr.guid, WIM_GID_LEN);
        ret = begin_write(w, swm_name, write_flags);
-       if (ret != 0)
+       if (ret)
                goto out;
 
        tmemcpy(swm_base_name, swm_name, swm_name_len + 1);
@@ -191,26 +191,27 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
                              &args.progress);
        }
 
-       w->write_metadata = true;
        for (int i = 0; i < w->hdr.image_count; i++) {
                struct wim_lookup_table_entry *metadata_lte;
-               metadata_lte = w->image_metadata[i].metadata_lte;
+               metadata_lte = w->image_metadata[i]->metadata_lte;
                ret = copy_resource(metadata_lte, w);
-               if (ret != 0)
+               if (ret)
                        goto out;
                args.size_remaining -= metadata_lte->resource_entry.size;
                args.progress.split.completed_bytes += metadata_lte->resource_entry.size;
-               list_add(&metadata_lte->staging_list, &args.lte_list);
+               /* Careful: The metadata lookup table entries must be added in
+                * order of the images. */
+               list_add_tail(&metadata_lte->swm_stream_list, &args.lte_list);
        }
-       w->write_metadata = false;
 
-       ret = for_lookup_table_entry(w->lookup_table,
-                                    copy_resource_to_swm, &args);
-       if (ret != 0)
+       ret = for_lookup_table_entry_pos_sorted(w->lookup_table,
+                                               copy_resource_to_swm,
+                                               &args);
+       if (ret)
                goto out;
 
        ret = finish_swm(w, &args.lte_list, write_flags, progress_func);
-       if (ret != 0)
+       if (ret)
                goto out;
 
        if (progress_func) {