X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_apply.c;h=0d054edb922737d46247908ea33c16e237b94219;hb=b838675b420f13b3771b91b4ab2d5eddc3e6492f;hp=bf122a81568710ad4f61f81ac951422e16791c41;hpb=01be73ad93236a0f6cf7e000b4f8ac91fea6dff3;p=wimlib

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index bf122a81..0d054edb 100644
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -261,14 +261,14 @@ ntfs_3g_extract_stream(file_spec_t file, const utf16lechar *raw_stream_name,
 	 * to skip even more useless work (for example it fills resized
 	 * attributes with 0's, then we just override it.)  */
 	ret = WIMLIB_ERR_WRITE;
-	if (ntfs_attr_truncate_solid(na, wim_resource_size(lte)))
+	if (ntfs_attr_truncate_solid(na, lte->size))
 		goto out_attr_close;
 
 	/* Extract stream data to the NTFS attribute.  */
 	extract_ctx.na = na;
 	extract_ctx.offset = 0;
-	ret = extract_wim_resource(lte, wim_resource_size(lte),
-				   ntfs_3g_extract_wim_chunk, &extract_ctx);
+	ret = extract_stream(lte, lte->size,
+			     ntfs_3g_extract_wim_chunk, &extract_ctx);
 	/* Clean up and return.  */
 out_attr_close:
 	ntfs_attr_close(na);
@@ -284,7 +284,8 @@ out:
 static int
 ntfs_3g_extract_unnamed_stream(file_spec_t file,
 			       struct wim_lookup_table_entry *lte,
-			       struct apply_ctx *ctx)
+			       struct apply_ctx *ctx,
+			       struct wim_dentry *_ignore)
 {
 	return ntfs_3g_extract_stream(file, NULL, 0, lte, ctx);
 }
@@ -419,7 +420,6 @@ sd_fixup(const u8 *_desc, size_t *size_p)
 	const wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc =
 			(const wimlib_SECURITY_DESCRIPTOR_RELATIVE*)_desc;
 	wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc_new;
-	u32 sid_offset;
 	const wimlib_SID *owner, *group, *sid;
 
 	/* Don't attempt to fix clearly invalid security descriptors.  */