X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=c3e6927c147d50a25dd4e4c0d0f694737e652edc;hb=44dfae76fad55a93caba52bcf5a591d8ceef766c;hp=efdbdd40aab293825cbb9aebd96c5173b0154182;hpb=02b3060d08d91d12bc96e077b4d23418d66174cf;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index efdbdd40..c3e6927c 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -57,8 +57,8 @@
  *   "chunk table" provides the offset, in bytes relative to the end of the
  *   chunk table, of the start of each compressed chunk, except for the first
  *   chunk which is omitted as it always has an offset of 0.  Chunk table
- *   entries are 32-bit for resources <= 4 GiB uncompressed and 64-bit for
- *   resources > 4 GiB uncompressed.
+ *   entries are 32-bit for resources < 4 GiB uncompressed and 64-bit for
+ *   resources >= 4 GiB uncompressed.
  *
  * - Solid resource format (distinguished by the use of WIM_RESHDR_FLAG_SOLID
  *   instead of WIM_RESHDR_FLAG_COMPRESSED): similar to the original format, but
@@ -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;