X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fblob_table.c;h=e9766b5f6419db7d1f35c4b79815a4169954a6ed;hb=0e650cac77ac5a9e418300e50d7ddd7696a18531;hp=aa73cc01d766135c47e7ecb50f1ebd194b19a096;hpb=c48e2f84645abe34faec4994605d7a7b3b451672;p=wimlib

diff --git a/src/blob_table.c b/src/blob_table.c
index aa73cc01..e9766b5f 100644
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -310,12 +310,9 @@ enlarge_blob_table(struct blob_table *table)
 	table->array = new_array;
 	table->capacity = new_capacity;
 
-	for (i = 0; i < old_capacity; i++) {
-		hlist_for_each_entry_safe(blob, tmp, &old_array[i], hash_list) {
-			hlist_del(&blob->hash_list);
+	for (i = 0; i < old_capacity; i++)
+		hlist_for_each_entry_safe(blob, tmp, &old_array[i], hash_list)
 			blob_table_insert_raw(table, blob);
-		}
-	}
 	FREE(old_array);
 }
 
@@ -635,17 +632,7 @@ do_load_solid_info(WIMStruct *wim, struct wim_resource_descriptor **rdescs,
 		BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_LZX != 2);
 		BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_LZMS != 3);
 		rdesc->compression_type = le32_to_cpu(hdr.compression_format);
-
 		rdesc->chunk_size = le32_to_cpu(hdr.chunk_size);
-
-		DEBUG("Solid resource %zu/%zu: %"PRIu64" => %"PRIu64" "
-		      "(%"TS"/%"PRIu32") @ +%"PRIu64"",
-		      i + 1, num_rdescs,
-		      rdesc->uncompressed_size,
-		      rdesc->size_in_wim,
-		      wimlib_get_compression_type_string(rdesc->compression_type),
-		      rdesc->chunk_size,
-		      rdesc->offset_in_wim);
 	}
 	return 0;
 }
@@ -862,8 +849,6 @@ read_blob_table(WIMStruct *wim)
 	struct wim_resource_descriptor **cur_solid_rdescs = NULL;
 	size_t cur_num_solid_rdescs = 0;
 
-	DEBUG("Reading blob table.");
-
 	/* Calculate the number of entries in the blob table.  */
 	num_entries = wim->hdr.blob_table_reshdr.uncompressed_size /
 		      sizeof(struct blob_descriptor_disk);
@@ -890,13 +875,6 @@ read_blob_table(WIMStruct *wim)
 		/* Get the resource header  */
 		get_wim_reshdr(&disk_entry->reshdr, &reshdr);
 
-		DEBUG("reshdr: size_in_wim=%"PRIu64", "
-		      "uncompressed_size=%"PRIu64", "
-		      "offset_in_wim=%"PRIu64", "
-		      "flags=0x%02x",
-		      reshdr.size_in_wim, reshdr.uncompressed_size,
-		      reshdr.offset_in_wim, reshdr.flags);
-
 		/* Ignore SOLID flag if it isn't supposed to be used in this WIM
 		 * version.  */
 		if (wim->hdr.wim_version == WIM_VERSION_DEFAULT)
@@ -969,9 +947,7 @@ read_blob_table(WIMStruct *wim)
 			if (!rdesc)
 				goto oom;
 
-			wim_reshdr_to_desc(&reshdr, wim, rdesc);
-
-			blob_set_is_located_in_nonsolid_wim_resource(cur_blob, rdesc);
+			wim_reshdr_to_desc_and_blob(&reshdr, wim, rdesc, cur_blob);
 		}
 
 		/* cur_blob is now a blob bound to a resource.  */
@@ -1043,11 +1019,6 @@ read_blob_table(WIMStruct *wim)
 			 * this overrides the actual locations of the metadata
 			 * resources themselves in the WIM file as well as any
 			 * information written in the XML data.  */
-			DEBUG("Found metadata resource for image %"PRIu32" at "
-			      "offset %"PRIu64".",
-			      image_index + 1,
-			      reshdr.offset_in_wim);
-
 			wim->image_metadata[image_index++]->metadata_blob = cur_blob;
 		} else {
 			/* Blob table entry for a non-metadata blob.  */
@@ -1099,7 +1070,6 @@ read_blob_table(WIMStruct *wim)
 			num_wrong_part_blobs);
 	}
 
-	DEBUG("Done reading blob table.");
 	wim->blob_table = table;
 	ret = 0;
 	goto out_free_buf;
@@ -1159,9 +1129,6 @@ write_blob_table_from_blob_list(struct list_head *blob_list,
 		}
 	}
 
-	DEBUG("Writing WIM blob table (size=%zu, offset=%"PRIu64")",
-	      table_size, out_fd->offset);
-
 	table_buf = MALLOC(table_size);
 	if (table_buf == NULL) {
 		ERROR("Failed to allocate %zu bytes for temporary blob table",
@@ -1220,7 +1187,6 @@ write_blob_table_from_blob_list(struct list_head *blob_list,
 					     NULL,
 					     write_resource_flags);
 	FREE(table_buf);
-	DEBUG("ret=%d", ret);
 	return ret;
 }