pg_basebackup: Add missing newlines to several error messages

petere · petere · commit 74e629cb0987 · 2013-03-10T16:56:06.000-04:00
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1134,14 +1134,14 @@ GenerateRecoveryConf(PGconn *conn)
 	recoveryconfcontents = createPQExpBuffer();
 	if (!recoveryconfcontents)
 	{
-		fprintf(stderr, _("%s: out of memory"), progname);
+		fprintf(stderr, _("%s: out of memory\n"), progname);
 		disconnect_and_exit(1);
 	}
 
 	connOptions = PQconninfo(conn);
 	if (connOptions == NULL)
 	{
-		fprintf(stderr, _("%s: out of memory"), progname);
+		fprintf(stderr, _("%s: out of memory\n"), progname);
 		disconnect_and_exit(1);
 	}
 
@@ -1179,7 +1179,7 @@ GenerateRecoveryConf(PGconn *conn)
 	appendPQExpBufferStr(recoveryconfcontents, "'\n");
 	if (PQExpBufferBroken(recoveryconfcontents))
 	{
-		fprintf(stderr, _("%s: out of memory"), progname);
+		fprintf(stderr, _("%s: out of memory\n"), progname);
 		disconnect_and_exit(1);
 	}
 
@@ -1202,7 +1202,7 @@ WriteRecoveryConf(void)
 	cf = fopen(filename, "w");
 	if (cf == NULL)
 	{
-		fprintf(stderr, _("%s: could not create file %s: %s"), progname, filename, strerror(errno));
+		fprintf(stderr, _("%s: could not create file \"%s\": %s\n"), progname, filename, strerror(errno));
 		disconnect_and_exit(1);
 	}
 
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -313,7 +313,7 @@ writeTimeLineHistoryFile(char *basedir, TimeLineID tli, char *filename, char *co
 	fd = open(tmppath, O_WRONLY | O_CREAT | PG_BINARY, S_IRUSR | S_IWUSR);
 	if (fd < 0)
 	{
-		fprintf(stderr, _("%s: could not create timeline history file \"%s\": %s"),
+		fprintf(stderr, _("%s: could not create timeline history file \"%s\": %s\n"),
 				progname, tmppath, strerror(errno));
 		return false;
 	}
@@ -329,7 +329,7 @@ writeTimeLineHistoryFile(char *basedir, TimeLineID tli, char *filename, char *co
 		unlink(tmppath);
 		errno = save_errno;
 
-		fprintf(stderr, _("%s: could not write timeline history file \"%s\": %s"),
+		fprintf(stderr, _("%s: could not write timeline history file \"%s\": %s\n"),
 				progname, tmppath, strerror(errno));
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1134,14 +1134,14 @@ GenerateRecoveryConf(PGconn *conn)`
`1134`	`1134`	`recoveryconfcontents = createPQExpBuffer();`
`1135`	`1135`	`if (!recoveryconfcontents)`
`1136`	`1136`	`{`
`1137`		`- fprintf(stderr, _("%s: out of memory"), progname);`
	`1137`	`+ fprintf(stderr, _("%s: out of memory\n"), progname);`
`1138`	`1138`	`disconnect_and_exit(1);`
`1139`	`1139`	`}`
`1140`	`1140`
`1141`	`1141`	`connOptions = PQconninfo(conn);`
`1142`	`1142`	`if (connOptions == NULL)`
`1143`	`1143`	`{`
`1144`		`- fprintf(stderr, _("%s: out of memory"), progname);`
	`1144`	`+ fprintf(stderr, _("%s: out of memory\n"), progname);`
`1145`	`1145`	`disconnect_and_exit(1);`
`1146`	`1146`	`}`
`1147`	`1147`
`@@ -1179,7 +1179,7 @@ GenerateRecoveryConf(PGconn *conn)`
`1179`	`1179`	`appendPQExpBufferStr(recoveryconfcontents, "'\n");`
`1180`	`1180`	`if (PQExpBufferBroken(recoveryconfcontents))`
`1181`	`1181`	`{`
`1182`		`- fprintf(stderr, _("%s: out of memory"), progname);`
	`1182`	`+ fprintf(stderr, _("%s: out of memory\n"), progname);`
`1183`	`1183`	`disconnect_and_exit(1);`
`1184`	`1184`	`}`
`1185`	`1185`
`@@ -1202,7 +1202,7 @@ WriteRecoveryConf(void)`
`1202`	`1202`	`cf = fopen(filename, "w");`
`1203`	`1203`	`if (cf == NULL)`
`1204`	`1204`	`{`
`1205`		`- fprintf(stderr, _("%s: could not create file %s: %s"), progname, filename, strerror(errno));`
	`1205`	`+ fprintf(stderr, _("%s: could not create file \"%s\": %s\n"), progname, filename, strerror(errno));`
`1206`	`1206`	`disconnect_and_exit(1);`
`1207`	`1207`	`}`
`1208`	`1208`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ writeTimeLineHistoryFile(char basedir, TimeLineID tli, char filename, char *co`
`313`	`313`	`fd = open(tmppath, O_WRONLY \| O_CREAT \| PG_BINARY, S_IRUSR \| S_IWUSR);`
`314`	`314`	`if (fd < 0)`
`315`	`315`	`{`
`316`		`- fprintf(stderr, _("%s: could not create timeline history file \"%s\": %s"),`
	`316`	`+ fprintf(stderr, _("%s: could not create timeline history file \"%s\": %s\n"),`
`317`	`317`	`progname, tmppath, strerror(errno));`
`318`	`318`	`return false;`
`319`	`319`	`}`
`@@ -329,7 +329,7 @@ writeTimeLineHistoryFile(char basedir, TimeLineID tli, char filename, char *co`
`329`	`329`	`unlink(tmppath);`
`330`	`330`	`errno = save_errno;`
`331`	`331`
`332`		`- fprintf(stderr, _("%s: could not write timeline history file \"%s\": %s"),`
	`332`	`+ fprintf(stderr, _("%s: could not write timeline history file \"%s\": %s\n"),`
`333`	`333`	`progname, tmppath, strerror(errno));`
`334`	`334`	`return false;`
`335`	`335`	`}`