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
pull/58/head
Heikki Linnakangas 6 years ago
parent 4f47c8e7d4
commit aecefffc3f
  1. 2
      src/bin/pg_basebackup/pg_basebackup.c
  2. 2
      src/bin/pg_checksums/pg_checksums.c
  3. 2
      src/bin/pg_rewind/pg_rewind.c

@ -801,7 +801,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

@ -165,7 +165,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

@ -505,7 +505,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);
}
/*

Loading…
Cancel
Save