database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Fix translation of pg_controldata and pg_resetwal's NextOID output

Browse Source 
xgettext does not recognize OID8_FORMAT and therefore extracts an
incomplete message.  This switches to PRIu64 instead.

Kyotaro Horiguchi has noticed one problem in pg_controldata, and I have
spotted the extra two ones in pg_resetwal after more review.

Oversight in cb29861646.

Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Author: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/20260914.124645.2220219320843846932.horikyota.ntt@gmail.com
This commit is contained in:
Michael Paquier
2026-09-15 07:53:41 +09:00
parent 6e70bef24e
commit ceae3099da
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_controldata/pg_controldata.c
View File

@@ -269,7 +269,7 @@ main(int argc, char *argv[])
printf(_("Latest checkpoint's NextXID: %u:%u\n"),
EpochFromFullTransactionId(ControlFile->checkPointCopy.nextXid),
XidFromFullTransactionId(ControlFile->checkPointCopy.nextXid));
printf(_("Latest checkpoint's NextOID: " OID8_FORMAT "\n"),
printf(_("Latest checkpoint's NextOID: %" PRIu64 "\n"),
ControlFile->checkPointCopy.nextOid);
printf(_("Latest checkpoint's NextMultiXactId: %u\n"),
ControlFile->checkPointCopy.nextMulti);

4
src/bin/pg_resetwal/pg_resetwal.c
View File

@@ -775,7 +775,7 @@ PrintControlValues(bool guessed)
printf(_("Latest checkpoint's NextXID: %u:%u\n"),
EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid),
XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
printf(_("Latest checkpoint's NextOID: " OID8_FORMAT "\n"),
printf(_("Latest checkpoint's NextOID: %" PRIu64 "\n"),
ControlFile.checkPointCopy.nextOid);
printf(_("Latest checkpoint's NextMultiXactId: %u\n"),
ControlFile.checkPointCopy.nextMulti);
@@ -861,7 +861,7 @@ PrintNewControlValues(void)
if (next_oid_given)
{
printf(_("NextOID: " OID8_FORMAT "\n"),
printf(_("NextOID: %" PRIu64 "\n"),
ControlFile.checkPointCopy.nextOid);
}