diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-10-25 03:08:03 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-10-25 03:08:03 +0000 |
| commit | 51f62d505e2aba66bf7870c7bd005cd32e7d0953 (patch) | |
| tree | 127e7cbbf6679dbc2e3cfd08786ab88a7a801f50 /src/backend/access/transam/xlog.c | |
| parent | 8a17ed63359325c567694fdd378e71803a53cc73 (diff) | |
| download | postgresql-51f62d505e2aba66bf7870c7bd005cd32e7d0953.tar.gz postgresql-51f62d505e2aba66bf7870c7bd005cd32e7d0953.zip | |
Standardize on MAXPGPATH as the size of a file pathname buffer,
eliminating some wildly inconsistent coding in various parts of the
system. I set MAXPGPATH = 1024 in config.h.in. If anyone is really
convinced that there ought to be a configure-time test to set the
value, go right ahead ... but I think it's a waste of time.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e8e85b11138..05eb5b0706f 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.6 1999/10/24 20:42:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.7 1999/10/25 03:07:42 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,8 @@ void StartupXLOG(void); void ShutdownXLOG(void); void CreateCheckPoint(bool shutdown); -char XLogDir[MAXPGPATH+1]; -char ControlFilePath[MAXPGPATH+1]; +char XLogDir[MAXPGPATH]; +char ControlFilePath[MAXPGPATH]; uint32 XLOGbuffers = 0; XLogRecPtr MyLastRecPtr = {0, 0}; bool StopIfError = false; @@ -147,8 +147,8 @@ typedef struct CheckPoint #define XLogFileSize (XLogLastSeg * XLogSegSize) #define XLogFileName(path, log, seg) \ - sprintf(path, "%.*s%c%08X%08X", \ - MAXPGPATH, XLogDir, SEP_CHAR, log, seg) + snprintf(path, MAXPGPATH, "%s%c%08X%08X", \ + XLogDir, SEP_CHAR, log, seg) #define PrevBufIdx(curridx) \ ((curridx == 0) ? XLogCtl->XLogCacheBlck : (curridx - 1)) @@ -718,7 +718,7 @@ XLogWrite(char *buffer) static int XLogFileInit(uint32 log, uint32 seg) { - char path[MAXPGPATH+1]; + char path[MAXPGPATH]; int fd; XLogFileName(path, log, seg); @@ -760,7 +760,7 @@ tryAgain: static int XLogFileOpen(uint32 log, uint32 seg, bool econt) { - char path[MAXPGPATH+1]; + char path[MAXPGPATH]; int fd; XLogFileName(path, log, seg); @@ -1067,7 +1067,7 @@ next_record_is_invalid:; readId++; } { - char path[MAXPGPATH+1]; + char path[MAXPGPATH]; XLogFileName(path, readId, readSeg); unlink(path); |