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

Fix incorrect format placeholders

Browse Source
This commit is contained in:
Peter Eisentraut 2021-12-29 10:08:41 +01:00
parent cab5b9ab2c
commit 113fa3945f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/transam/xlog.c
View File

@ -10714,13 +10714,13 @@ xlog_block_info(StringInfo buf, XLogReaderState *record)
XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk); XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk);
if (forknum != MAIN_FORKNUM) if (forknum != MAIN_FORKNUM)
appendStringInfo(buf, "; blkref #%u: rel %u/%u/%u, fork %u, blk %u", appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, fork %u, blk %u",
block_id, block_id,
rnode.spcNode, rnode.dbNode, rnode.relNode, rnode.spcNode, rnode.dbNode, rnode.relNode,
forknum, forknum,
blk); blk);
else else
appendStringInfo(buf, "; blkref #%u: rel %u/%u/%u, blk %u", appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, blk %u",
block_id, block_id,
rnode.spcNode, rnode.dbNode, rnode.relNode, rnode.spcNode, rnode.dbNode, rnode.relNode,
blk); blk);

4
src/backend/access/transam/xlogutils.c
View File

@ -985,14 +985,14 @@ WALReadRaiseError(WALReadError *errinfo)
errno = errinfo->wre_errno; errno = errinfo->wre_errno;
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not read from log segment %s, offset %u: %m", errmsg("could not read from log segment %s, offset %d: %m",
fname, errinfo->wre_off))); fname, errinfo->wre_off)));
} }
else if (errinfo->wre_read == 0) else if (errinfo->wre_read == 0)
{ {
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED), (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("could not read from log segment %s, offset %u: read %d of %d", errmsg("could not read from log segment %s, offset %d: read %d of %d",
fname, errinfo->wre_off, errinfo->wre_read, fname, errinfo->wre_off, errinfo->wre_read,
errinfo->wre_req))); errinfo->wre_req)));
} }

12
src/bin/pg_waldump/pg_waldump.c
View File

@ -382,11 +382,11 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen,
if (errinfo.wre_errno != 0) if (errinfo.wre_errno != 0)
{ {
errno = errinfo.wre_errno; errno = errinfo.wre_errno;
fatal_error("could not read from file %s, offset %u: %m", fatal_error("could not read from file %s, offset %d: %m",
fname, errinfo.wre_off); fname, errinfo.wre_off);
} }
else else
fatal_error("could not read from file %s, offset %u: read %d of %d", fatal_error("could not read from file %s, offset %d: read %d of %d",
fname, errinfo.wre_off, errinfo.wre_read, fname, errinfo.wre_off, errinfo.wre_read,
errinfo.wre_req); errinfo.wre_req);
} }
@ -518,13 +518,13 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk); XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk);
if (forknum != MAIN_FORKNUM) if (forknum != MAIN_FORKNUM)
printf(", blkref #%u: rel %u/%u/%u fork %s blk %u", printf(", blkref #%d: rel %u/%u/%u fork %s blk %u",
block_id, block_id,
rnode.spcNode, rnode.dbNode, rnode.relNode, rnode.spcNode, rnode.dbNode, rnode.relNode,
forkNames[forknum], forkNames[forknum],
blk); blk);
else else
printf(", blkref #%u: rel %u/%u/%u blk %u", printf(", blkref #%d: rel %u/%u/%u blk %u",
block_id, block_id,
rnode.spcNode, rnode.dbNode, rnode.relNode, rnode.spcNode, rnode.dbNode, rnode.relNode,
blk); blk);
@ -548,7 +548,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
continue; continue;
XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk); XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk);
printf("\tblkref #%u: rel %u/%u/%u fork %s blk %u", printf("\tblkref #%d: rel %u/%u/%u fork %s blk %u",
block_id, block_id,
rnode.spcNode, rnode.dbNode, rnode.relNode, rnode.spcNode, rnode.dbNode, rnode.relNode,
forkNames[forknum], forkNames[forknum],
@ -943,7 +943,7 @@ main(int argc, char **argv)
private.startptr = (uint64) xlogid << 32 | xrecoff; private.startptr = (uint64) xlogid << 32 | xrecoff;
break; break;
case 't': case 't':
if (sscanf(optarg, "%d", &private.timeline) != 1) if (sscanf(optarg, "%u", &private.timeline) != 1)
{ {
pg_log_error("could not parse timeline \"%s\"", optarg); pg_log_error("could not parse timeline \"%s\"", optarg);
goto bad_argument; goto bad_argument;