Commitc1d89c6

Neil Conway

committed

Minor code cleanup: calling FreeFile() before ereport(ERROR) is not

necessary, since files opened via AllocateFile() are closed automaticallyas part of error recovery.

1 parent9cce91d commitc1d89c6Copy full SHA for c1d89c6

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.284 2007/06/17 23:39:28 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.285 2007/06/20 02:02:49 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1223,12 +1223,9 @@ DoCopyTo(CopyState cstate)`
`1223`	`1223`
`1224`	`1224`	`fstat(fileno(cstate->copy_file),&st);`
`1225`	`1225`	`if (S_ISDIR(st.st_mode))`
`1226`		`-{`
`1227`		`-FreeFile(cstate->copy_file);`
`1228`	`1226`	`ereport(ERROR,`
`1229`	`1227`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`1230`	`1228`	`errmsg("\"%s\" is a directory",cstate->filename)));`
`1231`		`-}`
`1232`	`1229`	`}`
`1233`	`1230`
`1234`	`1231`	`PG_TRY();`
`@@ -1728,12 +1725,9 @@ CopyFrom(CopyState cstate)`
`1728`	`1725`
`1729`	`1726`	`fstat(fileno(cstate->copy_file),&st);`
`1730`	`1727`	`if (S_ISDIR(st.st_mode))`
`1731`		`-{`
`1732`		`-FreeFile(cstate->copy_file);`
`1733`	`1728`	`ereport(ERROR,`
`1734`	`1729`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`1735`	`1730`	`errmsg("\"%s\" is a directory",cstate->filename)));`
`1736`		`-}`
`1737`	`1731`	`}`
`1738`	`1732`
`1739`	`1733`	`tupDesc=RelationGetDescr(cstate->rel);`

Comments

(0)