diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/file/fd.c | 35 | ||||
| -rw-r--r-- | src/include/storage/fd.h | 3 |
2 files changed, 9 insertions, 29 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index f024c8e23fe..79da1f9c6fe 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.139 2007/06/07 19:19:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.140 2007/07/26 15:15:18 tgl Exp $ * * NOTES: * @@ -549,8 +549,7 @@ LruDelete(File file) /* close the file */ if (close(vfdP->fd)) - elog(ERROR, "failed to close \"%s\": %m", - vfdP->fileName); + elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName); --nfile; vfdP->fd = VFD_CLOSED; @@ -985,8 +984,7 @@ FileClose(File file) /* close the file */ if (close(vfdP->fd)) - elog(ERROR, "failed to close \"%s\": %m", - vfdP->fileName); + elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName); --nfile; vfdP->fd = VFD_CLOSED; @@ -1005,15 +1003,15 @@ FileClose(File file) { if (filestats.st_size >= log_temp_files) ereport(LOG, - (errmsg("temp file: path \"%s\" size %lu", - vfdP->fileName, (unsigned long)filestats.st_size))); + (errmsg("temp file: path \"%s\" size %lu", + vfdP->fileName, + (unsigned long) filestats.st_size))); } else - elog(LOG, "Could not stat \"%s\": %m", vfdP->fileName); + elog(LOG, "could not stat file \"%s\": %m", vfdP->fileName); } if (unlink(vfdP->fileName)) - elog(LOG, "failed to unlink \"%s\": %m", - vfdP->fileName); + elog(LOG, "could not unlink file \"%s\": %m", vfdP->fileName); } /* @@ -1022,23 +1020,6 @@ FileClose(File file) FreeVfd(file); } -/* - * close a file and forcibly delete the underlying Unix file - */ -void -FileUnlink(File file) -{ - Assert(FileIsValid(file)); - - DO_DB(elog(LOG, "FileUnlink: %d (%s)", - file, VfdCache[file].fileName)); - - /* force FileClose to delete it */ - VfdCache[file].fdstate |= FD_TEMPORARY; - - FileClose(file); -} - int FileRead(File file, char *buffer, int amount) { diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 6b5ecd0cf5f..dd539f76fba 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.59 2007/06/07 19:19:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.60 2007/07/26 15:15:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,6 @@ extern int max_files_per_process; extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode); extern File OpenTemporaryFile(bool interXact); extern void FileClose(File file); -extern void FileUnlink(File file); extern int FileRead(File file, char *buffer, int amount); extern int FileWrite(File file, char *buffer, int amount); extern int FileSync(File file); |