Commit c1d89c61 authored by Neil Conway's avatar Neil Conway

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

necessary, since files opened via AllocateFile() are closed automatically
as part of error recovery.
parent 9cce91db
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -1223,12 +1223,9 @@ DoCopyTo(CopyState cstate)
fstat(fileno(cstate->copy_file), &st); fstat(fileno(cstate->copy_file), &st);
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
{
FreeFile(cstate->copy_file);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is a directory", cstate->filename))); errmsg("\"%s\" is a directory", cstate->filename)));
}
} }
PG_TRY(); PG_TRY();
...@@ -1728,12 +1725,9 @@ CopyFrom(CopyState cstate) ...@@ -1728,12 +1725,9 @@ CopyFrom(CopyState cstate)
fstat(fileno(cstate->copy_file), &st); fstat(fileno(cstate->copy_file), &st);
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
{
FreeFile(cstate->copy_file);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is a directory", cstate->filename))); errmsg("\"%s\" is a directory", cstate->filename)));
}
} }
tupDesc = RelationGetDescr(cstate->rel); tupDesc = RelationGetDescr(cstate->rel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment