opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Standardize the printf format for st_size 

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

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

@ -202,10 +202,10 @@ RestoreArchivedFile(char *path, const char *xlogfname,
else else
elevel = FATAL; elevel = FATAL;
ereport(elevel, 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, xlogfname,
(unsigned long) stat_buf.st_size, (long long int) stat_buf.st_size,
(unsigned long) expectedSize))); (long long int) expectedSize)));
return false; return false;
} }
else else

4
src/bin/pg_basebackup/pg_receivewal.c
View File

@ -269,8 +269,8 @@ FindStreamingStart(uint32 *tli)
if (statbuf.st_size != WalSegSz) if (statbuf.st_size != WalSegSz)
{ {
pg_log_warning("segment file \"%s\" has incorrect size %d, skipping", pg_log_warning("segment file \"%s\" has incorrect size %lld, skipping",
dirent->d_name, (int) statbuf.st_size); dirent->d_name, (long long int) statbuf.st_size);
continue; continue;
} }
} }

8
src/bin/pg_verifybackup/pg_verifybackup.c
View File

@ -411,8 +411,8 @@ parse_manifest_file(char *manifest_path, manifest_files_hash **ht_p,
report_fatal_error("could not read file \"%s\": %m", report_fatal_error("could not read file \"%s\": %m",
manifest_path); manifest_path);
else else
report_fatal_error("could not read file \"%s\": read %d of %zu", report_fatal_error("could not read file \"%s\": read %d of %lld",
manifest_path, rc, (size_t) statbuf.st_size); manifest_path, rc, (long long int) statbuf.st_size);
} }
/* Close the manifest file. */ /* Close the manifest file. */
@ -638,8 +638,8 @@ verify_backup_file(verifier_context *context, char *relpath, char *fullpath)
if (m->size != sb.st_size) if (m->size != sb.st_size)
{ {
report_backup_error(context, report_backup_error(context,
"\"%s\" has size %zu on disk but size %zu in the manifest", "\"%s\" has size %lld on disk but size %zu in the manifest",
relpath, (size_t) sb.st_size, m->size); relpath, (long long int) sb.st_size, m->size);
m->bad = true; m->bad = true;
} }

6
src/fe_utils/archive.c
View File

@ -71,9 +71,9 @@ RestoreArchivedFile(const char *path, const char *xlogfname,
{ {
if (expectedSize > 0 && stat_buf.st_size != expectedSize) if (expectedSize > 0 && stat_buf.st_size != expectedSize)
{ {
pg_log_fatal("unexpected file size for \"%s\": %lu instead of %lu", pg_log_fatal("unexpected file size for \"%s\": %lld instead of %lld",
xlogfname, (unsigned long) stat_buf.st_size, xlogfname, (long long int) stat_buf.st_size,
(unsigned long) expectedSize); (long long int) expectedSize);
exit(1); exit(1);
} }
else else