Silence gettext warning about '\r' escape sequence in translatable string.

MasaoFujii · MasaoFujii · commit 1f94bec7a9e3 · 2015-04-13T13:30:59.000+09:00
gettext was unhappy about the commit b216ad7 because it revealed the problem that internationalized messages may contain '\r' escape sequence in pg_rewind. This commit moves '\r' to a separate printf() call. Michael Paquier, bug reported by Peter Eisentraut
diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c
@@ -134,7 +134,8 @@ progress_report(bool force)
 	snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT,
 			 fetch_size / 1024);
 
-	pg_log(PG_PROGRESS, "%*s/%s kB (%d%%) copied\r",
+	pg_log(PG_PROGRESS, "%*s/%s kB (%d%%) copied",
 		   (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str,
 		   percent);
+	printf("\r");
 }

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ progress_report(bool force)`
`134`	`134`	`snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT,`
`135`	`135`	`fetch_size / 1024);`
`136`	`136`
`137`		`- pg_log(PG_PROGRESS, "%*s/%s kB (%d%%) copied\r",`
	`137`	`+ pg_log(PG_PROGRESS, "%*s/%s kB (%d%%) copied",`
`138`	`138`	`(int) strlen(fetch_size_str), fetch_done_str, fetch_size_str,`
`139`	`139`	`percent);`
	`140`	`+ printf("\r");`
`140`	`141`	`}`