git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

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

author Fujii Masao <fujii@postgresql.org>

2015年4月13日 04:30:59 +0000 (13:30 +0900)

committer Fujii Masao <fujii@postgresql.org>

2015年4月13日 04:30:59 +0000 (13:30 +0900)

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

src/bin/pg_rewind/logging.c patch | blob | blame | history

diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c

index aba12d842ef67857e9ee18fa9f33e30414517ebf..3e2dc76c583ecf2ecb348b81e31df4da1cb988a3 100644 (file)

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

}

This is the main PostgreSQL git repository.

RSS Atom