database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-08 06:02:22 +03:00
Code Activity

Remove INT64_HEX_FORMAT and UINT64_HEX_FORMAT

Browse Source 
These were introduced (commit efdc7d7475) at the same time as we were
moving to using the standard inttypes.h format macros (commit
a0ed19e0a9).  It doesn't seem useful to keep a new already-deprecated
interface like this with only a few users, so remove the new symbols
again and have the callers use PRIx64.

(Also, INT64_HEX_FORMAT was kind of a misnomer, since hex formats all
use unsigned types.)

Reviewed-by: Nathan Bossart <nathandbossart@gmail.com>
Reviewed-by: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/0ac47b5d-e5ab-4cac-98a7-bdee0e2831e4%40eisentraut.org
This commit is contained in:
Peter Eisentraut
2025-08-06 10:54:48 +02:00
parent 3e65e77f76
commit ce13bb96fb
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/postgres_fdw/option.c
View File

@@ -531,7 +531,7 @@ process_pgfdw_appname(const char *appname)
appendStringInfoString(&buf, application_name); appendStringInfoString(&buf, application_name);
break; break;
case 'c': case 'c':
appendStringInfo(&buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid); appendStringInfo(&buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
break; break;
case 'C': case 'C':
appendStringInfoString(&buf, cluster_name); appendStringInfoString(&buf, cluster_name);

2
src/backend/utils/error/csvlog.c
View File

@@ -120,7 +120,7 @@ write_csvlog(ErrorData *edata)
appendStringInfoChar(&buf, ','); appendStringInfoChar(&buf, ',');
/* session id */ /* session id */
appendStringInfo(&buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid); appendStringInfo(&buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
appendStringInfoChar(&buf, ','); appendStringInfoChar(&buf, ',');
/* Line number */ /* Line number */

4
src/backend/utils/error/elog.c
View File

@@ -2956,12 +2956,12 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
{ {
char strfbuf[128]; char strfbuf[128];
snprintf(strfbuf, sizeof(strfbuf) - 1, INT64_HEX_FORMAT ".%x", snprintf(strfbuf, sizeof(strfbuf) - 1, "%" PRIx64 ".%x",
MyStartTime, MyProcPid); MyStartTime, MyProcPid);
appendStringInfo(buf, "%*s", padding, strfbuf); appendStringInfo(buf, "%*s", padding, strfbuf);
} }
else else
appendStringInfo(buf, INT64_HEX_FORMAT ".%x", MyStartTime, MyProcPid); appendStringInfo(buf, "%" PRIx64 ".%x", MyStartTime, MyProcPid);
break; break;
case 'p': case 'p':
if (padding != 0) if (padding != 0)

2
src/backend/utils/error/jsonlog.c
View File

@@ -168,7 +168,7 @@ write_jsonlog(ErrorData *edata)
} }
/* Session id */ /* Session id */
appendJSONKeyValueFmt(&buf, "session_id", true, INT64_HEX_FORMAT ".%x", appendJSONKeyValueFmt(&buf, "session_id", true, "%" PRIx64 ".%x",
MyStartTime, MyProcPid); MyStartTime, MyProcPid);
/* Line number */ /* Line number */

2
src/include/c.h
View File

@@ -519,8 +519,6 @@ typedef uint32 bits32; /* >= 32 bits */
/* snprintf format strings to use for 64-bit integers */ /* snprintf format strings to use for 64-bit integers */
#define INT64_FORMAT "%" PRId64 #define INT64_FORMAT "%" PRId64
#define UINT64_FORMAT "%" PRIu64 #define UINT64_FORMAT "%" PRIu64
#define INT64_HEX_FORMAT "%" PRIx64
#define UINT64_HEX_FORMAT "%" PRIx64
/* /*
* 128-bit signed and unsigned integers * 128-bit signed and unsigned integers

2
src/test/modules/test_radixtree/test_radixtree.c
View File

@@ -44,7 +44,7 @@
uint64 _expected = (expected_expr); \ uint64 _expected = (expected_expr); \
if (_result != _expected) \ if (_result != _expected) \
elog(ERROR, \ elog(ERROR, \
"%s yielded " UINT64_HEX_FORMAT ", expected " UINT64_HEX_FORMAT " (%s) in file \"%s\" line %u", \ "%s yielded %" PRIx64 ", expected %" PRIx64 " (%s) in file \"%s\" line %u", \
#result_expr, _result, _expected, #expected_expr, __FILE__, __LINE__); \ #result_expr, _result, _expected, #expected_expr, __FILE__, __LINE__); \
} while (0) } while (0)