X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=385f9f65ba6836aa594c5bb34e9b4823eabff79c;hb=181cc78dc68e62f3e005e1590f5cda12d3e287f5;hp=04e924bbb8ab719d6bb507085fbea9bacadbbd62;hpb=f370a82a53f55b8713266263096b96e07e02f4a0;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index 04e924bb..385f9f65 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -188,7 +188,7 @@ read_compressed_wim_resource(const struct wim_resource_descriptor * const rdesc,
 		}
 	}
 
-	const u32 chunk_order = fls32(chunk_size);
+	const u32 chunk_order = bsr32(chunk_size);
 
 	/* Calculate the total number of chunks the resource is divided into.  */
 	const u64 num_chunks = (rdesc->uncompressed_size + chunk_size - 1) >> chunk_order;
@@ -739,8 +739,7 @@ read_blob_prefix(const struct blob_descriptor *blob, u64 size,
 		[BLOB_IN_NTFS_VOLUME] = read_ntfs_attribute_prefix,
 	#endif
 	#ifdef __WIN32__
-		[BLOB_IN_WINNT_FILE_ON_DISK] = read_winnt_stream_prefix,
-		[BLOB_WIN32_ENCRYPTED] = read_win32_encrypted_file_prefix,
+		[BLOB_IN_WINDOWS_FILE] = read_windows_file_prefix,
 	#endif
 	};
 	wimlib_assert(blob->blob_location < ARRAY_LEN(handlers)
@@ -959,7 +958,7 @@ report_sha1_mismatch_error(const struct blob_descriptor *blob,
 		      "        Path: \"%"TS"\"\n"
 		      "        Expected SHA-1: %"TS"\n"
 		      "        Actual SHA-1: %"TS"\n",
-		      blob->file_on_disk, expected_hashstr, actual_hashstr);
+		      blob_file_path(blob), expected_hashstr, actual_hashstr);
 		return WIMLIB_ERR_CONCURRENT_MODIFICATION_DETECTED;
 	} else if (blob->blob_location == BLOB_IN_WIM) {
 		const struct wim_resource_descriptor *rdesc = blob->rdesc;