Fix peculiar, untranslatable message concatenation attempt

petere · petere · commit 2fb605ec76ee · 2010-03-17T20:58:38.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.390 2010/03/13 14:55:57 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.391 2010/03/17 20:58:38 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4463,10 +4463,9 @@ dot_pg_pass_warning(PGconn *conn)
 
 		if (!getPgPassFilename(pgpassfile))
 			return;
-		appendPQExpBufferStr(&conn->errorMessage,
-			libpq_gettext("password retrieved from "));
-		appendPQExpBufferStr(&conn->errorMessage, pgpassfile);
-		appendPQExpBufferChar(&conn->errorMessage, '\n');
+		appendPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("password retrieved from file \"%s\"\n"),
+						  pgpassfile);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.390 2010/03/13 14:55:57 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.391 2010/03/17 20:58:38 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -4463,10 +4463,9 @@ dot_pg_pass_warning(PGconn *conn)`
`4463`	`4463`
`4464`	`4464`	`if (!getPgPassFilename(pgpassfile))`
`4465`	`4465`	`return;`
`4466`		`- appendPQExpBufferStr(&conn->errorMessage,`
`4467`		`- libpq_gettext("password retrieved from "));`
`4468`		`- appendPQExpBufferStr(&conn->errorMessage, pgpassfile);`
`4469`		`- appendPQExpBufferChar(&conn->errorMessage, '\n');`
	`4466`	`+ appendPQExpBuffer(&conn->errorMessage,`
	`4467`	`+ libpq_gettext("password retrieved from file \"%s\"\n"),`
	`4468`	`+ pgpassfile);`
`4470`	`4469`	`}`
`4471`	`4470`	`}`
`4472`	`4471`