[PGPRO-5756] fixed gcc-11 compilation warnings

Mikhail Rutman · Mikhail Rutman · commit 0d9e756bc067 · 2021-11-01T16:32:43.000+07:00
diff --git a/src/state.c b/src/state.c
@@ -2862,8 +2862,8 @@ MtmStateLoad(void)
 	fsync_fname("pg_mtm", true);
 
 
-	readBytes = read(fd, &ondisk, MtmStateOnDiskConstantSize);
-	if (readBytes != MtmStateOnDiskConstantSize)
+	readBytes = read(fd, &ondisk, sizeof(MtmStateOnDisk));
+	if (readBytes != sizeof(MtmStateOnDisk))
 	{
 		int			save_errno = errno;
 
@@ -2896,30 +2896,6 @@ MtmStateLoad(void)
 				 errmsg("mtm state file \"%s\" has unsupported version: %u instead of %u",
 						path, ondisk.version, MTMSTATE_VERSION)));
 
-	readBytes = read(fd, &ondisk.current_gen,
-					 sizeof(MtmStateOnDisk) - MtmStateOnDiskConstantSize);
-
-	if (readBytes != (sizeof(MtmStateOnDisk) - MtmStateOnDiskConstantSize))
-	{
-		int			save_errno = errno;
-
-		CloseTransientFile(fd);
-
-		if (readBytes < 0)
-		{
-			errno = save_errno;
-			ereport(ERROR,
-					(errcode_for_file_access(),
-					 errmsg("could not read file \"%s\": %m", path)));
-		}
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("could not read file \"%s\": read %d of %zu",
-							path, readBytes,
-							sizeof(MtmStateOnDisk) - MtmStateOnDiskConstantSize)));
-	}
-
 	INIT_CRC32C(checksum);
 	COMP_CRC32C(checksum,
 				((char *) &ondisk) + MtmStateOnDiskNotChecksummedSize,
