X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwrite.c;h=4ee29defa4f5ca4e10b33f79326740bec3091473;hb=a06ae552a9774672ceca5850cd861a67223137a0;hp=4d5e71651abceb3d411b3549d094705f28693827;hpb=3df2989aaef4c627f4fea630859ae9f72e9c307e;p=wimlib

diff --git a/src/write.c b/src/write.c
index 4d5e7165..4ee29def 100644
--- a/src/write.c
+++ b/src/write.c
@@ -795,7 +795,7 @@ write_blob_uncompressed(struct blob_descriptor *blob, struct filedes *out_fd)
 	if (filedes_seek(out_fd, begin_offset) == -1)
 		return 0;
 
-	ret = extract_full_blob_to_fd(blob, out_fd);
+	ret = extract_blob_to_fd(blob, out_fd);
 	if (ret) {
 		/* Error reading the uncompressed data.  */
 		if (out_fd->offset == begin_offset &&
@@ -1333,19 +1333,13 @@ finish_remaining_chunks(struct write_blobs_ctx *ctx)
 }
 
 static void
-remove_empty_blobs(struct list_head *blob_list)
+validate_blob_list(struct list_head *blob_list)
 {
-	struct blob_descriptor *blob, *tmp;
+	struct blob_descriptor *blob;
 
-	list_for_each_entry_safe(blob, tmp, blob_list, write_blobs_list) {
+	list_for_each_entry(blob, blob_list, write_blobs_list) {
 		wimlib_assert(blob->will_be_in_output_wim);
-		if (blob->size == 0) {
-			list_del(&blob->write_blobs_list);
-			blob->out_reshdr.offset_in_wim = 0;
-			blob->out_reshdr.size_in_wim = 0;
-			blob->out_reshdr.uncompressed_size = 0;
-			blob->out_reshdr.flags = reshdr_flags_for_blob(blob);
-		}
+		wimlib_assert(blob->size != 0);
 	}
 }
 
@@ -1504,7 +1498,7 @@ write_blob_list(struct list_head *blob_list,
 				(WRITE_RESOURCE_FLAG_SOLID |
 				 WRITE_RESOURCE_FLAG_PIPABLE));
 
-	remove_empty_blobs(blob_list);
+	validate_blob_list(blob_list);
 
 	if (list_empty(blob_list))
 		return 0;
@@ -1615,13 +1609,11 @@ write_blob_list(struct list_head *blob_list,
 	/* Read the list of blobs needing to be compressed, using the specified
 	 * callbacks to execute processing of the data.  */
 
-	struct read_blob_list_callbacks cbs = {
-		.begin_blob		= write_blob_begin_read,
-		.begin_blob_ctx		= &ctx,
-		.consume_chunk		= write_blob_process_chunk,
-		.consume_chunk_ctx	= &ctx,
-		.end_blob		= write_blob_end_read,
-		.end_blob_ctx		= &ctx,
+	struct read_blob_callbacks cbs = {
+		.begin_blob	= write_blob_begin_read,
+		.consume_chunk	= write_blob_process_chunk,
+		.end_blob	= write_blob_end_read,
+		.ctx		= &ctx,
 	};
 
 	ret = read_blob_list(blob_list,