X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsplit.c;h=6124a67da81c09317ca5c2ba993c05cb4f6e3067;hb=8b709192cd2811b83c248fbe61ca4f11ee9de797;hp=43d26db29d0d614cde517437878099159ac2e323;hpb=3de1ec66f778edda19865482d685bc6f4e17faf7;p=wimlib

diff --git a/src/split.c b/src/split.c
index 43d26db2..6124a67d 100644
--- a/src/split.c
+++ b/src/split.c
@@ -44,7 +44,7 @@ struct swm_part_info {
 static void
 copy_part_info(struct swm_part_info *dst, struct swm_part_info *src)
 {
-	list_transfer(&src->blob_list, &dst->blob_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;
@@ -150,11 +150,6 @@ add_blob_to_swm(struct blob_descriptor *blob, void *_swm_info)
 	struct swm_info *swm_info = _swm_info;
 	u64 blob_stored_size;
 
-	if (blob_is_in_solid_wim_resource(blob)) {
-		ERROR("Splitting of WIM containing solid resources is not supported.\n"
-		      "        Export it in non-solid format first.");
-		return WIMLIB_ERR_UNSUPPORTED;
-	}
 	if (blob->blob_location == BLOB_IN_WIM)
 		blob_stored_size = blob->rdesc->size_in_wim;
 	else
@@ -168,8 +163,8 @@ add_blob_to_swm(struct blob_descriptor *blob, void *_swm_info)
 	if (swm_info->num_parts == 0 ||
 	    ((swm_info->parts[swm_info->num_parts - 1].size +
 			blob_stored_size >= swm_info->max_part_size)
-	     && !((blob->flags & WIM_RESHDR_FLAG_METADATA) ||
-		   swm_info->parts[swm_info->num_parts - 1].size == 0)))
+	     && !(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;
@@ -192,7 +187,7 @@ add_blob_to_swm(struct blob_descriptor *blob, void *_swm_info)
 		swm_info->parts[swm_info->num_parts - 1].size = 0;
 	}
 	swm_info->parts[swm_info->num_parts - 1].size += blob_stored_size;
-	if (!(blob->flags & WIM_RESHDR_FLAG_METADATA)) {
+	if (!blob->is_metadata) {
 		list_add_tail(&blob->write_blobs_list,
 			      &swm_info->parts[swm_info->num_parts - 1].blob_list);
 	}
@@ -218,6 +213,12 @@ 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;