Improve helper functions for setting blob locations

[wimlib] / src / resource.c

diff --git a/src/resource.c b/src/resource.c
index 11e09d67b0df0b91a3bacfc4a59620da63d874b9..a49507f3778df55b652b54df4c0e00b5e480cf3a 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -912,10 +912,7 @@ wim_reshdr_to_data(const struct wim_reshdr *reshdr, WIMStruct *wim, void **buf_r
        struct blob_descriptor blob;
 
        wim_res_hdr_to_desc(reshdr, wim, &rdesc);
-       blob_set_is_located_in_wim_resource(&blob, &rdesc);
-
-       blob.size = rdesc.uncompressed_size;
-       blob.offset_in_res = 0;
+       blob_set_is_located_in_nonsolid_wim_resource(&blob, &rdesc);
 
        return read_full_blob_into_alloc_buf(&blob, buf_ret);
 }
@@ -929,10 +926,7 @@ wim_reshdr_to_hash(const struct wim_reshdr *reshdr, WIMStruct *wim,
        int ret;
 
        wim_res_hdr_to_desc(reshdr, wim, &rdesc);
-       blob_set_is_located_in_wim_resource(&blob, &rdesc);
-
-       blob.size = rdesc.uncompressed_size;
-       blob.offset_in_res = 0;
+       blob_set_is_located_in_nonsolid_wim_resource(&blob, &rdesc);
        blob.unhashed = 1;
 
        ret = sha1_blob(&blob);