database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-09 06:21:09 +03:00
Code Activity

Fix pg_bsd_indent bug where newlines were not being trimmed from typedef

Browse Source 
lines.  Update pg_bsd_indent required version to 1.1 (and update ftp
site).

Problem reported by Magnus.
This commit is contained in:
Bruce Momjian
2011-10-26 17:23:33 -04:00
parent d9bae53173
commit 360429e1d1
3 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/pg_basebackup/pg_basebackup.c
View File

@@ -379,11 +379,10 @@ progress_report(int tablespacenum, const char *filename)
char totalsize_str[32];
/*
* Avoid overflowing past 100% or the full size. This may make the
* total size number change as we approach the end of the backup
* (the estimate will always be wrong if WAL is included), but
* that's better than having the done column be bigger than the
* total.
* Avoid overflowing past 100% or the full size. This may make the total
* size number change as we approach the end of the backup (the estimate
* will always be wrong if WAL is included), but that's better than having
* the done column be bigger than the total.
*/
if (percent > 100)
percent = 100;
@@ -391,9 +390,9 @@ progress_report(int tablespacenum, const char *filename)
totalsize = totaldone / 1024;
/*
* Separate step to keep platform-dependent format code out of translatable
* strings. And we only test for INT64_FORMAT availability in snprintf,
* not fprintf.
* Separate step to keep platform-dependent format code out of
* translatable strings. And we only test for INT64_FORMAT availability
* in snprintf, not fprintf.
*/
snprintf(totaldone_str, sizeof(totaldone_str), INT64_FORMAT, totaldone / 1024);
snprintf(totalsize_str, sizeof(totalsize_str), INT64_FORMAT, totalsize);
@@ -410,7 +409,7 @@ progress_report(int tablespacenum, const char *filename)
ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
"%s/%s kB (100%%), %d/%d tablespaces %35s",
tablespacecount),
totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
else
fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",