Use explicit casting in ctype macros

[wimlib] / src / blob_table.c

diff --git a/src/blob_table.c b/src/blob_table.c
index d2ece47ba471af1c67f37d62e8371401eeed8d52..29d44d9f031455ffca4c5b2180e3a720660da4e0 100644 (file)
--- a/src/blob_table.c
+++ b/src/blob_table.c
@@ -310,12 +310,9 @@ enlarge_blob_table(struct blob_table *table)
        table->array = new_array;
        table->capacity = new_capacity;
 
-       for (i = 0; i < old_capacity; i++) {
-               hlist_for_each_entry_safe(blob, tmp, &old_array[i], hash_list) {
-                       hlist_del(&blob->hash_list);
+       for (i = 0; i < old_capacity; i++)
+               hlist_for_each_entry_safe(blob, tmp, &old_array[i], hash_list)
                        blob_table_insert_raw(table, blob);
-               }
-       }
        FREE(old_array);
 }
 
@@ -406,7 +403,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 +608,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 +966,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.  */