Commit 6d1ae0c9 authored by Tom Lane's avatar Tom Lane

Fix typo (extraneous semicolon) in fd.c patch to avoid excess seeks.

Now it skips useless SEEK_CUR 0 calls too, as intended.
parent 98fe6703
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.61 2000/06/15 04:10:00 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.62 2000/07/05 21:10:05 tgl Exp $
* *
* NOTES: * NOTES:
* *
...@@ -809,11 +809,13 @@ FileWrite(File file, char *buffer, int amount) ...@@ -809,11 +809,13 @@ FileWrite(File file, char *buffer, int amount)
FileAccess(file); FileAccess(file);
returnCode = write(VfdCache[file].fd, buffer, amount); returnCode = write(VfdCache[file].fd, buffer, amount);
if (returnCode > 0) { if (returnCode > 0)
{
VfdCache[file].seekPos += returnCode; VfdCache[file].seekPos += returnCode;
/* mark the file as needing fsync */ /* mark the file as needing fsync */
VfdCache[file].fdstate |= FD_DIRTY; VfdCache[file].fdstate |= FD_DIRTY;
} else }
else
VfdCache[file].seekPos = FileUnknownPos; VfdCache[file].seekPos = FileUnknownPos;
return returnCode; return returnCode;
...@@ -832,6 +834,8 @@ FileSeek(File file, long offset, int whence) ...@@ -832,6 +834,8 @@ FileSeek(File file, long offset, int whence)
switch (whence) switch (whence)
{ {
case SEEK_SET: case SEEK_SET:
if (offset < 0)
elog(ERROR, "FileSeek: invalid offset: %ld", offset);
VfdCache[file].seekPos = offset; VfdCache[file].seekPos = offset;
break; break;
case SEEK_CUR: case SEEK_CUR:
...@@ -844,9 +848,12 @@ FileSeek(File file, long offset, int whence) ...@@ -844,9 +848,12 @@ FileSeek(File file, long offset, int whence)
default: default:
elog(ERROR, "FileSeek: invalid whence: %d", whence); elog(ERROR, "FileSeek: invalid whence: %d", whence);
break; break;
}
} }
} else else
switch (whence) { {
switch (whence)
{
case SEEK_SET: case SEEK_SET:
if (offset < 0) if (offset < 0)
elog(ERROR, "FileSeek: invalid offset: %ld", offset); elog(ERROR, "FileSeek: invalid offset: %ld", offset);
...@@ -854,8 +861,8 @@ FileSeek(File file, long offset, int whence) ...@@ -854,8 +861,8 @@ FileSeek(File file, long offset, int whence)
VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence); VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence);
break; break;
case SEEK_CUR: case SEEK_CUR:
if ((offset != 0) || (VfdCache[file].seekPos == FileUnknownPos)); if (offset != 0 || VfdCache[file].seekPos == FileUnknownPos)
VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence); VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence);
break; break;
case SEEK_END: case SEEK_END:
VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence); VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence);
...@@ -864,6 +871,7 @@ FileSeek(File file, long offset, int whence) ...@@ -864,6 +871,7 @@ FileSeek(File file, long offset, int whence)
elog(ERROR, "FileSeek: invalid whence: %d", whence); elog(ERROR, "FileSeek: invalid whence: %d", whence);
break; break;
} }
}
return VfdCache[file].seekPos; return VfdCache[file].seekPos;
} }
......
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