database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Standardize the printf format for st_size

Browse Source 
Existing code used various inconsistent ways to printf struct stat's
st_size member.  The type of that is off_t, which is in most cases a
signed 64-bit integer, so use the long long int format for it.
This commit is contained in:
Peter Eisentraut
2020-09-24 20:45:57 +02:00
parent aecf5ee2bb
commit c005eb00e7
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/access/transam/twophase.c
View File

@ -1243,10 +1243,10 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok)
stat.st_size > MaxAllocSize)
ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg_plural("incorrect size of file \"%s\": %zu byte",
"incorrect size of file \"%s\": %zu bytes",
(Size) stat.st_size, path,
(Size) stat.st_size)));
errmsg_plural("incorrect size of file \"%s\": %lld byte",
"incorrect size of file \"%s\": %lld bytes",
(long long int) stat.st_size, path,
(long long int) stat.st_size)));
crc_offset = stat.st_size - sizeof(pg_crc32c);
if (crc_offset != MAXALIGN(crc_offset))
@ -1270,8 +1270,8 @@ ReadTwoPhaseFile(TransactionId xid, bool missing_ok)
errmsg("could not read file \"%s\": %m", path)));
else
ereport(ERROR,
(errmsg("could not read file \"%s\": read %d of %zu",
path, r, (Size) stat.st_size)));
(errmsg("could not read file \"%s\": read %d of %lld",
path, r, (long long int) stat.st_size)));
}
pgstat_report_wait_end();

6
src/backend/access/transam/xlogarchive.c
View File

@ -202,10 +202,10 @@ RestoreArchivedFile(char *path, const char *xlogfname,
else
elevel = FATAL;
ereport(elevel,
(errmsg("archive file \"%s\" has wrong size: %lu instead of %lu",
(errmsg("archive file \"%s\" has wrong size: %lld instead of %lld",
xlogfname,
(unsigned long) stat_buf.st_size,
(unsigned long) expectedSize)));
(long long int) stat_buf.st_size,
(long long int) expectedSize)));
return false;
}
else