New helper: wim_reshdr_to_desc_and_blob()

[wimlib] / src / blob_table.c

diff --git a/src/blob_table.c b/src/blob_table.c
index 3e9f9b4210fd9026ea6a57be840da727a06ee772..b3eb63fcad750d17ea7dbe471a543748738a1043 100644 (file)
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -611,7 +611,7 @@ do_load_solid_info(WIMStruct *wim, struct wim_resource_descriptor **rdescs,
 
                rdesc = rdescs[i];
 
-               wim_res_hdr_to_desc(&reshdr, wim, rdesc);
+               wim_reshdr_to_desc(&reshdr, wim, rdesc);
 
                /* For solid resources, the uncompressed size, compression type,
                 * and chunk size are stored in the resource itself, not in the
@@ -969,9 +969,7 @@ read_blob_table(WIMStruct *wim)
                        if (!rdesc)
                                goto oom;
 
-                       wim_res_hdr_to_desc(&reshdr, wim, rdesc);
-
-                       blob_set_is_located_in_nonsolid_wim_resource(cur_blob, rdesc);
+                       wim_reshdr_to_desc_and_blob(&reshdr, wim, rdesc, cur_blob);
                }
 
                /* cur_blob is now a blob bound to a resource.  */