X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=bb8f185623bf660e933689bc69c2bc64c05de855;hp=178a88acb89d0e7a08cde2a2b0c8c1c2372f7e12;hb=e405166879d12191a55cde5bcc278a79e1dd2fe7;hpb=c48e2f84645abe34faec4994605d7a7b3b451672

diff --git a/src/write.c b/src/write.c
index 178a88ac..bb8f1856 100644
--- a/src/write.c
+++ b/src/write.c
@@ -654,8 +654,8 @@ do_done_with_blob(struct blob_descriptor *blob,
 	inode = blob->file_inode;
 
 	wimlib_assert(inode != NULL);
-	wimlib_assert(inode->num_remaining_streams > 0);
-	if (--inode->num_remaining_streams > 0)
+	wimlib_assert(inode->i_num_remaining_streams > 0);
+	if (--inode->i_num_remaining_streams > 0)
 		return 0;
 
 #ifdef __WIN32__
@@ -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);
 	}
 }
 
@@ -1367,7 +1361,7 @@ init_done_with_file_info(struct list_head *blob_list)
 
 	list_for_each_entry(blob, blob_list, write_blobs_list) {
 		if (blob_is_in_file(blob)) {
-			blob->file_inode->num_remaining_streams = 0;
+			blob->file_inode->i_num_remaining_streams = 0;
 			blob->may_send_done_with_file = 1;
 		} else {
 			blob->may_send_done_with_file = 0;
@@ -1376,7 +1370,7 @@ init_done_with_file_info(struct list_head *blob_list)
 
 	list_for_each_entry(blob, blob_list, write_blobs_list)
 		if (blob->may_send_done_with_file)
-			blob->file_inode->num_remaining_streams++;
+			blob->file_inode->i_num_remaining_streams++;
 }
 
 /*
@@ -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;