Fix incorrect format placeholders

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 1e1fbe957faf3a5772c8844de1a14fa6edb915e6..87cd05c945468cbbceb066b089ba9776e49d6f12 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -10714,13 +10714,13 @@ xlog_block_info(StringInfo buf, XLogReaderState *record)
 
                XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk);
                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,
                                                         rnode.spcNode, rnode.dbNode, rnode.relNode,
                                                         forknum,
                                                         blk);
                else
-                       appendStringInfo(buf, "; blkref #%u: rel %u/%u/%u, blk %u",
+                       appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, blk %u",
                                                         block_id,
                                                         rnode.spcNode, rnode.dbNode, rnode.relNode,
                                                         blk);

diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index b33e0531ed1375019ec3b385e332f16231c2cac1..b2a57bd4ff6c8af3cffd94e60d7ef5ed487fe812 100644 (file)
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -985,14 +985,14 @@ WALReadRaiseError(WALReadError *errinfo)
                errno = errinfo->wre_errno;
                ereport(ERROR,
                                (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)));
        }
        else if (errinfo->wre_read == 0)
        {
                ereport(ERROR,
                                (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,
                                                errinfo->wre_req)));
        }

diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index f66b5a8dba0d73a18783101ef3b1d4509f7a3996..493fc8e83b1083f1d1f8a4a5e8d35a4f1bc1e38b 100644 (file)
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -382,11 +382,11 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen,
                if (errinfo.wre_errno != 0)
                {
                        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);
                }
                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,
                                                errinfo.wre_req);
        }
@@ -518,13 +518,13 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
 
                        XLogRecGetBlockTag(record, block_id, &rnode, &forknum, &blk);
                        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,
                                           rnode.spcNode, rnode.dbNode, rnode.relNode,
                                           forkNames[forknum],
                                           blk);
                        else
-                               printf(", blkref #%u: rel %u/%u/%u blk %u",
+                               printf(", blkref #%d: rel %u/%u/%u blk %u",
                                           block_id,
                                           rnode.spcNode, rnode.dbNode, rnode.relNode,
                                           blk);
@@ -548,7 +548,7 @@ XLogDumpDisplayRecord(XLogDumpConfig *config, XLogReaderState *record)
                                continue;
 
                        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,
                                   rnode.spcNode, rnode.dbNode, rnode.relNode,
                                   forkNames[forknum],
@@ -943,7 +943,7 @@ main(int argc, char **argv)
                                        private.startptr = (uint64) xlogid << 32 | xrecoff;
                                break;
                        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);
                                        goto bad_argument;