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

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index a3faa9c9..014d16b9 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -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);