summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas2020-08-18 10:13:09 +0000
committerHeikki Linnakangas2020-08-18 10:13:44 +0000
commitbff41b2b8938f5e3e7d536da6d7a14a1648b4dec (patch)
tree6b20a6fe65ad785711e4225e09605499519a4257
parentb83f1bcca0bb460413da4ce856b030502b4f71c5 (diff)
Avoid non-constant format string argument to fprintf().
As Tom Lane pointed out, it could defeat the compiler's printf() format string verification. Backpatch to v12, like that patch that introduced it. Discussion: https://www.postgresql.org/message-id/1069283.1597672779%40sss.pgh.pa.us
-rw-r--r--src/bin/pg_basebackup/pg_basebackup.c2
-rw-r--r--src/bin/pg_checksums/pg_checksums.c2
-rw-r--r--src/bin/pg_rewind/pg_rewind.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 23980c2bf9..1f5e6d2702 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -860,7 +860,7 @@ progress_report(int tablespacenum, const char *filename,
* Stay on the same line if reporting to a terminal and we're not done
* yet.
*/
- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
}
static int32
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 0696db69bb..ffdc23945c 100644
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -166,7 +166,7 @@ progress_report(bool finished)
* Stay on the same line if reporting to a terminal and we're not done
* yet.
*/
- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
}
static bool
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index a9aecc7905..23fc749e44 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -572,7 +572,7 @@ progress_report(bool finished)
* Stay on the same line if reporting to a terminal and we're not done
* yet.
*/
- fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+ fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
}
/*