database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00
Code

Fix more portability issues with casts to Size when using off_t

Browse Source 
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.
This commit is contained in:
Michael Paquier 2018-07-18 09:51:53 +09:00
parent 8bd064f0c7
commit 94019c879a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/replication/logical/snapbuild.c
View File

@ -1737,7 +1737,8 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
else else
ereport(ERROR, ereport(ERROR,
(errmsg("could not read file \"%s\": read %d of %zu", (errmsg("could not read file \"%s\": read %d of %zu",
path, readBytes, SnapBuildOnDiskConstantSize))); path, readBytes,
(Size) SnapBuildOnDiskConstantSize)));
} }
if (ondisk.magic != SNAPBUILD_MAGIC) if (ondisk.magic != SNAPBUILD_MAGIC)

2
src/backend/replication/slot.c
View File

@ -1422,7 +1422,7 @@ RestoreSlotFromDisk(const char *name)
ereport(PANIC, ereport(PANIC,
(errmsg("could not read file \"%s\": read %d of %zu", (errmsg("could not read file \"%s\": read %d of %zu",
path, readBytes, path, readBytes,
ReplicationSlotOnDiskConstantSize))); (Size) ReplicationSlotOnDiskConstantSize)));
} }
/* verify magic */ /* verify magic */

2
src/backend/replication/walsender.c
View File

@ -509,7 +509,7 @@ SendTimeLineHistory(TimeLineHistoryCmd *cmd)
else if (nread == 0) else if (nread == 0)
ereport(ERROR, ereport(ERROR,
(errmsg("could not read file \"%s\": read %d of %zu", (errmsg("could not read file \"%s\": read %d of %zu",
path, nread, bytesleft))); path, nread, (Size) bytesleft)));
pq_sendbytes(&buf, rbuf, nread); pq_sendbytes(&buf, rbuf, nread);
bytesleft -= nread; bytesleft -= nread;