Split wim_resource_spec from wim_lookup_table_entry

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

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 8d5d4c63b31aa8a863924f23c7c0bf93e1a29be8..829c41c963a7d6b396fecebef6a81d24e59632d7 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -91,7 +91,6 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
        void *out_buf;
        bool out_buf_malloced;
        int ret;
-       size_t stack_max = 32768;
 
        ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
        if (!ni) {
@@ -108,7 +107,7 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
 
        out_buf_malloced = false;
        if (cb) {
-               if (in_chunk_size <= stack_max) {
+               if (in_chunk_size <= STACK_MAX) {
                        out_buf = alloca(in_chunk_size);
                } else {
                        out_buf = MALLOC(in_chunk_size);
@@ -259,14 +258,14 @@ capture_ntfs_streams(struct wim_inode *inode,
                                        goto out_free_lte;
                                }
                                lte->ntfs_loc->is_reparse_point = true;
-                               lte->resource_entry.original_size = data_size - 8;
+                               lte->size = data_size - 8;
                                ret = read_reparse_tag(ni, lte->ntfs_loc,
                                                       &inode->i_reparse_tag);
                                if (ret)
                                        goto out_free_lte;
                        } else {
                                lte->ntfs_loc->is_reparse_point = false;
-                               lte->resource_entry.original_size = data_size;
+                               lte->size = data_size;
                        }
                }
                if (name_length == 0) {
@@ -276,8 +275,8 @@ capture_ntfs_streams(struct wim_inode *inode,
                                if (lte) {
                                        ERROR("Found two un-named data streams for \"%s\" "
                                              "(sizes = %"PRIu64", %"PRIu64")",
-                                             path, wim_resource_size(inode->i_lte),
-                                             wim_resource_size(lte));
+                                             path, inode->i_lte->size,
+                                             lte->size);
                                        ret = WIMLIB_ERR_NTFS_3G;
                                        goto out_free_lte;
                                }