X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_apply.c;h=77dbb23bfd5da5dad379606a59daafe6644f20af;hb=036c7da59a54e9a24b1afb917b4f9f10eee176ee;hp=356f5fe7b61cbca6374a0365e681729fd8fb2c5a;hpb=65410297b5e1eace172efddaa5cfe5fe77fa251d;p=wimlib

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 356f5fe7..77dbb23b 100644
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -1,7 +1,7 @@
 /*
  * ntfs-3g_apply.c
  *
- * Apply a WIM image directly to a NTFS volume using libntfs-3g.  Restore as
+ * Apply a WIM image directly to an NTFS volume using libntfs-3g.  Restore as
  * much information as possible, including security data, file attributes, DOS
  * names, and alternate data streams.
  */
@@ -199,7 +199,7 @@ out:
 }
 
 /*
- * Extract a stream (default or alternate data) to an attribute of a NTFS file.
+ * Extract a stream (default or alternate data) to an attribute of an NTFS file.
  */
 static int
 ntfs_3g_extract_stream(file_spec_t file, const utf16lechar *raw_stream_name,
@@ -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);
 }