X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=2d780e96d82f25f9fa59b885db7d308527f8fe51;hb=0f06c020c67371fe4dffaeb1622d81e60006e02c;hp=5ee296642fb70651b5a9c609d8571099bb968d40;hpb=49a63aa13cdeb4c1348697ccd92207a1a65ec7b0;p=wimlib

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index 5ee29664..2d780e96 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -31,6 +31,7 @@
 #include "wimlib/metadata.h"
 #include "wimlib/resource.h"
 #include "wimlib/security.h"
+#include "wimlib/write.h"
 
 /*
  * Reads a metadata resource for an image in the WIM file.  The metadata
@@ -71,13 +72,9 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	struct wim_inode *inode;
 
 	metadata_lte = imd->metadata_lte;
-	metadata_len = wim_resource_size(metadata_lte);
+	metadata_len = metadata_lte->size;
 
-	DEBUG("Reading metadata resource: original_size = %"PRIu64", "
-	      "size = %"PRIu64", offset = %"PRIu64"",
-	      metadata_lte->resource_entry.original_size,
-	      metadata_lte->resource_entry.size,
-	      metadata_lte->resource_entry.offset);
+	DEBUG("Reading metadata resource.");
 
 	/* There is no way the metadata resource could possibly be less than (8
 	 * + WIM_DENTRY_DISK_SIZE) bytes, where the 8 is for security data (with
@@ -90,7 +87,7 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	}
 
 	/* Read the metadata resource into memory.  (It may be compressed.) */
-	ret = read_full_resource_into_alloc_buf(metadata_lte, &buf);
+	ret = read_full_stream_into_alloc_buf(metadata_lte, &buf);
 	if (ret)
 		return ret;
 
@@ -298,10 +295,9 @@ write_metadata_resource(WIMStruct *wim, int image, int write_resource_flags)
 					     &wim->out_fd,
 					     wim->out_compression_type,
 					     wim->out_chunk_size,
-					     &imd->metadata_lte->output_resource_entry,
+					     &imd->metadata_lte->out_reshdr,
 					     imd->metadata_lte->hash,
-					     write_resource_flags,
-					     &wim->lzx_context);
+					     write_resource_flags);
 
 	/* Original checksum was overridden; set a flag so it isn't used.  */
 	imd->metadata_lte->dont_check_metadata_hash = 1;