}
/* Read the metadata resource into memory. (It may be compressed.) */
- ret = read_full_wim_resource(metadata_lte, buf, 0);
- if (ret != 0)
+ ret = read_full_resource_into_buf(metadata_lte, buf, false);
+ if (ret)
goto out_free_buf;
DEBUG("Finished reading metadata resource into memory.");
* write_wim_resource(). */
struct wim_lookup_table_entry lte;
int ret;
- lte.resource_entry.flags = 0;
lte.resource_entry.original_size = buf_size;
- lte.resource_entry.size = buf_size;
- lte.resource_entry.offset = 0;
lte.resource_location = RESOURCE_IN_ATTACHED_BUFFER;
lte.attached_buffer = (void*)buf;
-
zero_out_hash(lte.hash);
ret = write_wim_resource(<e, out_fp, out_ctype, out_res_entry, 0);
- if (ret != 0)
+ if (ret)
return ret;
copy_hash(hash, lte.hash);
return 0;
u64 metadata_original_size;
struct wim_security_data *sd;
+ wimlib_assert(w->out_fp != NULL);
+ wimlib_assert(w->current_image != WIMLIB_NO_IMAGE);
+
DEBUG("Writing metadata resource for image %d (offset = %"PRIu64")",
w->current_image, ftello(w->out_fp));
+
root = wim_root_dentry(w);
sd = wim_security_data(w);
wimlib_get_compression_type(w),
<e->output_resource_entry,
lte->hash);
- if (ret != 0)
- goto out;
+ if (ret)
+ goto out_free_buf;
- /* It's very likely the SHA1 message digest of the metadata resource
- * changed, so re-insert the lookup table entry into the lookup table.
- *
- * We do not check for other lookup table entries having the same SHA1
- * message digest. It's possible for 2 absolutely identical images to
- * be added, therefore causing 2 identical metadata resources to be in
- * the WIM. However, in this case, it's expected for 2 separate lookup
- * table entries to be created, even though this doesn't make a whole
- * lot of sense since they will share the same SHA1 message digest.
- * */
- lookup_table_unlink(w->lookup_table, lte);
- lookup_table_insert(w->lookup_table, lte);
+ /* Note that although the SHA1 message digest of the metadata resource
+ * is very likely to have changed, the corresponding lookup table entry
+ * is not actually located in the hash table, so it need not be
+ * re-inserted in the hash table. */
lte->out_refcnt = 1;
-
- /* Make sure that the lookup table entry for this metadata resource is
- * marked with the metadata flag. */
lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-out:
+out_free_buf:
/* All the data has been written to the new WIM; no need for the buffer
* anymore */
FREE(buf);