X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fextract.c;h=5945a4d804cddde3aa90865ab3354d9e8cc32d56;hb=0199e8a882277f833ed5e88988224cb8a4778ead;hp=56ec644a0b2d31aad4fcb68fe32b442151daf557;hpb=d8af927e5d02cbcfc45cd1a3568b31c9814ec6f5;p=wimlib diff --git a/src/extract.c b/src/extract.c index 56ec644a..5945a4d8 100644 --- a/src/extract.c +++ b/src/extract.c @@ -181,9 +181,7 @@ read_pwm_blob_header(WIMStruct *pwm, struct blob_descriptor *blob, reshdr.offset_in_wim = pwm->in_fd.offset; reshdr.uncompressed_size = le64_to_cpu(buf.blob_hdr.uncompressed_size); wim_res_hdr_to_desc(&reshdr, pwm, 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->is_metadata = (rdesc->flags & WIM_RESHDR_FLAG_METADATA) != 0; return 0; @@ -234,11 +232,8 @@ read_blobs_from_pipe(struct apply_ctx *ctx, && (needed_blob = lookup_blob(blob_table, found_blob->hash)) && (needed_blob->out_refcnt)) { - needed_blob->offset_in_res = found_blob->offset_in_res; - needed_blob->size = found_blob->size; - blob_unset_is_located_in_wim_resource(found_blob); - blob_set_is_located_in_wim_resource(needed_blob, rdesc); + blob_set_is_located_in_nonsolid_wim_resource(needed_blob, rdesc); ret = (*cbs->begin_blob)(needed_blob, cbs->begin_blob_ctx);