Use list_replace() instead of list_transfer()

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 51c4a91066b905ca722faacc95bcbbed27b76dea..6124a67da81c09317ca5c2ba993c05cb4f6e3067 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -27,9 +27,9 @@
 
 #include "wimlib.h"
 #include "wimlib/alloca.h"
+#include "wimlib/blob_table.h"
 #include "wimlib/error.h"
 #include "wimlib/list.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/progress.h"
 #include "wimlib/resource.h"
@@ -37,14 +37,14 @@
 #include "wimlib/write.h"
 
 struct swm_part_info {
-       struct list_head stream_list;
+       struct list_head blob_list;
        u64 size;
 };
 
 static void
 copy_part_info(struct swm_part_info *dst, struct swm_part_info *src)
 {
-       list_transfer(&src->stream_list, &dst->stream_list);
+       list_replace(&src->blob_list, &dst->blob_list);
        dst->size = src->size;
 }
 
@@ -69,7 +69,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
        union wimlib_progress_info progress;
        unsigned part_number;
        int ret;
-       u8 guid[WIMLIB_GUID_LEN];
+       u8 guid[GUID_SIZE];
 
        swm_name_len = tstrlen(swm_name);
        swm_name_buf = alloca((swm_name_len + 20) * sizeof(tchar));
@@ -91,7 +91,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                progress.split.total_bytes += swm_info->parts[part_number - 1].size;
        progress.split.total_parts = swm_info->num_parts;
 
-       randomize_byte_array(guid, WIMLIB_GUID_LEN);
+       generate_guid(guid);
 
        for (part_number = 1; part_number <= swm_info->num_parts; part_number++) {
                int part_write_flags;
@@ -126,7 +126,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                                     1,
                                     part_number,
                                     swm_info->num_parts,
-                                    &swm_info->parts[part_number - 1].stream_list,
+                                    &swm_info->parts[part_number - 1].blob_list,
                                     guid);
                orig_wim->progfunc = progfunc;
                if (ret)
@@ -145,31 +145,26 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 }
 
 static int
-add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
+add_blob_to_swm(struct blob_descriptor *blob, void *_swm_info)
 {
        struct swm_info *swm_info = _swm_info;
-       u64 stream_size;
+       u64 blob_stored_size;
 
-       if (lte_is_partial(lte)) {
-               ERROR("Splitting of WIM containing solid resources is not supported.\n"
-                     "        Export it in non-solid format first.");
-               return WIMLIB_ERR_UNSUPPORTED;
-       }
-       if (lte->resource_location == RESOURCE_IN_WIM)
-               stream_size = lte->rspec->size_in_wim;
+       if (blob->blob_location == BLOB_IN_WIM)
+               blob_stored_size = blob->rdesc->size_in_wim;
        else
-               stream_size = lte->size;
+               blob_stored_size = blob->size;
 
        /* - Start first part if no parts have been started so far;
-        * - Start next part if adding this stream exceeds maximum part size,
-        *   UNLESS the stream is metadata or if no streams at all have been
-        *   added to the current part.
+        * - Start next part if adding this blob exceeds maximum part size,
+        *   UNLESS the blob is metadata or if no blobs at all have been added
+        *   to the current part.
         */
        if (swm_info->num_parts == 0 ||
            ((swm_info->parts[swm_info->num_parts - 1].size +
-                       stream_size >= swm_info->max_part_size)
-            && !((lte->flags & WIM_RESHDR_FLAG_METADATA) ||
-                  swm_info->parts[swm_info->num_parts - 1].size == 0)))
+                       blob_stored_size >= swm_info->max_part_size)
+            && !(blob->is_metadata ||
+                 swm_info->parts[swm_info->num_parts - 1].size == 0)))
        {
                if (swm_info->num_parts == swm_info->num_alloc_parts) {
                        struct swm_part_info *parts;
@@ -188,15 +183,15 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
                        swm_info->num_alloc_parts = num_alloc_parts;
                }
                swm_info->num_parts++;
-               INIT_LIST_HEAD(&swm_info->parts[swm_info->num_parts - 1].stream_list);
+               INIT_LIST_HEAD(&swm_info->parts[swm_info->num_parts - 1].blob_list);
                swm_info->parts[swm_info->num_parts - 1].size = 0;
        }
-       swm_info->parts[swm_info->num_parts - 1].size += stream_size;
-       if (!(lte->flags & WIM_RESHDR_FLAG_METADATA)) {
-               list_add_tail(&lte->write_streams_list,
-                             &swm_info->parts[swm_info->num_parts - 1].stream_list);
+       swm_info->parts[swm_info->num_parts - 1].size += blob_stored_size;
+       if (!blob->is_metadata) {
+               list_add_tail(&blob->write_blobs_list,
+                             &swm_info->parts[swm_info->num_parts - 1].blob_list);
        }
-       swm_info->total_bytes += stream_size;
+       swm_info->total_bytes += blob_stored_size;
        return 0;
 }
 
@@ -218,19 +213,25 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
        if (!wim_has_metadata(wim))
                return WIMLIB_ERR_METADATA_NOT_FOUND;
 
+       if (wim_has_solid_resources(wim)) {
+               ERROR("Splitting of WIM containing solid resources is not supported.\n"
+                     "        Export it in non-solid format first.");
+               return WIMLIB_ERR_UNSUPPORTED;
+       }
+
        memset(&swm_info, 0, sizeof(swm_info));
        swm_info.max_part_size = part_size;
 
        for (i = 0; i < wim->hdr.image_count; i++) {
-               ret = add_stream_to_swm(wim->image_metadata[i]->metadata_lte,
-                                       &swm_info);
+               ret = add_blob_to_swm(wim->image_metadata[i]->metadata_blob,
+                                     &swm_info);
                if (ret)
                        goto out_free_swm_info;
        }
 
-       ret = for_lookup_table_entry_pos_sorted(wim->lookup_table,
-                                               add_stream_to_swm,
-                                               &swm_info);
+       ret = for_blob_in_table_sorted_by_sequential_order(wim->blob_table,
+                                                          add_blob_to_swm,
+                                                          &swm_info);
        if (ret)
                goto out_free_swm_info;