read_utf8_file_contents(): Move check for BOM here

[wimlib] / src / ntfs-3g_apply.c

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index bf122a81568710ad4f61f81ac951422e16791c41..86a28c10e2aa31e2be7182e5ff0a521901cfe6cc 100644 (file)
--- 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);
@@ -419,7 +419,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.  */