Fix more portability issues with casts to Size when using off_t

michaelpq · michaelpq · commit 94019c879a13 · 2018-07-18T09:51:53.000+09:00
This should tame the beast, as there are no other places where off_t is
used in the new error messages.

Reported again by longfin, which complained about walsender.c while I
spotted the other two ones while double-checking.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
@@ -1737,7 +1737,8 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
 		else
 			ereport(ERROR,
 					(errmsg("could not read file \"%s\": read %d of %zu",
-							path, readBytes, SnapBuildOnDiskConstantSize)));
+							path, readBytes,
+							(Size) SnapBuildOnDiskConstantSize)));
 	}
 
 	if (ondisk.magic != SNAPBUILD_MAGIC)
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
@@ -1422,7 +1422,7 @@ RestoreSlotFromDisk(const char *name)
 			ereport(PANIC,
 					(errmsg("could not read file \"%s\": read %d of %zu",
 							path, readBytes,
-							ReplicationSlotOnDiskConstantSize)));
+							(Size) ReplicationSlotOnDiskConstantSize)));
 	}
 
 	/* verify magic */
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -509,7 +509,7 @@ SendTimeLineHistory(TimeLineHistoryCmd *cmd)
 		else if (nread == 0)
 			ereport(ERROR,
 					(errmsg("could not read file \"%s\": read %d of %zu",
-							path, nread, bytesleft)));
+							path, nread, (Size) bytesleft)));
 
 		pq_sendbytes(&buf, rbuf, nread);
 		bytesleft -= nread;

Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,8 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)`
`1737`	`1737`	`else`
`1738`	`1738`	`ereport(ERROR,`
`1739`	`1739`	`(errmsg("could not read file \"%s\": read %d of %zu",`
`1740`		`- path, readBytes, SnapBuildOnDiskConstantSize)));`
	`1740`	`+ path, readBytes,`
	`1741`	`+ (Size) SnapBuildOnDiskConstantSize)));`
`1741`	`1742`	`}`
`1742`	`1743`
`1743`	`1744`	`if (ondisk.magic != SNAPBUILD_MAGIC)`
Original file line number	Diff line number	Diff line change
`@@ -1422,7 +1422,7 @@ RestoreSlotFromDisk(const char *name)`
`1422`	`1422`	`ereport(PANIC,`
`1423`	`1423`	`(errmsg("could not read file \"%s\": read %d of %zu",`
`1424`	`1424`	`path, readBytes,`
`1425`		`- ReplicationSlotOnDiskConstantSize)));`
	`1425`	`+ (Size) ReplicationSlotOnDiskConstantSize)));`
`1426`	`1426`	`}`
`1427`	`1427`
`1428`	`1428`	`/* verify magic */`