database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00
Code Activity

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

Browse Source 
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
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_rewind/logging.c
View File

@ -134,7 +134,8 @@ progress_report(bool force)
snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT, snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT,
fetch_size / 1024); 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, (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str,
percent); percent);
printf("\r");
} }