Commit3639d08

committed

pg_dump: Fix weird error message composition

The previous way could make it look like "stdin" was the actual inputfile name. Write it as two separate messages instead.

1 parent16a3415 commit3639d08Copy full SHA for 3639d08

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,12 @@ pg_log_filter_error(FilterStateData fstate, const char fmt,...)`
`161`	`161`	`vsnprintf(buf,sizeof(buf),fmt,argp);`
`162`	`162`	`va_end(argp);`
`163`	`163`
`164`		`-pg_log_error("invalid format in filter read from \"%s\" on line %d: %s",`
`165`		`- (fstate->fp==stdin ?"stdin" :fstate->filename),`
`166`		`-fstate->lineno,`
`167`		`-buf);`
	`164`	`+if (fstate->fp==stdin)`
	`165`	`+pg_log_error("invalid format in filter read from standard input on line %d: %s",`
	`166`	`+fstate->lineno,buf);`
	`167`	`+else`
	`168`	`+pg_log_error("invalid format in filter read from file \"%s\" on line %d: %s",`
	`169`	`+fstate->filename,fstate->lineno,buf);`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`/*`

Comments

(0)