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

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
This commit is contained in:
Fujii Masao 2015-04-13 13:30:59 +09:00
parent 442663f133
commit 1f94bec7a9

View File

@ -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");
}