diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/transam/slru.c | 8 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index aac93a60a3..a12fe88556 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -6,15 +6,13 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.12 2004/02/17 03:45:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.13 2004/02/23 23:03:10 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include <fcntl.h> -#include <dirent.h> -#include <errno.h> #include <sys/stat.h> #include <unistd.h> @@ -888,7 +886,7 @@ SlruScanDirectory(SlruCtl ctl, int cutoffPage, bool doDeletions) int segpage; char path[MAXPGPATH]; - cldir = opendir(ctl->Dir); + cldir = AllocateDir(ctl->Dir); if (cldir == NULL) ereport(ERROR, (errcode_for_file_access(), @@ -927,7 +925,7 @@ SlruScanDirectory(SlruCtl ctl, int cutoffPage, bool doDeletions) ereport(ERROR, (errcode_for_file_access(), errmsg("could not read directory \"%s\": %m", ctl->Dir))); - closedir(cldir); + FreeDir(cldir); return found; } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index dc6fea9b5b..821b504cbf 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.136 2004/02/17 03:45:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.137 2004/02/23 23:03:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -17,10 +17,8 @@ #include <fcntl.h> #include <signal.h> #include <unistd.h> -#include <errno.h> #include <sys/stat.h> #include <sys/time.h> -#include <dirent.h> #include "access/clog.h" #include "access/transam.h" @@ -1753,9 +1751,9 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr) XLByteToPrevSeg(endptr, endlogId, endlogSeg); - xldir = opendir(XLogDir); + xldir = AllocateDir(XLogDir); if (xldir == NULL) - ereport(PANIC, + ereport(ERROR, (errcode_for_file_access(), errmsg("could not open transaction log directory \"%s\": %m", XLogDir))); @@ -1812,11 +1810,11 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr) errno = 0; #endif if (errno) - ereport(PANIC, + ereport(ERROR, (errcode_for_file_access(), errmsg("could not read transaction log directory \"%s\": %m", XLogDir))); - closedir(xldir); + FreeDir(xldir); } /* |