summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2024-06-13 05:10:35 +0000
committerPeter Eisentraut2024-06-13 05:10:35 +0000
commit6ac5600a36c1950e1470ccb16038e6b8ca4e6eba (patch)
treeec922dede927779d85697d1c3c5ab01420a6d8a5
parent99b99285e5438ee8b0c065db58e87e6577158d22 (diff)
libpq: Some message style normalization
-rw-r--r--src/interfaces/libpq/fe-cancel.c6
-rw-r--r--src/interfaces/libpq/fe-connect.c4
-rw-r--r--src/interfaces/libpq/fe-exec.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c
index b183eafffa..3b6206ea7f 100644
--- a/src/interfaces/libpq/fe-cancel.c
+++ b/src/interfaces/libpq/fe-cancel.c
@@ -73,13 +73,13 @@ PQcancelCreate(PGconn *conn)
/* Check we have an open connection */
if (!conn)
{
- libpq_append_conn_error(cancelConn, "passed connection was NULL");
+ libpq_append_conn_error(cancelConn, "connection pointer is NULL");
return (PGcancelConn *) cancelConn;
}
if (conn->sock == PGINVALID_SOCKET)
{
- libpq_append_conn_error(cancelConn, "passed connection is not open");
+ libpq_append_conn_error(cancelConn, "connection not open");
return (PGcancelConn *) cancelConn;
}
@@ -260,7 +260,7 @@ PQcancelPoll(PGcancelConn *cancelConn)
*/
if (n > 0)
{
- libpq_append_conn_error(conn, "received unexpected response from server");
+ libpq_append_conn_error(conn, "unexpected response from server");
conn->status = CONNECTION_BAD;
return PGRES_POLLING_FAILED;
}
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 995621b626..90f259fc70 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1602,8 +1602,8 @@ pqConnectOptions2(PGconn *conn)
if (conn->sslnegotiation[0] != 'p')
{
conn->status = CONNECTION_BAD;
- libpq_append_conn_error(conn, "sslnegotiation value \"%s\" invalid when SSL support is not compiled in",
- conn->sslnegotiation);
+ libpq_append_conn_error(conn, "%s value \"%s\" invalid when SSL support is not compiled in",
+ "sslnegotiation", conn->sslnegotiation);
return false;
}
#endif
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 7bdfc4c21a..0d224a8524 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -2627,7 +2627,7 @@ PQsendTypedCommand(PGconn *conn, char command, char type, const char *target)
}
else
{
- libpq_append_conn_error(conn, "unknown command type provided");
+ libpq_append_conn_error(conn, "unrecognized message type \"%c\"", command);
goto sendFailed;
}