X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fblob_table.c;h=b3eb63fcad750d17ea7dbe471a543748738a1043;hp=d2ece47ba471af1c67f37d62e8371401eeed8d52;hb=b82856cb22783df0e19990eb68d3694753f52220;hpb=ebdba490384924ef422b1df675ba11d5030faf09

diff --git a/src/blob_table.c b/src/blob_table.c
index d2ece47b..b3eb63fc 100644
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -406,7 +406,7 @@ cmp_blobs_by_sequential_order(const void *p1, const void *p2)
 
 		/* Different (possibly split) WIMs?  */
 		if (wim1 != wim2) {
-			v = memcmp(wim1->hdr.guid, wim2->hdr.guid, WIM_GUID_LEN);
+			v = cmp_guids(wim1->hdr.guid, wim2->hdr.guid);
 			if (v)
 				return v;
 		}
@@ -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.  */