X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fintegrity.c;h=6d007fef93f825c6922b07b6d0ee0b18eaf37ba4;hp=99a9a9fd64b7e61c5fe7db52696e541e552ab42d;hb=01be73ad93236a0f6cf7e000b4f8ac91fea6dff3;hpb=da295f258b60e1593de305385c0669eac4b76644

diff --git a/src/integrity.c b/src/integrity.c
index 99a9a9fd..6d007fef 100644
--- a/src/integrity.c
+++ b/src/integrity.c
@@ -313,9 +313,7 @@ calculate_integrity_table(struct filedes *in_fd,
  *
  * Return values:
  *	WIMLIB_ERR_SUCCESS (0)
- *	WIMLIB_ERR_INVALID_INTEGRITY_TABLE
  *	WIMLIB_ERR_NOMEM
- *	WIMLIB_ERR_READ
  *	WIMLIB_ERR_UNEXPECTED_END_OF_FILE
  *	WIMLIB_ERR_WRITE
  */
@@ -332,9 +330,8 @@ write_integrity_table(WIMStruct *wim,
 
 	wimlib_assert(old_lookup_table_end <= new_lookup_table_end);
 
-	if (wim->hdr.integrity.offset == 0 || old_lookup_table_end == 0) {
-		old_table = NULL;
-	} else {
+	old_table = NULL;
+	if (wim_has_integrity_table(wim) && old_lookup_table_end != 0) {
 		ret = read_integrity_table(wim,
 					   old_lookup_table_end - WIM_HEADER_DISK_SIZE,
 					   &old_table);
@@ -477,7 +474,7 @@ check_wim_integrity(WIMStruct *wim, wimlib_progress_func_t progress_func)
 	struct integrity_table *table;
 	u64 end_lookup_table_offset;
 
-	if (wim->hdr.integrity.offset == 0) {
+	if (!wim_has_integrity_table(wim)) {
 		DEBUG("No integrity information.");
 		return WIM_INTEGRITY_NONEXISTENT;
 	}