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:
parent
b83f1bcca0
commit
bff41b2b89
|
@ -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
|
* Stay on the same line if reporting to a terminal and we're not done
|
||||||
* yet.
|
* yet.
|
||||||
*/
|
*/
|
||||||
fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
|
fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32
|
static int32
|
||||||
|
|
|
@ -166,7 +166,7 @@ progress_report(bool finished)
|
||||||
* Stay on the same line if reporting to a terminal and we're not done
|
* Stay on the same line if reporting to a terminal and we're not done
|
||||||
* yet.
|
* yet.
|
||||||
*/
|
*/
|
||||||
fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
|
fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
|
|
|
@ -572,7 +572,7 @@ progress_report(bool finished)
|
||||||
* Stay on the same line if reporting to a terminal and we're not done
|
* Stay on the same line if reporting to a terminal and we're not done
|
||||||
* yet.
|
* yet.
|
||||||
*/
|
*/
|
||||||
fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
|
fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue