libpq: Some message style normalization

petere · petere · commit 6ac5600a36c1 · 2024-06-13T07:10:35.000+02:00
diff --git 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
@@ -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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,13 @@ PQcancelCreate(PGconn *conn)`
`73`	`73`	`/* Check we have an open connection */`
`74`	`74`	`if (!conn)`
`75`	`75`	`{`
`76`		`- libpq_append_conn_error(cancelConn, "passed connection was NULL");`
	`76`	`+ libpq_append_conn_error(cancelConn, "connection pointer is NULL");`
`77`	`77`	`return (PGcancelConn *) cancelConn;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if (conn->sock == PGINVALID_SOCKET)`
`81`	`81`	`{`
`82`		`- libpq_append_conn_error(cancelConn, "passed connection is not open");`
	`82`	`+ libpq_append_conn_error(cancelConn, "connection not open");`
`83`	`83`	`return (PGcancelConn *) cancelConn;`
`84`	`84`	`}`
`85`	`85`
`@@ -260,7 +260,7 @@ PQcancelPoll(PGcancelConn *cancelConn)`
`260`	`260`	`*/`
`261`	`261`	`if (n > 0)`
`262`	`262`	`{`
`263`		`- libpq_append_conn_error(conn, "received unexpected response from server");`
	`263`	`+ libpq_append_conn_error(conn, "unexpected response from server");`
`264`	`264`	`conn->status = CONNECTION_BAD;`
`265`	`265`	`return PGRES_POLLING_FAILED;`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1602,8 +1602,8 @@ pqConnectOptions2(PGconn *conn)`
`1602`	`1602`	`if (conn->sslnegotiation[0] != 'p')`
`1603`	`1603`	`{`
`1604`	`1604`	`conn->status = CONNECTION_BAD;`
`1605`		`- libpq_append_conn_error(conn, "sslnegotiation value \"%s\" invalid when SSL support is not compiled in",`
`1606`		`- conn->sslnegotiation);`
	`1605`	`+ libpq_append_conn_error(conn, "%s value \"%s\" invalid when SSL support is not compiled in",`
	`1606`	`+ "sslnegotiation", conn->sslnegotiation);`
`1607`	`1607`	`return false;`
`1608`	`1608`	`}`
`1609`	`1609`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -2627,7 +2627,7 @@ PQsendTypedCommand(PGconn conn, char command, char type, const char target)`
`2627`	`2627`	`}`
`2628`	`2628`	`else`
`2629`	`2629`	`{`
`2630`		`- libpq_append_conn_error(conn, "unknown command type provided");`
	`2630`	`+ libpq_append_conn_error(conn, "unrecognized message type \"%c\"", command);`
`2631`	`2631`	`goto sendFailed;`
`2632`	`2632`	`}`
`2633`	`2633`