X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=014d16b999388267ff5eec1e17025d0b43b1c15e;hb=f50557a7095444c554a066b3837c2999ecd1be31;hp=c187d6987dfc84d7f6da17a4259f6a6425144252;hpb=3de1ec66f778edda19865482d685bc6f4e17faf7;p=wimlib

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index c187d698..014d16b9 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -81,7 +81,7 @@ read_metadata_resource(struct wim_image_metadata *imd)
 	DEBUG("Reading metadata resource (size=%"PRIu64").", metadata_blob->size);
 
 	/* Read the metadata resource into memory.  (It may be compressed.)  */
-	ret = read_full_blob_into_alloc_buf(metadata_blob, &buf);
+	ret = read_blob_into_alloc_buf(metadata_blob, &buf);
 	if (ret)
 		return ret;
 
@@ -150,7 +150,7 @@ recalculate_security_data_length(struct wim_security_data *sd)
 	u32 total_length = sizeof(u64) * sd->num_entries + 2 * sizeof(u32);
 	for (u32 i = 0; i < sd->num_entries; i++)
 		total_length += sd->sizes[i];
-	sd->total_length = (total_length + 7) & ~7;
+	sd->total_length = ALIGN(total_length, 8);
 }
 
 static int
@@ -185,16 +185,12 @@ prepare_metadata_resource(WIMStruct *wim, int image,
 		imd->root_dentry = root;
 	}
 
-	/* Offset of first child of the root dentry.  It's equal to:
-	 * - The total length of the security data, rounded to the next 8-byte
-	 *   boundary,
-	 * - plus the total length of the root dentry,
-	 * - plus 8 bytes for an end-of-directory entry following the root
-	 *   dentry (shouldn't really be needed, but just in case...)
-	 */
+	/* The offset of the first child of the root dentry is equal to the
+	 * total length of the security data, plus the total length of the root
+	 * dentry, plus 8 bytes for an end-of-directory entry following the root
+	 * dentry (shouldn't really be needed, but just in case...)  */
 	recalculate_security_data_length(sd);
-	subdir_offset = (((u64)sd->total_length + 7) & ~7) +
-			dentry_out_total_length(root) + 8;
+	subdir_offset = sd->total_length + dentry_out_total_length(root) + 8;
 
 	/* Calculate the subdirectory offsets for the entire dentry tree.  */
 	calculate_subdir_offsets(root, &subdir_offset);
@@ -244,7 +240,9 @@ write_metadata_resource(WIMStruct *wim, int image, int write_resource_flags)
 	/* Write the metadata resource to the output WIM using the proper
 	 * compression type, in the process updating the blob descriptor for the
 	 * metadata resource.  */
-	ret = write_wim_resource_from_buffer(buf, len, WIM_RESHDR_FLAG_METADATA,
+	ret = write_wim_resource_from_buffer(buf,
+					     len,
+					     true,
 					     &wim->out_fd,
 					     wim->out_compression_type,
 					     wim->out_chunk_size,