libpq: Message style improvements

petere · petere · commit 2e3fc7a7d322 · 2017-06-13T11:53:50.000-04:00
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -1218,7 +1218,8 @@ PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user,
 	else
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				   libpq_gettext("unknown password encryption algorithm\n"));
+				   libpq_gettext("unrecognized password encryption algorithm \"%s\"\n"),
+						  algorithm);
 		return NULL;
 	}
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -3099,7 +3099,7 @@ PQconnectPoll(PGconn *conn)
 				restoreErrorMessage(conn, &savedMessage);
 				appendPQExpBuffer(&conn->errorMessage,
 				  libpq_gettext("test \"SHOW transaction_read_only\" failed "
-								" on \"%s:%s\"\n"),
+								"on server \"%s:%s\"\n"),
 								  conn->connhost[conn->whichhost].host,
 								  conn->connhost[conn->whichhost].port);
 				conn->status = CONNECTION_OK;

Original file line number	Diff line number	Diff line change
`@@ -1218,7 +1218,8 @@ PQencryptPasswordConn(PGconn conn, const char passwd, const char *user,`
`1218`	`1218`	`else`
`1219`	`1219`	`{`
`1220`	`1220`	`printfPQExpBuffer(&conn->errorMessage,`
`1221`		`- libpq_gettext("unknown password encryption algorithm\n"));`
	`1221`	`+ libpq_gettext("unrecognized password encryption algorithm \"%s\"\n"),`
	`1222`	`+ algorithm);`
`1222`	`1223`	`return NULL;`
`1223`	`1224`	`}`
`1224`	`1225`