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
This commit is contained in:
Heikki Linnakangas 2020-08-18 13:13:09 +03:00
parent 623a9ba79b
commit 734478200a
3 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

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