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

necessary, since files opened via AllocateFile() are closed automatically
as part of error recovery.
This commit is contained in:
Neil Conway 2007-06-20 02:02:49 +00:00
parent 9cce91dba0
commit c1d89c61fc
1 changed files with 1 additions and 7 deletions

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.284 2007/06/17 23:39:28 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.285 2007/06/20 02:02:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@ -1223,12 +1223,9 @@ DoCopyTo(CopyState cstate)
fstat(fileno(cstate->copy_file), &st);
if (S_ISDIR(st.st_mode))
{
FreeFile(cstate->copy_file);
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is a directory", cstate->filename)));
}
}
PG_TRY();
@ -1728,12 +1725,9 @@ CopyFrom(CopyState cstate)
fstat(fileno(cstate->copy_file), &st);
if (S_ISDIR(st.st_mode))
{
FreeFile(cstate->copy_file);
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is a directory", cstate->filename)));
}
}
tupDesc = RelationGetDescr(cstate->rel);