From d0e750c0acaf31f60667b1635311bcef5ab38bbe Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Thu, 10 Jun 2021 21:56:13 -0700 Subject: [PATCH] Rename PQtraceSetFlags() to PQsetTraceFlags(). We have a dozen PQset*() functions. PQresultSetInstanceData() and this were the libpq setter functions having a different word order. Adopt the majority word order. Reviewed by Alvaro Herrera and Robert Haas, though this choice of name was not unanimous. Discussion: https://postgr.es/m/20210605060555.GA216695@rfd.leadboat.com --- doc/src/sgml/libpq.sgml | 6 +++--- src/interfaces/libpq/exports.txt | 2 +- src/interfaces/libpq/fe-trace.c | 2 +- src/interfaces/libpq/libpq-fe.h | 2 +- src/test/modules/libpq_pipeline/libpq_pipeline.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 9e6e085385..6b96f30dcc 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -6533,14 +6533,14 @@ void PQtrace(PGconn *conn, FILE *stream); - - PQtraceSetFlagsPQtraceSetFlags + + PQsetTraceFlagsPQtraceSetFlags Controls the tracing behavior of client/server communication. -void PQtraceSetFlags(PGconn *conn, int flags); +void PQsetTraceFlags(PGconn *conn, int flags); diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt index 9ef99f6de1..824a03ffbd 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@ -183,5 +183,5 @@ PQenterPipelineMode 180 PQexitPipelineMode 181 PQpipelineSync 182 PQpipelineStatus 183 -PQtraceSetFlags 184 +PQsetTraceFlags 184 PQmblenBounded 185 diff --git a/src/interfaces/libpq/fe-trace.c b/src/interfaces/libpq/fe-trace.c index 76a6d1ebe2..8660d27926 100644 --- a/src/interfaces/libpq/fe-trace.c +++ b/src/interfaces/libpq/fe-trace.c @@ -61,7 +61,7 @@ PQuntrace(PGconn *conn) /* Set flags for current tracing session */ void -PQtraceSetFlags(PGconn *conn, int flags) +PQsetTraceFlags(PGconn *conn, int flags) { if (conn == NULL) return; diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index ca733a2004..ec378705ad 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -403,7 +403,7 @@ extern void PQuntrace(PGconn *conn); #define PQTRACE_SUPPRESS_TIMESTAMPS (1<<0) /* redact portions of some messages, for testing frameworks */ #define PQTRACE_REGRESS_MODE (1<<1) -extern void PQtraceSetFlags(PGconn *conn, int flags); +extern void PQsetTraceFlags(PGconn *conn, int flags); /* === in fe-exec.c === */ diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index e4bba103ed..71eedb6dbb 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -1326,7 +1326,7 @@ main(int argc, char **argv) setvbuf(trace, NULL, PG_IOLBF, 0); PQtrace(conn, trace); - PQtraceSetFlags(conn, + PQsetTraceFlags(conn, PQTRACE_SUPPRESS_TIMESTAMPS | PQTRACE_REGRESS_MODE); } -- 2.39.5