From 92ca8dc2739a777ff5a0df990d6e9818c5729ac5 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 2 Feb 2024 10:57:02 +0100 Subject: [PATCH 1/4] pgindent --- src/interfaces/libpq/fe-cancel.c | 14 +++++++------- src/interfaces/libpq/libpq-fe.h | 17 +++++++++-------- src/tools/pgindent/typedefs.list | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c index 7416791d9f..d75c9628e7 100644 --- a/src/interfaces/libpq/fe-cancel.c +++ b/src/interfaces/libpq/fe-cancel.c @@ -137,7 +137,7 @@ oom_error: * Returns 1 if successful 0 if not. */ int -PQcancelSend(PGcancelConn * cancelConn) +PQcancelSend(PGcancelConn *cancelConn) { if (!cancelConn || cancelConn->conn.status == CONNECTION_BAD) return 1; @@ -157,7 +157,7 @@ PQcancelSend(PGcancelConn * cancelConn) * Poll a cancel connection. For usage details see PQconnectPoll. */ PostgresPollingStatusType -PQcancelPoll(PGcancelConn * cancelConn) +PQcancelPoll(PGcancelConn *cancelConn) { PGconn *conn = (PGconn *) cancelConn; int n; @@ -249,7 +249,7 @@ PQcancelPoll(PGcancelConn * cancelConn) * Get the status of a cancel connection. */ ConnStatusType -PQcancelStatus(const PGcancelConn * cancelConn) +PQcancelStatus(const PGcancelConn *cancelConn) { return PQstatus((const PGconn *) cancelConn); } @@ -260,7 +260,7 @@ PQcancelStatus(const PGcancelConn * cancelConn) * Get the socket of the cancel connection. */ int -PQcancelSocket(const PGcancelConn * cancelConn) +PQcancelSocket(const PGcancelConn *cancelConn) { return PQsocket((const PGconn *) cancelConn); } @@ -271,7 +271,7 @@ PQcancelSocket(const PGcancelConn * cancelConn) * Get the socket of the cancel connection. */ char * -PQcancelErrorMessage(const PGcancelConn * cancelConn) +PQcancelErrorMessage(const PGcancelConn *cancelConn) { return PQerrorMessage((const PGconn *) cancelConn); } @@ -283,7 +283,7 @@ PQcancelErrorMessage(const PGcancelConn * cancelConn) * request. */ void -PQcancelReset(PGcancelConn * cancelConn) +PQcancelReset(PGcancelConn *cancelConn) { pqClosePGconn((PGconn *) cancelConn); cancelConn->conn.status = CONNECTION_STARTING; @@ -299,7 +299,7 @@ PQcancelReset(PGcancelConn * cancelConn) * Closes and frees the cancel connection. */ void -PQcancelFinish(PGcancelConn * cancelConn) +PQcancelFinish(PGcancelConn *cancelConn) { PQfinish((PGconn *) cancelConn); } diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 857ba54d94..851e549355 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -329,17 +329,18 @@ extern PostgresPollingStatusType PQresetPoll(PGconn *conn); extern void PQreset(PGconn *conn); /* Create a PGcancelConn that's used to cancel a query on the given PGconn */ -extern PGcancelConn * PQcancelConn(PGconn *conn); +extern PGcancelConn *PQcancelConn(PGconn *conn); + /* issue a blocking cancel request */ -extern int PQcancelSend(PGcancelConn * conn); +extern int PQcancelSend(PGcancelConn *conn); /* issue or poll a non-blocking cancel request */ -extern PostgresPollingStatusType PQcancelPoll(PGcancelConn * cancelConn); -extern ConnStatusType PQcancelStatus(const PGcancelConn * cancelConn); -extern int PQcancelSocket(const PGcancelConn * cancelConn); -extern char *PQcancelErrorMessage(const PGcancelConn * cancelConn); -extern void PQcancelReset(PGcancelConn * cancelConn); -extern void PQcancelFinish(PGcancelConn * cancelConn); +extern PostgresPollingStatusType PQcancelPoll(PGcancelConn *cancelConn); +extern ConnStatusType PQcancelStatus(const PGcancelConn *cancelConn); +extern int PQcancelSocket(const PGcancelConn *cancelConn); +extern char *PQcancelErrorMessage(const PGcancelConn *cancelConn); +extern void PQcancelReset(PGcancelConn *cancelConn); +extern void PQcancelFinish(PGcancelConn *cancelConn); /* request a cancel structure */ diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 91433d439b..9ffb169e9d 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -1760,6 +1760,7 @@ PG_Locale_Strategy PG_Lock_Status PG_init_t PGcancel +PGcancelConn PGcmdQueueEntry PGconn PGdataValue -- 2.39.2