From 3639d08e2f36f76e9a626c60b534c7fe204f329c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 20 Jun 2024 11:36:38 +0200 Subject: [PATCH] pg_dump: Fix weird error message composition The previous way could make it look like "stdin" was the actual input file name. Write it as two separate messages instead. --- src/bin/pg_dump/filter.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_dump/filter.c b/src/bin/pg_dump/filter.c index 3fb93c5f155..5815cd23748 100644 --- a/src/bin/pg_dump/filter.c +++ b/src/bin/pg_dump/filter.c @@ -161,10 +161,12 @@ pg_log_filter_error(FilterStateData *fstate, const char *fmt,...) vsnprintf(buf, sizeof(buf), fmt, argp); va_end(argp); - pg_log_error("invalid format in filter read from \"%s\" on line %d: %s", - (fstate->fp == stdin ? "stdin" : fstate->filename), - fstate->lineno, - buf); + if (fstate->fp == stdin) + pg_log_error("invalid format in filter read from standard input on line %d: %s", + fstate->lineno, buf); + else + pg_log_error("invalid format in filter read from file \"%s\" on line %d: %s", + fstate->filename, fstate->lineno, buf); } /*