aboutsummaryrefslogtreecommitdiff
path: root/src/backend/storage
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/storage')
-rw-r--r--src/backend/storage/buffer/buf_table.c22
-rw-r--r--src/backend/storage/buffer/bufmgr.c82
-rw-r--r--src/backend/storage/buffer/freelist.c6
-rw-r--r--src/backend/storage/file/fd.c20
-rw-r--r--src/backend/storage/ipc/ipc.c32
-rw-r--r--src/backend/storage/ipc/ipci.c4
-rw-r--r--src/backend/storage/ipc/shmem.c52
-rw-r--r--src/backend/storage/ipc/shmqueue.c8
-rw-r--r--src/backend/storage/ipc/sinvaladt.c66
-rw-r--r--src/backend/storage/ipc/spin.c20
-rw-r--r--src/backend/storage/large_object/inv_api.c52
-rw-r--r--src/backend/storage/lmgr/lock.c80
-rw-r--r--src/backend/storage/lmgr/multi.c16
-rw-r--r--src/backend/storage/lmgr/proc.c22
-rw-r--r--src/backend/storage/lmgr/single.c10
-rw-r--r--src/backend/storage/page/bufpage.c20
-rw-r--r--src/backend/storage/page/itemptr.c6
-rw-r--r--src/backend/storage/smgr/md.c78
-rw-r--r--src/backend/storage/smgr/mm.c46
-rw-r--r--src/backend/storage/smgr/smgr.c32
-rw-r--r--src/backend/storage/smgr/smgrtype.c14
21 files changed, 344 insertions, 344 deletions
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index d5e576b119e..2a932c6452e 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.12 1998/06/30 19:09:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.13 1998/09/01 03:25:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@ BufTableLookup(BufferTag *tagPtr)
bool found;
if (tagPtr->blockNum == P_NEW)
- return (NULL);
+ return NULL;
result = (LookupEnt *)
hash_search(SharedBufHash, (char *) tagPtr, HASH_FIND, &found);
@@ -88,11 +88,11 @@ BufTableLookup(BufferTag *tagPtr)
if (!result)
{
elog(ERROR, "BufTableLookup: BufferLookup table corrupted");
- return (NULL);
+ return NULL;
}
if (!found)
- return (NULL);
- return (&(BufferDescriptors[result->id]));
+ return NULL;
+ return &(BufferDescriptors[result->id]);
}
/*
@@ -109,7 +109,7 @@ BufTableDelete(BufferDesc *buf)
* BM_DELETED keeps us from removing buffer twice.
*/
if (buf->flags & BM_DELETED)
- return (TRUE);
+ return TRUE;
buf->flags |= BM_DELETED;
@@ -119,10 +119,10 @@ BufTableDelete(BufferDesc *buf)
if (!(result && found))
{
elog(ERROR, "BufTableDelete: BufferLookup table corrupted");
- return (FALSE);
+ return FALSE;
}
- return (TRUE);
+ return TRUE;
}
bool
@@ -142,18 +142,18 @@ BufTableInsert(BufferDesc *buf)
{
Assert(0);
elog(ERROR, "BufTableInsert: BufferLookup table corrupted");
- return (FALSE);
+ return FALSE;
}
/* found something else in the table ! */
if (found)
{
Assert(0);
elog(ERROR, "BufTableInsert: BufferLookup table corrupted");
- return (FALSE);
+ return FALSE;
}
result->id = buf->buf_id;
- return (TRUE);
+ return TRUE;
}
/* prints out collision stats for the buf table */
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 77efdf3538a..837b02dbf12 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.41 1998/08/19 02:02:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.42 1998/09/01 03:25:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -128,19 +128,19 @@ RelationGetBufferWithBuffer(Relation relation,
bufHdr->tag.relId.dbId == lrelId->dbId)
{
SpinRelease(BufMgrLock);
- return (buffer);
+ return buffer;
}
- return (ReadBufferWithBufferLock(relation, blockNumber, true));
+ return ReadBufferWithBufferLock(relation, blockNumber, true);
}
else
{
bufHdr = &LocalBufferDescriptors[-buffer - 1];
if (bufHdr->tag.relId.relId == RelationGetRelid(relation) &&
bufHdr->tag.blockNum == blockNumber)
- return (buffer);
+ return buffer;
}
}
- return (ReadBuffer(relation, blockNumber));
+ return ReadBuffer(relation, blockNumber);
}
/*
@@ -256,7 +256,7 @@ ReadBufferWithBufferLock(Relation reln,
}
if (!bufHdr)
- return (InvalidBuffer);
+ return InvalidBuffer;
/* if its already in the buffer pool, we're done */
if (found)
@@ -274,7 +274,7 @@ ReadBufferWithBufferLock(Relation reln,
smgrextend(DEFAULT_SMGR, reln,
(char *) MAKE_PTR(bufHdr->data));
}
- return (BufferDescriptorGetBuffer(bufHdr));
+ return BufferDescriptorGetBuffer(bufHdr);
}
@@ -296,7 +296,7 @@ ReadBufferWithBufferLock(Relation reln,
}
if (isLocalBuf)
- return (BufferDescriptorGetBuffer(bufHdr));
+ return BufferDescriptorGetBuffer(bufHdr);
/* lock buffer manager again to update IO IN PROGRESS */
SpinAcquire(BufMgrLock);
@@ -338,9 +338,9 @@ ReadBufferWithBufferLock(Relation reln,
SpinRelease(BufMgrLock);
if (status == SM_FAIL)
- return (InvalidBuffer);
+ return InvalidBuffer;
- return (BufferDescriptorGetBuffer(bufHdr));
+ return BufferDescriptorGetBuffer(bufHdr);
}
/*
@@ -421,7 +421,7 @@ BufferAlloc(Relation reln,
SpinRelease(BufMgrLock);
- return (buf);
+ return buf;
}
*foundPtr = FALSE;
@@ -444,7 +444,7 @@ BufferAlloc(Relation reln,
* again.
*/
if (buf == NULL)
- return (NULL);
+ return NULL;
/*
* There should be exactly one pin on the buffer after it is
@@ -606,7 +606,7 @@ BufferAlloc(Relation reln,
SpinRelease(BufMgrLock);
- return (buf2);
+ return buf2;
}
}
}
@@ -665,7 +665,7 @@ BufferAlloc(Relation reln,
SpinRelease(BufMgrLock);
- return (buf);
+ return buf;
}
/*
@@ -689,7 +689,7 @@ WriteBuffer(Buffer buffer)
BufferDesc *bufHdr;
if (WriteMode == BUFFER_FLUSH_WRITE)
- return (FlushBuffer(buffer, TRUE));
+ return FlushBuffer(buffer, TRUE);
else
{
@@ -697,7 +697,7 @@ WriteBuffer(Buffer buffer)
return WriteLocalBuffer(buffer, TRUE);
if (BAD_BUFFER_ID(buffer))
- return (FALSE);
+ return FALSE;
bufHdr = &BufferDescriptors[buffer - 1];
@@ -708,7 +708,7 @@ WriteBuffer(Buffer buffer)
SpinRelease(BufMgrLock);
CommitInfoNeedsSave[buffer - 1] = 0;
}
- return (TRUE);
+ return TRUE;
}
#ifdef NOT_USED
@@ -803,7 +803,7 @@ FlushBuffer(Buffer buffer, bool release)
return FlushLocalBuffer(buffer, release);
if (BAD_BUFFER_ID(buffer))
- return (STATUS_ERROR);
+ return STATUS_ERROR;
bufHdr = &BufferDescriptors[buffer - 1];
bufdb = bufHdr->tag.relId.dbId;
@@ -826,7 +826,7 @@ FlushBuffer(Buffer buffer, bool release)
{
elog(ERROR, "FlushBuffer: cannot flush block %u of the relation %s",
bufHdr->tag.blockNum, bufHdr->sb_relname);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
BufferFlushCount++;
@@ -848,7 +848,7 @@ FlushBuffer(Buffer buffer, bool release)
SpinRelease(BufMgrLock);
CommitInfoNeedsSave[buffer - 1] = 0;
- return (STATUS_OK);
+ return STATUS_OK;
}
/*
@@ -865,7 +865,7 @@ WriteNoReleaseBuffer(Buffer buffer)
BufferDesc *bufHdr;
if (WriteMode == BUFFER_FLUSH_WRITE)
- return (FlushBuffer(buffer, FALSE));
+ return FlushBuffer(buffer, FALSE);
else
{
@@ -873,7 +873,7 @@ WriteNoReleaseBuffer(Buffer buffer)
return WriteLocalBuffer(buffer, FALSE);
if (BAD_BUFFER_ID(buffer))
- return (STATUS_ERROR);
+ return STATUS_ERROR;
bufHdr = &BufferDescriptors[buffer - 1];
@@ -882,7 +882,7 @@ WriteNoReleaseBuffer(Buffer buffer)
SpinRelease(BufMgrLock);
CommitInfoNeedsSave[buffer - 1] = 0;
}
- return (STATUS_OK);
+ return STATUS_OK;
}
@@ -938,7 +938,7 @@ ReleaseAndReadBuffer(Buffer buffer,
}
}
- return (ReadBuffer(relation, blockNum));
+ return ReadBuffer(relation, blockNum);
}
/*
@@ -1224,9 +1224,9 @@ BufferPoolCheckLeak()
if (error)
{
PrintBufferDescs();
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
/* ------------------------------------------------
@@ -1260,9 +1260,9 @@ BufferGetBlockNumber(Buffer buffer)
/* XXX should be a critical section */
if (BufferIsLocal(buffer))
- return (LocalBufferDescriptors[-buffer - 1].tag.blockNum);
+ return LocalBufferDescriptors[-buffer - 1].tag.blockNum;
else
- return (BufferDescriptors[buffer - 1].tag.blockNum);
+ return BufferDescriptors[buffer - 1].tag.blockNum;
}
/*
@@ -1297,7 +1297,7 @@ BufferGetRelation(Buffer buffer)
RelationIncrementReferenceCount(relation);
}
- return (relation);
+ return relation;
}
/*
@@ -1354,11 +1354,11 @@ BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld)
RelationDecrementReferenceCount(reln);
if (status == SM_FAIL)
- return (FALSE);
+ return FALSE;
BufferFlushCount++;
- return (TRUE);
+ return TRUE;
}
/*
@@ -1576,19 +1576,19 @@ BlowawayRelationBuffers(Relation rel, BlockNumber block)
{
elog(NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is dirty",
rel->rd_rel->relname.data, block, buf->tag.blockNum);
- return (-1);
+ return -1;
}
if (LocalRefCount[i] > 0)
{
elog(NOTICE, "BlowawayRelationBuffers(%s (local), %u): block %u is referenced (%d)",
rel->rd_rel->relname.data, block,
buf->tag.blockNum, LocalRefCount[i]);
- return (-2);
+ return -2;
}
buf->tag.relId.relId = InvalidOid;
}
}
- return (0);
+ return 0;
}
SpinAcquire(BufMgrLock);
@@ -1605,7 +1605,7 @@ BlowawayRelationBuffers(Relation rel, BlockNumber block)
buf->sb_relname, block, buf->tag.blockNum,
PrivateRefCount[i], LastRefCount[i], buf->refcount);
SpinRelease(BufMgrLock);
- return (-1);
+ return -1;
}
if (!(buf->flags & BM_FREE))
{
@@ -1613,13 +1613,13 @@ BlowawayRelationBuffers(Relation rel, BlockNumber block)
buf->sb_relname, block, buf->tag.blockNum,
PrivateRefCount[i], LastRefCount[i], buf->refcount);
SpinRelease(BufMgrLock);
- return (-2);
+ return -2;
}
BufTableDelete(buf);
}
}
SpinRelease(BufMgrLock);
- return (0);
+ return 0;
}
#undef ReleaseBuffer
@@ -1638,11 +1638,11 @@ ReleaseBuffer(Buffer buffer)
{
Assert(LocalRefCount[-buffer - 1] > 0);
LocalRefCount[-buffer - 1]--;
- return (STATUS_OK);
+ return STATUS_OK;
}
if (BAD_BUFFER_ID(buffer))
- return (STATUS_ERROR);
+ return STATUS_ERROR;
bufHdr = &BufferDescriptors[buffer - 1];
@@ -1670,7 +1670,7 @@ ReleaseBuffer(Buffer buffer)
SpinRelease(BufMgrLock);
}
- return (STATUS_OK);
+ return STATUS_OK;
}
#ifdef NOT_USED
@@ -1923,7 +1923,7 @@ SetBufferWriteMode(int mode)
old = WriteMode;
WriteMode = mode;
- return (old);
+ return old;
}
void
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index d5c0272a8a6..421bce86e24 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.11 1998/06/15 19:29:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.12 1998/09/01 03:25:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -192,7 +192,7 @@ GetFreeBuffer()
/* queue is empty. All buffers in the buffer pool are pinned. */
elog(ERROR, "out of free buffers: time to abort !\n");
- return (NULL);
+ return NULL;
}
buf = &(BufferDescriptors[SharedFreeList->freeNext]);
@@ -203,7 +203,7 @@ GetFreeBuffer()
buf->flags &= ~(BM_FREE);
- return (buf);
+ return buf;
}
/*
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 6493b947dbf..88288c9a5ef 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.32 1998/06/15 19:29:11 momjian Exp $
+ * $Id: fd.c,v 1.33 1998/09/01 03:25:06 momjian Exp $
*
* NOTES:
*
@@ -336,7 +336,7 @@ tryAgain:
{
DO_DB(elog(DEBUG, "RE_OPEN FAILED: %d",
errno));
- return (vfdP->fd);
+ return vfdP->fd;
}
else
{
@@ -363,7 +363,7 @@ tryAgain:
Insert(file);
- return (0);
+ return 0;
}
static void
@@ -484,7 +484,7 @@ filepath(char *filename)
printf("filepath: path is %s\n", buf);
#endif
- return (buf);
+ return buf;
}
static int
@@ -521,7 +521,7 @@ FileAccess(File file)
Insert(file);
}
- return (0);
+ return 0;
}
/*
@@ -604,7 +604,7 @@ FileNameOpenFile(FileName fileName, int fileFlags, int fileMode)
fname = filepath(fileName);
fd = fileNameOpenFile(fname, fileFlags, fileMode);
pfree(fname);
- return (fd);
+ return fd;
}
/*
@@ -613,7 +613,7 @@ FileNameOpenFile(FileName fileName, int fileFlags, int fileMode)
File
PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
{
- return (fileNameOpenFile(fileName, fileFlags, fileMode));
+ return fileNameOpenFile(fileName, fileFlags, fileMode);
}
void
@@ -766,7 +766,7 @@ FileSeek(File file, long offset, int whence)
return returnCode;
}
/* NOTREACHED */
- return (-1L);
+ return -1L;
}
/*
@@ -794,7 +794,7 @@ FileTruncate(File file, int offset)
FileSync(file);
FileAccess(file);
returnCode = ftruncate(VfdCache[file].fd, offset);
- return (returnCode);
+ return returnCode;
}
int
@@ -828,7 +828,7 @@ FileNameUnlink(char *filename)
fname = filepath(filename);
retval = unlink(fname);
pfree(fname);
- return (retval);
+ return retval;
}
/*
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index a9c56cf728f..48ccd13fba9 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.31 1998/08/25 21:34:01 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.32 1998/09/01 03:25:08 momjian Exp $
*
* NOTES
*
@@ -88,13 +88,13 @@ PrivateMemoryCreate(IpcMemoryKey memKey,
elog(ERROR, "PrivateMemoryCreate: not enough memory to malloc");
MemSet(IpcPrivateMem[memid].memptr, 0, size); /* XXX PURIFY */
- return (memid++);
+ return memid++;
}
static char *
PrivateMemoryAttach(IpcMemoryId memid)
{
- return (IpcPrivateMem[memid].memptr);
+ return IpcPrivateMem[memid].memptr;
}
@@ -205,14 +205,14 @@ int
on_proc_exit(void (*function) (), caddr_t arg)
{
if (on_proc_exit_index >= MAX_ON_EXITS)
- return (-1);
+ return -1;
on_proc_exit_list[on_proc_exit_index].function = function;
on_proc_exit_list[on_proc_exit_index].arg = arg;
++on_proc_exit_index;
- return (0);
+ return 0;
}
/* ----------------------------------------------------------------
@@ -226,14 +226,14 @@ int
on_shmem_exit(void (*function) (), caddr_t arg)
{
if (on_shmem_exit_index >= MAX_ON_EXITS)
- return (-1);
+ return -1;
on_shmem_exit_list[on_shmem_exit_index].function = function;
on_shmem_exit_list[on_shmem_exit_index].arg = arg;
++on_shmem_exit_index;
- return (0);
+ return 0;
}
/* ----------------------------------------------------------------
@@ -327,7 +327,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
if (semNum > IPC_NMAXSEM || semNum <= 0)
{
*status = IpcInvalidArgument;
- return (2); /* returns the number of the invalid
+ return 2; /* returns the number of the invalid
* argument */
}
@@ -378,7 +378,7 @@ IpcSemaphoreCreate(IpcSemaphoreKey semKey,
fflush(stdout);
fflush(stderr);
#endif
- return (semId);
+ return semId;
}
@@ -560,13 +560,13 @@ IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission)
EPRINTF("IpcMemoryCreate: shmget failed (%s) "
"key=%d, size=%d, permission=%o",
strerror(errno), memKey, size, permission);
- return (IpcMemCreationFailed);
+ return IpcMemCreationFailed;
}
/* if (memKey == PrivateIPCKey) */
on_shmem_exit(IPCPrivateMemoryKill, (caddr_t) shmid);
- return (shmid);
+ return shmid;
}
/****************************************************************************/
@@ -585,10 +585,10 @@ IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size)
EPRINTF("IpcMemoryIdGet: shmget failed (%s) "
"key=%d, size=%d, permission=%o",
strerror(errno), memKey, size, 0);
- return (IpcMemIdGetFailed);
+ return IpcMemIdGetFailed;
}
- return (shmid);
+ return shmid;
}
/****************************************************************************/
@@ -625,13 +625,13 @@ IpcMemoryAttach(IpcMemoryId memId)
{
EPRINTF("IpcMemoryAttach: shmat failed (%s) id=%d",
strerror(errno), memId);
- return (IpcMemAttachFailed);
+ return IpcMemAttachFailed;
}
if (!UsePrivateMemory)
on_shmem_exit(IpcMemoryDetach, (caddr_t) memAddress);
- return ((char *) memAddress);
+ return (char *) memAddress;
}
@@ -729,7 +729,7 @@ AttachSLockMemory(IPCKey key)
bool
LockIsFree(int lockid)
{
- return (SLockArray[lockid].flag == NOLOCK);
+ return SLockArray[lockid].flag == NOLOCK;
}
#endif
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 330b5273164..f6ce9eda241 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.15 1998/06/27 15:47:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.16 1998/09/01 03:25:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@ SystemPortAddressCreateIPCKey(SystemPortAddress address)
{
Assert(address < 32768); /* XXX */
- return (SystemPortAddressGetIPCKey(address));
+ return SystemPortAddressGetIPCKey(address);
}
/*
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 4c74c836aef..f8f45aa4364 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.29 1998/07/27 19:38:10 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.30 1998/09/01 03:25:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -171,7 +171,7 @@ InitShmem(unsigned int key, unsigned int size)
if (sharedRegion == NULL)
{
elog(FATAL, "AttachSharedRegion: couldn't attach to shmem\n");
- return (FALSE);
+ return FALSE;
}
/* get pointers to the dimensions of shared memory */
@@ -195,7 +195,7 @@ InitShmem(unsigned int key, unsigned int size)
* allocator and shmem index.
*/
if (!InitSpinLocks(ShmemBootstrap, IPCKeyGetSpinLockSemaphoreKey(key)))
- return (FALSE);
+ return FALSE;
/*
* We have just allocated additional space for two spinlocks. Now
@@ -223,7 +223,7 @@ InitShmem(unsigned int key, unsigned int size)
if (!ShmemIndex)
{
elog(FATAL, "InitShmem: couldn't initialize Shmem Index");
- return (FALSE);
+ return FALSE;
}
/*
@@ -241,7 +241,7 @@ InitShmem(unsigned int key, unsigned int size)
if (!result)
{
elog(FATAL, "InitShmem: corrupted shmem index");
- return (FALSE);
+ return FALSE;
}
if (!found)
@@ -267,7 +267,7 @@ InitShmem(unsigned int key, unsigned int size)
Assert(result->location == MAKE_OFFSET(ShmemIndex->hctl));
- return (TRUE);
+ return TRUE;
}
/*
@@ -312,7 +312,7 @@ ShmemAlloc(unsigned long size)
if (!newSpace)
elog(NOTICE, "ShmemAlloc: out of memory ");
- return (newSpace);
+ return newSpace;
}
/*
@@ -323,7 +323,7 @@ ShmemAlloc(unsigned long size)
int
ShmemIsValid(unsigned long addr)
{
- return ((addr < ShmemEnd) && (addr >= ShmemBase));
+ return (addr < ShmemEnd) && (addr >= ShmemBase);
}
/*
@@ -366,7 +366,7 @@ ShmemInitHash(char *name, /* table string name for shmem index */
* message since they have more information
*/
if (location == NULL)
- return (0);
+ return 0;
/*
* it already exists, attach to it rather than allocate and initialize
@@ -381,7 +381,7 @@ ShmemInitHash(char *name, /* table string name for shmem index */
/* directory for hash lookup */
infoP->dir = (long *) (location + sizeof(HHDR));
- return (hash_create(init_size, infoP, hash_flags));;
+ return hash_create(init_size, infoP, hash_flags);;
}
/*
@@ -414,7 +414,7 @@ ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr)
SpinRelease(ShmemIndexLock);
elog(ERROR, "ShmemInitPID: ShmemIndex corrupted");
- return (FALSE);
+ return FALSE;
}
@@ -424,7 +424,7 @@ ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr)
result->location = *locationPtr;
SpinRelease(ShmemIndexLock);
- return (TRUE);
+ return TRUE;
}
/*
@@ -461,14 +461,14 @@ ShmemPIDDestroy(int pid)
{
elog(ERROR, "ShmemPIDDestroy: PID table corrupted");
- return (INVALID_OFFSET);
+ return INVALID_OFFSET;
}
if (found)
- return (location);
+ return location;
else
- return (INVALID_OFFSET);
+ return INVALID_OFFSET;
}
/*
@@ -516,14 +516,14 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
/* in POSTMASTER/Single process */
*foundPtr = FALSE;
- return ((long *) ShmemAlloc(size));
+ return (long *) ShmemAlloc(size);
}
else
{
Assert(ShmemIndexOffset);
*foundPtr = TRUE;
- return ((long *) MAKE_PTR(*ShmemIndexOffset));
+ return (long *) MAKE_PTR(*ShmemIndexOffset);
}
@@ -540,7 +540,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
SpinRelease(ShmemIndexLock);
elog(ERROR, "ShmemInitStruct: Shmem Index corrupted");
- return (NULL);
+ return NULL;
}
else if (*foundPtr)
@@ -556,7 +556,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
elog(NOTICE, "ShmemInitStruct: ShmemIndex entry size is wrong");
/* let caller print its message too */
- return (NULL);
+ return NULL;
}
structPtr = (long *) MAKE_PTR(result->location);
}
@@ -574,7 +574,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
elog(NOTICE, "ShmemInitStruct: cannot allocate '%s'",
name);
- return (NULL);
+ return NULL;
}
result->size = size;
result->location = MAKE_OFFSET(structPtr);
@@ -582,7 +582,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
Assert(ShmemIsValid((unsigned long) structPtr));
SpinRelease(ShmemIndexLock);
- return (structPtr);
+ return structPtr;
}
/*
@@ -607,7 +607,7 @@ TransactionIdIsInProgress(TransactionId xid)
if (result == (ShmemIndexEnt *) TRUE)
{
SpinRelease(ShmemIndexLock);
- return (false);
+ return false;
}
if (result->location == INVALID_OFFSET ||
strncmp(result->key, "PID ", 4) != 0)
@@ -616,13 +616,13 @@ TransactionIdIsInProgress(TransactionId xid)
if (proc->xid == xid)
{
SpinRelease(ShmemIndexLock);
- return (true);
+ return true;
}
}
SpinRelease(ShmemIndexLock);
elog(ERROR, "TransactionIdIsInProgress: ShmemIndex corrupted");
- return (false);
+ return false;
}
#ifdef LowLevelLocking
@@ -665,7 +665,7 @@ GetSnapshotData(bool serialized)
MyProc->xmin = snapshot->xmin;
SpinRelease(ShmemIndexLock);
snapshot->xip[count] = InvalidTransactionId;
- return (snapshot);
+ return snapshot;
}
if (result->location == INVALID_OFFSET ||
strncmp(result->key, "PID ", 4) != 0)
@@ -693,6 +693,6 @@ GetSnapshotData(bool serialized)
free(snapshot->xip);
free(snapshot);
elog(ERROR, "GetSnapshotData: ShmemIndex corrupted");
- return (NULL);
+ return NULL;
}
#endif
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index c3156fbb35b..95ebfd01360 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.7 1998/07/20 16:56:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.8 1998/09/01 03:25:13 momjian Exp $
*
* NOTES
*
@@ -54,7 +54,7 @@ bool
SHMQueueIsDetached(SHM_QUEUE *queue)
{
Assert(SHM_PTR_VALID(queue));
- return ((queue)->prev == INVALID_OFFSET);
+ return (queue)->prev == INVALID_OFFSET;
}
#endif
@@ -250,7 +250,7 @@ SHMQueueEmpty(SHM_QUEUE *queue)
if (queue->prev == MAKE_OFFSET(queue))
{
Assert(queue->next = MAKE_OFFSET(queue));
- return (TRUE);
+ return TRUE;
}
- return (FALSE);
+ return FALSE;
}
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 5ddaf3725b1..adfa1757d9b 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.13 1998/08/25 21:31:18 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.14 1998/09/01 03:25:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -170,7 +170,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
stateP->tag = backendTag;
- return (1 + stateP - &segInOutP->procState[0]);
+ return 1 + stateP - &segInOutP->procState[0];
}
@@ -232,7 +232,7 @@ SIComputeSize(int *segSize)
oP->startSegment = A;
oP->offsetToFirstEntry = a; /* relatiove to A */
oP->offsetToEndOfSegemnt = totalSize; /* relative to A */
- return (oP);
+ return oP;
}
@@ -251,7 +251,7 @@ SISetStartEntrySection(SISeg *segP, Offset offset)
static Offset
SIGetStartEntrySection(SISeg *segP)
{
- return (segP->startEntrySection);
+ return segP->startEntrySection;
}
@@ -279,7 +279,7 @@ SISetEndEntryChain(SISeg *segP, Offset offset)
static Offset
SIGetEndEntryChain(SISeg *segP)
{
- return (segP->endEntryChain);
+ return segP->endEntryChain;
}
/************************************************************************/
@@ -297,7 +297,7 @@ SISetStartEntryChain(SISeg *segP, Offset offset)
static Offset
SIGetStartEntryChain(SISeg *segP)
{
- return (segP->startEntryChain);
+ return segP->startEntryChain;
}
/************************************************************************/
@@ -309,11 +309,11 @@ SISetNumEntries(SISeg *segP, int num)
if (num <= MAXNUMMESSAGES)
{
segP->numEntries = num;
- return (true);
+ return true;
}
else
{
- return (false); /* table full */
+ return false; /* table full */
}
}
@@ -323,7 +323,7 @@ SISetNumEntries(SISeg *segP, int num)
static int
SIGetNumEntries(SISeg *segP)
{
- return (segP->numEntries);
+ return segP->numEntries;
}
@@ -336,11 +336,11 @@ SISetMaxNumEntries(SISeg *segP, int num)
if (num <= MAXNUMMESSAGES)
{
segP->maxNumEntries = num;
- return (true);
+ return true;
}
else
{
- return (false); /* wrong number */
+ return false; /* wrong number */
}
}
@@ -351,7 +351,7 @@ SISetMaxNumEntries(SISeg *segP, int num)
static int
SIGetProcStateLimit(SISeg *segP, int i)
{
- return (segP->procState[i].limit);
+ return segP->procState[i].limit;
}
/************************************************************************/
@@ -376,11 +376,11 @@ SIIncNumEntries(SISeg *segP, int num)
if ((segP->numEntries + num) <= MAXNUMMESSAGES)
{
segP->numEntries = segP->numEntries + num;
- return (true);
+ return true;
}
else
{
- return (false); /* table full */
+ return false; /* table full */
}
}
@@ -393,11 +393,11 @@ SIDecNumEntries(SISeg *segP, int num)
if ((segP->numEntries - num) >= 0)
{
segP->numEntries = segP->numEntries - num;
- return (true);
+ return true;
}
else
{
- return (false); /* not enough entries in table */
+ return false; /* not enough entries in table */
}
}
@@ -416,7 +416,7 @@ SISetStartFreeSpace(SISeg *segP, Offset offset)
static Offset
SIGetStartFreeSpace(SISeg *segP)
{
- return (segP->startFreeSpace);
+ return segP->startFreeSpace;
}
@@ -433,12 +433,12 @@ SIGetFirstDataEntry(SISeg *segP)
startChain = SIGetStartEntryChain(segP);
if (startChain == InvalidOffset)
- return (NULL);
+ return NULL;
eP = (SISegEntry *) ((Pointer) segP +
SIGetStartEntrySection(segP) +
startChain);
- return (eP);
+ return eP;
}
@@ -454,12 +454,12 @@ SIGetLastDataEntry(SISeg *segP)
endChain = SIGetEndEntryChain(segP);
if (endChain == InvalidOffset)
- return (NULL);
+ return NULL;
eP = (SISegEntry *) ((Pointer) segP +
SIGetStartEntrySection(segP) +
endChain);
- return (eP);
+ return eP;
}
/************************************************************************/
@@ -471,12 +471,12 @@ SIGetNextDataEntry(SISeg *segP, Offset offset)
SISegEntry *eP;
if (offset == InvalidOffset)
- return (NULL);
+ return NULL;
eP = (SISegEntry *) ((Pointer) segP +
SIGetStartEntrySection(segP) +
offset);
- return (eP);
+ return eP;
}
@@ -491,7 +491,7 @@ SIGetNthDataEntry(SISeg *segP,
int i;
if (n <= 0)
- return (NULL);
+ return NULL;
eP = SIGetFirstDataEntry(segP);
for (i = 1; i < n; i++)
@@ -500,7 +500,7 @@ SIGetNthDataEntry(SISeg *segP,
eP = SIGetNextDataEntry(segP, eP->next);
}
- return (eP);
+ return eP;
}
/************************************************************************/
@@ -527,7 +527,7 @@ SISetDataEntry(SISeg *segP, SharedInvalidData *data)
*lastP;
if (!SIIncNumEntries(segP, 1))
- return (false); /* no space */
+ return false; /* no space */
/* get a free entry */
offsetToNewData = SIGetStartFreeSpace(segP);
@@ -551,7 +551,7 @@ SISetDataEntry(SISeg *segP, SharedInvalidData *data)
lastP->next = SIEntryOffset(segP, eP);
}
SISetEndEntryChain(segP, SIEntryOffset(segP, eP));
- return (true);
+ return true;
}
@@ -591,7 +591,7 @@ SIDelDataEntry(SISeg *segP)
if (!SIDecNumEntries(segP, 1))
{
/* no entries in buffer */
- return (false);
+ return false;
}
e1P = SIGetFirstDataEntry(segP);
@@ -606,7 +606,7 @@ SIDelDataEntry(SISeg *segP)
e1P->next = SIGetStartFreeSpace(segP);
SISetStartFreeSpace(segP, SIEntryOffset(segP, e1P));
SIDecProcLimit(segP, 1);
- return (true);
+ return true;
}
@@ -794,7 +794,7 @@ SISegmentGet(int key, /* the corresponding key for the segment */
shmid = IpcMemoryCreate(key, size, IPCProtection);
else
shmid = IpcMemoryIdGet(key, size);
- return (shmid);
+ return shmid;
}
/************************************************************************/
@@ -844,7 +844,7 @@ SISegmentInit(bool killExistingSegment, IPCKey key)
if (shmId < 0)
{
perror("SISegmentGet: failed");
- return (-1); /* an error */
+ return -1; /* an error */
}
/* Attach the shared cache invalidation segment */
@@ -862,10 +862,10 @@ SISegmentInit(bool killExistingSegment, IPCKey key)
if (shmId < 0)
{
perror("SISegmentGet: getting an existent segment failed");
- return (-1); /* an error */
+ return -1; /* an error */
}
/* Attach the shared cache invalidation segment */
SISegmentAttach(shmId);
}
- return (1);
+ return 1;
}
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 7f8986e411a..398815fe188 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.15 1998/08/25 21:34:03 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.16 1998/09/01 03:25:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,7 @@ bool
CreateSpinlocks(IPCKey key)
{
/* the spin lock shared memory must have been created by now */
- return (TRUE);
+ return TRUE;
}
bool
@@ -78,7 +78,7 @@ InitSpinLocks(int init, IPCKey key)
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
#endif
- return (TRUE);
+ return TRUE;
}
#ifdef LOCKDEBUG
@@ -217,7 +217,7 @@ SpinIsLocked(SPINLOCK lock)
int semval;
semval = IpcSemaphoreGetValue(SpinLockId, lock);
- return (semval < IpcSemaphoreDefaultStartValue);
+ return semval < IpcSemaphoreDefaultStartValue;
}
/*
@@ -245,11 +245,11 @@ CreateSpinlocks(IPCKey key)
if (semid >= 0)
{
SpinLockId = semid;
- return (TRUE);
+ return TRUE;
}
/* cannot create spinlocks */
elog(FATAL, "CreateSpinlocks: cannot create spin locks");
- return (FALSE);
+ return FALSE;
}
/*
@@ -270,10 +270,10 @@ AttachSpinLocks(IPCKey key)
}
/* cannot create spinlocks */
elog(FATAL, "AttachSpinlocks: cannot create spin locks");
- return (FALSE);
+ return FALSE;
}
SpinLockId = id;
- return (TRUE);
+ return TRUE;
}
/*
@@ -314,7 +314,7 @@ InitSpinLocks(int init, IPCKey key)
if (!AttachSpinLocks(key))
{
elog(FATAL, "InitSpinLocks: couldnt attach spin locks");
- return (FALSE);
+ return FALSE;
}
}
@@ -331,7 +331,7 @@ InitSpinLocks(int init, IPCKey key)
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
#endif
- return (TRUE);
+ return TRUE;
}
#endif /* HAS_TEST_AND_SET */
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 392fe5b0985..91f3f9e21f8 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.36 1998/08/27 01:04:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.37 1998/09/01 03:25:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -197,8 +197,8 @@ inv_create(int flags)
retval->heap_r = r;
retval->index_r = indr;
retval->iscan = (IndexScanDesc) NULL;
- retval->hdesc = RelationGetTupleDescriptor(r);
- retval->idesc = RelationGetTupleDescriptor(indr);
+ retval->hdesc = RelationGetDescr(r);
+ retval->idesc = RelationGetDescr(indr);
retval->offset = retval->lowbyte =
retval->highbyte = 0;
ItemPointerSetInvalid(&(retval->htid));
@@ -215,7 +215,7 @@ inv_create(int flags)
}
retval->flags |= IFS_ATEOF;
- return (retval);
+ return retval;
}
LargeObjectDesc *
@@ -229,7 +229,7 @@ inv_open(Oid lobjId, int flags)
r = heap_open(lobjId);
if (!RelationIsValid(r))
- return ((LargeObjectDesc *) NULL);
+ return (LargeObjectDesc *) NULL;
indname = pstrdup((r->rd_rel->relname).data);
@@ -242,15 +242,15 @@ inv_open(Oid lobjId, int flags)
indrel = index_openr(indname);
if (!RelationIsValid(indrel))
- return ((LargeObjectDesc *) NULL);
+ return (LargeObjectDesc *) NULL;
retval = (LargeObjectDesc *) palloc(sizeof(LargeObjectDesc));
retval->heap_r = r;
retval->index_r = indrel;
retval->iscan = (IndexScanDesc) NULL;
- retval->hdesc = RelationGetTupleDescriptor(r);
- retval->idesc = RelationGetTupleDescriptor(indrel);
+ retval->hdesc = RelationGetDescr(r);
+ retval->idesc = RelationGetDescr(indrel);
retval->offset = retval->lowbyte = retval->highbyte = 0;
ItemPointerSetInvalid(&(retval->htid));
@@ -265,7 +265,7 @@ inv_open(Oid lobjId, int flags)
retval->flags = IFS_RDLOCK;
}
- return (retval);
+ return retval;
}
/*
@@ -348,7 +348,7 @@ inv_stat(LargeObjectDesc *obj_desc, struct pgstat * stbuf)
/* we have no good way of computing access times right now */
stbuf->st_atime_s = stbuf->st_mtime_s = stbuf->st_ctime_s = 0;
- return (0);
+ return 0;
}
#endif
@@ -365,7 +365,7 @@ inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
if (whence == SEEK_CUR)
{
offset += obj_desc->offset; /* calculate absolute position */
- return (inv_seek(obj_desc, offset, SEEK_SET));
+ return inv_seek(obj_desc, offset, SEEK_SET);
}
/*
@@ -383,7 +383,7 @@ inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
offset += _inv_getsize(obj_desc->heap_r,
obj_desc->hdesc,
obj_desc->index_r);
- return (inv_seek(obj_desc, offset, SEEK_SET));
+ return inv_seek(obj_desc, offset, SEEK_SET);
}
/*
@@ -400,7 +400,7 @@ inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
&& offset <= obj_desc->highbyte
&& oldOffset <= obj_desc->highbyte
&& obj_desc->iscan != (IndexScanDesc) NULL)
- return (offset);
+ return offset;
/*
* To do a seek on an inversion file, we start an index scan that will
@@ -427,7 +427,7 @@ inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
&skey);
}
- return (offset);
+ return offset;
}
int
@@ -435,7 +435,7 @@ inv_tell(LargeObjectDesc *obj_desc)
{
Assert(PointerIsValid(obj_desc));
- return (obj_desc->offset);
+ return obj_desc->offset;
}
int
@@ -454,7 +454,7 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
/* if we're already at EOF, we don't need to do any work here */
if (obj_desc->flags & IFS_ATEOF)
- return (0);
+ return 0;
/* make sure we obey two-phase locking */
if (!(obj_desc->flags & IFS_RDLOCK))
@@ -497,7 +497,7 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
obj_desc->offset += ncopy;
}
- return (nread);
+ return nread;
}
int
@@ -560,7 +560,7 @@ inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes)
}
/* that's it */
- return (nwritten);
+ return nwritten;
}
/*
@@ -650,7 +650,7 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *buffer)
if (res == (RetrieveIndexResult) NULL)
{
ItemPointerSetInvalid(&(obj_desc->htid));
- return ((HeapTuple) NULL);
+ return (HeapTuple) NULL;
}
/*
@@ -791,7 +791,7 @@ inv_wrnew(LargeObjectDesc *obj_desc, char *buf, int nbytes)
/* new tuple is inserted */
WriteBuffer(buffer);
- return (nwritten);
+ return nwritten;
}
static int
@@ -836,7 +836,7 @@ inv_wrold(LargeObjectDesc *obj_desc,
&& obj_desc->lowbyte + nbytes >= obj_desc->highbyte)
{
WriteBuffer(buffer);
- return (inv_wrnew(obj_desc, dbuf, nbytes));
+ return inv_wrnew(obj_desc, dbuf, nbytes);
}
/*
@@ -974,7 +974,7 @@ inv_wrold(LargeObjectDesc *obj_desc,
WriteBuffer(newbuf);
/* done */
- return (nwritten);
+ return nwritten;
}
static HeapTuple
@@ -1092,7 +1092,7 @@ inv_newtuple(LargeObjectDesc *obj_desc,
obj_desc->highbyte = obj_desc->offset + nwrite - 1;
/* new tuple is filled -- return it */
- return (ntup);
+ return ntup;
}
static void
@@ -1199,7 +1199,7 @@ ItemPointerFormExternal(ItemPointer pointer)
ItemPointerGetOffsetNumber(pointer));
}
- return (itemPointerString);
+ return itemPointerString;
}
*/
@@ -1230,7 +1230,7 @@ _inv_getsize(Relation hreln, TupleDesc hdesc, Relation ireln)
{
index_endscan(iscan);
pfree(iscan);
- return (0);
+ return 0;
}
/*
@@ -1251,5 +1251,5 @@ _inv_getsize(Relation hreln, TupleDesc hdesc, Relation ireln)
size = DatumGetInt32(d) + 1;
ReleaseBuffer(buffer);
- return (size);
+ return size;
}
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 52ddd635832..2456b2a6683 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.34 1998/08/28 12:08:03 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.35 1998/09/01 03:25:19 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -275,7 +275,7 @@ LockMethodTableInit(char *tabName,
{
elog(NOTICE, "LockMethodTableInit: too many lock types %d greater than %d",
numModes, MAX_LOCKMODES);
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
}
/* allocate a string for the shmem index table lookup */
@@ -283,7 +283,7 @@ LockMethodTableInit(char *tabName,
if (!shmemName)
{
elog(NOTICE, "LockMethodTableInit: couldn't malloc string %s \n", tabName);
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
}
/* each lock table has a non-shared header */
@@ -292,7 +292,7 @@ LockMethodTableInit(char *tabName,
{
elog(NOTICE, "LockMethodTableInit: couldn't malloc lock table %s\n", tabName);
pfree(shmemName);
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
}
/* ------------------------
@@ -393,9 +393,9 @@ LockMethodTableInit(char *tabName,
pfree(shmemName);
if (status)
- return (lockMethodTable->ctl->lockmethod);
+ return lockMethodTable->ctl->lockmethod;
else
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
}
/*
@@ -417,16 +417,16 @@ LockMethodTableRename(LOCKMETHOD lockmethod)
LOCKMETHOD newLockMethod;
if (NumLockMethods >= MAX_LOCK_METHODS)
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
if (LockMethodTable[lockmethod] == INVALID_LOCKMETHOD)
- return (INVALID_LOCKMETHOD);
+ return INVALID_LOCKMETHOD;
/* other modules refer to the lock table by a lockmethod */
newLockMethod = NumLockMethods;
NumLockMethods++;
LockMethodTable[newLockMethod] = LockMethodTable[lockmethod];
- return (newLockMethod);
+ return newLockMethod;
}
/*
@@ -522,11 +522,11 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
if (!lockMethodTable)
{
elog(NOTICE, "LockAcquire: bad lock table %d", lockmethod);
- return (FALSE);
+ return FALSE;
}
if (LockingIsDisabled)
- return (TRUE);
+ return TRUE;
masterLock = lockMethodTable->ctl->masterLock;
@@ -542,7 +542,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
{
SpinRelease(masterLock);
elog(FATAL, "LockAcquire: lock table %d is corrupted", lockmethod);
- return (FALSE);
+ return FALSE;
}
/* --------------------
@@ -606,7 +606,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
if (!result)
{
elog(NOTICE, "LockAcquire: xid table corrupted");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
/*
@@ -649,7 +649,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
Assert((result->nHolding > 0) && (result->holders[lockmode] > 0));
GrantLock(lock, lockmode);
SpinRelease(masterLock);
- return (TRUE);
+ return TRUE;
}
status = LockResolveConflicts(lockmethod, lock, lockmode, xid, result);
@@ -682,7 +682,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
Assert((lock->nHolding > 0) && (lock->holders[lockmode] >= 0));
Assert(lock->nActive <= lock->nHolding);
SpinRelease(masterLock);
- return (FALSE);
+ return FALSE;
}
#endif
status = WaitOnLock(lockmethod, lock, lockmode, xid);
@@ -694,7 +694,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
XID_PRINT_AUX("LockAcquire: INCONSISTENT ", result);
LOCK_PRINT_AUX("LockAcquire: INCONSISTENT ", lock, lockmode);
/* Should we retry ? */
- return (FALSE);
+ return FALSE;
}
XID_PRINT("LockAcquire: granted", result);
LOCK_PRINT("LockAcquire: granted", lock, lockmode);
@@ -702,7 +702,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
SpinRelease(masterLock);
- return (status == STATUS_OK);
+ return status == STATUS_OK;
}
/* ----------------------------
@@ -784,7 +784,7 @@ LockResolveConflicts(LOCKMETHOD lockmethod,
if (!result)
{
elog(NOTICE, "LockResolveConflicts: xid table corrupted");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
/*
@@ -845,7 +845,7 @@ LockResolveConflicts(LOCKMETHOD lockmethod,
result->nHolding++;
XID_PRINT("LockResolveConflicts: no conflict", result);
Assert((result->nHolding > 0) && (result->holders[lockmode] > 0));
- return (STATUS_OK);
+ return STATUS_OK;
}
/* ------------------------
@@ -877,11 +877,11 @@ LockResolveConflicts(LOCKMETHOD lockmethod,
result->nHolding++;
XID_PRINT("LockResolveConflicts: resolved", result);
Assert((result->nHolding > 0) && (result->holders[lockmode] > 0));
- return (STATUS_OK);
+ return STATUS_OK;
}
XID_PRINT("LockResolveConflicts: conflicting", result);
- return (STATUS_FOUND);
+ return STATUS_FOUND;
}
/*
@@ -951,7 +951,7 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode,
PS_SET_STATUS(old_status);
LOCK_PRINT_AUX("WaitOnLock: wakeup on lock", lock, lockmode);
- return (STATUS_OK);
+ return STATUS_OK;
}
/*
@@ -1007,11 +1007,11 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
if (!lockMethodTable)
{
elog(NOTICE, "lockMethodTable is null in LockRelease");
- return (FALSE);
+ return FALSE;
}
if (LockingIsDisabled)
- return (TRUE);
+ return TRUE;
masterLock = lockMethodTable->ctl->masterLock;
SpinAcquire(masterLock);
@@ -1030,7 +1030,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
{
SpinRelease(masterLock);
elog(NOTICE, "LockRelease: locktable corrupted");
- return (FALSE);
+ return FALSE;
}
if (!found)
@@ -1039,11 +1039,11 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
#ifdef USER_LOCKS
if (is_user_lock) {
TPRINTF(TRACE_USERLOCKS, "LockRelease: no lock with this tag");
- return (FALSE);
+ return FALSE;
}
#endif
elog(NOTICE, "LockRelease: locktable lookup failed, no lock");
- return (FALSE);
+ return FALSE;
}
LOCK_PRINT("LockRelease: found", lock, lockmode);
Assert((lock->nHolding > 0) && (lock->holders[lockmode] >= 0));
@@ -1089,7 +1089,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
} else
#endif
elog(NOTICE, "LockReplace: xid table corrupted");
- return (FALSE);
+ return FALSE;
}
XID_PRINT("LockRelease: found", result);
Assert(result->tag.lock == MAKE_OFFSET(lock));
@@ -1104,7 +1104,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
elog(NOTICE, "LockRelease: you don't own a lock of type %s",
lock_types[lockmode]);
Assert(result->holders[lockmode] >= 0);
- return (FALSE);
+ return FALSE;
}
Assert(result->nHolding > 0);
@@ -1184,7 +1184,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
{
SpinRelease(masterLock);
elog(NOTICE, "LockRelease: remove xid, table corrupted");
- return (FALSE);
+ return FALSE;
}
}
@@ -1204,7 +1204,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode)
}
SpinRelease(masterLock);
- return (TRUE);
+ return TRUE;
}
/*
@@ -1247,7 +1247,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue)
lockMethodTable = LockMethodTable[lockmethod];
if (!lockMethodTable) {
elog(NOTICE, "LockAcquire: bad lockmethod %d", lockmethod);
- return (FALSE);
+ return FALSE;
}
if (SHMQueueEmpty(lockQueue))
@@ -1406,7 +1406,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue)
{
SpinRelease(masterLock);
elog(NOTICE, "LockReleaseAll: xid table corrupted");
- return (FALSE);
+ return FALSE;
}
if (!lock->nHolding)
@@ -1425,7 +1425,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue)
{
SpinRelease(masterLock);
elog(NOTICE, "LockReleaseAll: cannot remove lock from HTAB");
- return (FALSE);
+ return FALSE;
}
}
else
@@ -1736,12 +1736,12 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
if (!lockMethodTable)
{
elog(NOTICE, "lockMethodTable is null in LockOwners");
- return ((ArrayType *) &empty_array);
+ return (ArrayType *) &empty_array;
}
if (LockingIsDisabled)
{
- return ((ArrayType *) &empty_array);
+ return (ArrayType *) &empty_array;
}
masterLock = lockMethodTable->ctl->masterLock;
@@ -1761,7 +1761,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
{
SpinRelease(masterLock);
elog(NOTICE, "LockOwners: locktable corrupted");
- return ((ArrayType *) &empty_array);
+ return (ArrayType *) &empty_array;
}
if (!found)
@@ -1770,11 +1770,11 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
#ifdef USER_LOCKS
if (is_user_lock) {
TPRINTF(TRACE_USERLOCKS, "LockOwners: no lock with this tag");
- return ((ArrayType *) &empty_array);
+ return (ArrayType *) &empty_array;
}
#endif
elog(NOTICE, "LockOwners: locktable lookup failed, no lock");
- return ((ArrayType *) &empty_array);
+ return (ArrayType *) &empty_array;
}
LOCK_PRINT("LockOwners: found", lock, 0);
Assert((lock->nHolding > 0) && (lock->nActive > 0));
@@ -1864,7 +1864,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
memmove((char *) array, (char *) &size, sizeof(int));
memmove((char *) ARR_DIMS(array), (char *) hbounds, ndims * sizeof(int));
- return (array);
+ return array;
}
#ifdef DEADLOCK_DEBUG
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 3887a8e37d1..01d1a0f5fe1 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.23 1998/08/25 21:20:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.24 1998/09/01 03:25:23 momjian Exp $
*
* NOTES:
* (1) The lock.c module assumes that the caller here is doing
@@ -188,7 +188,7 @@ MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode)
MemSet(&tag, 0, sizeof(tag));
tag.relId = lockinfo->lockRelId.relId;
tag.dbId = lockinfo->lockRelId.dbId;
- return (MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL));
+ return MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL);
}
/*
@@ -215,7 +215,7 @@ MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
/* not locking any valid Tuple, just the page */
tag.tupleId = *tidPtr;
- return (MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL));
+ return MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL);
}
/*
@@ -245,7 +245,7 @@ MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
tag.relId = lockinfo->lockRelId.relId;
tag.dbId = lockinfo->lockRelId.dbId;
BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid));
- return (MultiAcquire(MultiTableId, &tag, lockmode, PAGE_LEVEL));
+ return MultiAcquire(MultiTableId, &tag, lockmode, PAGE_LEVEL);
}
/*
@@ -295,7 +295,7 @@ MultiAcquire(LOCKMETHOD lockmethod,
break;
default:
elog(ERROR, "MultiAcquire: bad lock level");
- return (FALSE);
+ return FALSE;
}
/*
@@ -357,7 +357,7 @@ MultiAcquire(LOCKMETHOD lockmethod,
}
}
}
- return (retStatus);
+ return retStatus;
}
/* ------------------
@@ -382,7 +382,7 @@ MultiReleasePage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
tag.dbId = lockinfo->lockRelId.dbId;
BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid));
- return (MultiRelease(MultiTableId, &tag, lockmode, PAGE_LEVEL));
+ return MultiRelease(MultiTableId, &tag, lockmode, PAGE_LEVEL);
}
#endif
@@ -406,7 +406,7 @@ MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode)
tag.relId = lockinfo->lockRelId.relId;
tag.dbId = lockinfo->lockRelId.dbId;
- return (MultiRelease(MultiTableId, &tag, lockmode, RELN_LEVEL));
+ return MultiRelease(MultiTableId, &tag, lockmode, RELN_LEVEL);
}
/*
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 4cd9602a8b5..3fc24260315 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.41 1998/08/25 21:20:29 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.42 1998/09/01 03:25:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.41 1998/08/25 21:20:29 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.42 1998/09/01 03:25:24 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -312,7 +312,7 @@ ProcRemove(int pid)
location = ShmemPIDDestroy(pid);
if (location == INVALID_OFFSET)
- return (FALSE);
+ return FALSE;
proc = (PROC *) MAKE_PTR(location);
SpinAcquire(ProcStructLock);
@@ -324,7 +324,7 @@ ProcRemove(int pid)
SpinRelease(ProcStructLock);
- return (TRUE);
+ return TRUE;
}
/*
@@ -407,10 +407,10 @@ ProcQueueAlloc(char *name)
ShmemInitStruct(name, (unsigned) sizeof(PROC_QUEUE), &found);
if (!queue)
- return (NULL);
+ return NULL;
if (!found)
ProcQueueInit(queue);
- return (queue);
+ return queue;
}
#endif
@@ -564,7 +564,7 @@ ProcSleep(PROC_QUEUE *waitQueue, /* lock->waitProcs */
MyProc->waitLock = (LOCK *)NULL;
#endif
- return (MyProc->errType);
+ return MyProc->errType;
}
@@ -583,7 +583,7 @@ ProcWakeup(PROC *proc, int errType)
if (proc->links.prev == INVALID_OFFSET ||
proc->links.next == INVALID_OFFSET)
- return ((PROC *) NULL);
+ return (PROC *) NULL;
retProc = (PROC *) MAKE_PTR(proc->links.prev);
@@ -614,7 +614,7 @@ ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock)
Assert(queue->size >= 0);
if (!queue->size)
- return (STATUS_NOT_FOUND);
+ return STATUS_NOT_FOUND;
proc = (PROC *) MAKE_PTR(queue->links.prev);
count = 0;
@@ -662,7 +662,7 @@ ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock)
Assert(queue->size >= 0);
if (count)
- return (STATUS_OK);
+ return STATUS_OK;
else {
/* Something is still blocking us. May have deadlocked. */
trace_flag = (lock->tag.lockmethod == USER_LOCKMETHOD) ? \
@@ -674,7 +674,7 @@ ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock)
if (pg_options[trace_flag] >= 2)
DumpAllLocks();
#endif
- return (STATUS_NOT_FOUND);
+ return STATUS_NOT_FOUND;
}
}
diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c
index 7d1876640d9..faf6a576df3 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.8 1998/07/13 16:34:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.9 1998/09/01 03:25:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,9 +47,9 @@ SingleLockReln(LockInfo lockinfo, LOCKMODE lockmode, int action)
tag.tupleId.ip_posid = InvalidOffsetNumber;
if (action == UNLOCK)
- return (LockRelease(MultiTableId, &tag, lockmode));
+ return LockRelease(MultiTableId, &tag, lockmode);
else
- return (LockAcquire(MultiTableId, &tag, lockmode));
+ return LockAcquire(MultiTableId, &tag, lockmode);
}
/*
@@ -80,7 +80,7 @@ SingleLockPage(LockInfo lockinfo,
if (action == UNLOCK)
- return (LockRelease(MultiTableId, &tag, lockmode));
+ return LockRelease(MultiTableId, &tag, lockmode);
else
- return (LockAcquire(MultiTableId, &tag, lockmode));
+ return LockAcquire(MultiTableId, &tag, lockmode);
}
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index e330cc05973..bd90d7a29d8 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.18 1998/06/15 19:29:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.19 1998/09/01 03:25:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -133,7 +133,7 @@ PageAddItem(Page page,
((*itemId).lp_len != 0))
{
elog(ERROR, "PageAddItem: tried overwrite of used ItemId");
- return (InvalidOffsetNumber);
+ return InvalidOffsetNumber;
}
}
}
@@ -161,7 +161,7 @@ PageAddItem(Page page,
upper = ((PageHeader) page)->pd_upper - alignedSize;
if (lower > upper)
- return (InvalidOffsetNumber);
+ return InvalidOffsetNumber;
itemId = &((PageHeader) page)->pd_linp[offsetNumber - 1];
(*itemId).lp_off = upper;
@@ -171,7 +171,7 @@ PageAddItem(Page page,
((PageHeader) page)->pd_lower = lower;
((PageHeader) page)->pd_upper = upper;
- return (offsetNumber);
+ return offsetNumber;
}
/*
@@ -204,7 +204,7 @@ PageGetTempPage(Page page, Size specialSize)
thdr->pd_lower = sizeof(PageHeaderData) - sizeof(ItemIdData);
thdr->pd_upper = pageSize - DOUBLEALIGN(specialSize);
- return (temp);
+ return temp;
}
/*
@@ -238,12 +238,12 @@ itemidcompare(const void *itemidp1, const void *itemidp2)
{
if (((struct itemIdSortData *) itemidp1)->itemiddata.lp_off ==
((struct itemIdSortData *) itemidp2)->itemiddata.lp_off)
- return (0);
+ return 0;
else if (((struct itemIdSortData *) itemidp1)->itemiddata.lp_off <
((struct itemIdSortData *) itemidp2)->itemiddata.lp_off)
- return (1);
+ return 1;
else
- return (-1);
+ return -1;
}
/*
@@ -340,10 +340,10 @@ PageGetFreeSpace(Page page)
space = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower;
if (space < sizeof(ItemIdData))
- return (0);
+ return 0;
space -= sizeof(ItemIdData);/* XXX not always true */
- return (space);
+ return space;
}
/*
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index 25daebab23c..f967566a49f 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.3 1997/09/07 04:49:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.4 1998/09/01 03:25:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@ ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2)
ItemPointerGetBlockNumber(pointer2) &&
ItemPointerGetOffsetNumber(pointer1) ==
ItemPointerGetOffsetNumber(pointer2))
- return (true);
+ return true;
else
- return (false);
+ return false;
}
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index c753b583d85..fb421636215 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.37 1998/08/24 01:13:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.38 1998/09/01 03:25:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -109,14 +109,14 @@ mdinit()
MdCxt = (MemoryContext) CreateGlobalMemory("MdSmgr");
if (MdCxt == (MemoryContext) NULL)
- return (SM_FAIL);
+ return SM_FAIL;
oldcxt = MemoryContextSwitchTo(MdCxt);
Md_fdvec = (MdfdVec *) palloc(Nfds * sizeof(MdfdVec));
MemoryContextSwitchTo(oldcxt);
if (Md_fdvec == (MdfdVec *) NULL)
- return (SM_FAIL);
+ return SM_FAIL;
MemSet(Md_fdvec, 0, Nfds * sizeof(MdfdVec));
@@ -129,7 +129,7 @@ mdinit()
Md_Free = 0;
Md_fdvec[Nfds - 1].mdfd_nextFree = -1;
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
int
@@ -156,15 +156,15 @@ mdcreate(Relation reln)
if (fd < 0)
{
if (!IsBootstrapProcessingMode())
- return (-1);
+ return -1;
fd = FileNameOpenFile(path, O_RDWR, 0600); /* Bootstrap */
if (fd < 0)
- return (-1);
+ return -1;
}
vfd = _fdvec_alloc();
if (vfd < 0)
- return (-1);
+ return -1;
Md_fdvec[vfd].mdfd_vfd = fd;
Md_fdvec[vfd].mdfd_flags = (uint16) 0;
@@ -173,7 +173,7 @@ mdcreate(Relation reln)
#endif
Md_fdvec[vfd].mdfd_lstbcnt = 0;
- return (vfd);
+ return vfd;
}
/*
@@ -199,7 +199,7 @@ mdunlink(Relation reln)
StrNCpy(fname, RelationGetRelationName(reln)->data, NAMEDATALEN);
if (FileNameUnlink(fname) < 0)
- return (SM_FAIL);
+ return SM_FAIL;
/* unlink all the overflow files for large relations */
for (i = 1;; i++)
@@ -233,7 +233,7 @@ mdunlink(Relation reln)
_fdvec_free(fd);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -253,10 +253,10 @@ mdextend(Relation reln, char *buffer)
v = _mdfd_getseg(reln, nblocks, O_CREAT);
if ((pos = FileSeek(v->mdfd_vfd, 0L, SEEK_END)) < 0)
- return (SM_FAIL);
+ return SM_FAIL;
if (FileWrite(v->mdfd_vfd, buffer, BLCKSZ) != BLCKSZ)
- return (SM_FAIL);
+ return SM_FAIL;
/* remember that we did a write, so we can sync at xact commit */
v->mdfd_flags |= MDFD_DIRTY;
@@ -275,7 +275,7 @@ mdextend(Relation reln, char *buffer)
v->mdfd_lstbcnt = ++nblocks;
#endif
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -298,7 +298,7 @@ mdopen(Relation reln)
vfd = _fdvec_alloc();
if (vfd < 0)
- return (-1);
+ return -1;
Md_fdvec[vfd].mdfd_vfd = fd;
Md_fdvec[vfd].mdfd_flags = (uint16) 0;
@@ -312,7 +312,7 @@ mdopen(Relation reln)
#endif
#endif
- return (vfd);
+ return vfd;
}
/*
@@ -384,7 +384,7 @@ mdclose(Relation reln)
_fdvec_free(fd);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -414,7 +414,7 @@ mdread(Relation reln, BlockNumber blocknum, char *buffer)
#endif
if (FileSeek(v->mdfd_vfd, seekpos, SEEK_SET) != seekpos)
- return (SM_FAIL);
+ return SM_FAIL;
status = SM_SUCCESS;
if ((nbytes = FileRead(v->mdfd_vfd, buffer, BLCKSZ)) != BLCKSZ)
@@ -425,7 +425,7 @@ mdread(Relation reln, BlockNumber blocknum, char *buffer)
status = SM_FAIL;
}
- return (status);
+ return status;
}
/*
@@ -453,7 +453,7 @@ mdwrite(Relation reln, BlockNumber blocknum, char *buffer)
#endif
if (FileSeek(v->mdfd_vfd, seekpos, SEEK_SET) != seekpos)
- return (SM_FAIL);
+ return SM_FAIL;
status = SM_SUCCESS;
if (FileWrite(v->mdfd_vfd, buffer, BLCKSZ) != BLCKSZ)
@@ -461,7 +461,7 @@ mdwrite(Relation reln, BlockNumber blocknum, char *buffer)
v->mdfd_flags |= MDFD_DIRTY;
- return (status);
+ return status;
}
/*
@@ -490,7 +490,7 @@ mdflush(Relation reln, BlockNumber blocknum, char *buffer)
#endif
if (FileSeek(v->mdfd_vfd, seekpos, SEEK_SET) != seekpos)
- return (SM_FAIL);
+ return SM_FAIL;
/* write and sync the block */
status = SM_SUCCESS;
@@ -506,7 +506,7 @@ mdflush(Relation reln, BlockNumber blocknum, char *buffer)
v->mdfd_flags &= ~MDFD_DIRTY;
- return (status);
+ return status;
}
/*
@@ -623,7 +623,7 @@ mdblindwrt(char *dbstr,
#endif
if ((fd = open(path, O_RDWR, 0600)) < 0)
- return (SM_FAIL);
+ return SM_FAIL;
/* seek to the right spot */
#ifndef LET_OS_MANAGE_FILESIZE
@@ -635,7 +635,7 @@ mdblindwrt(char *dbstr,
if (lseek(fd, seekpos, SEEK_SET) != seekpos)
{
close(fd);
- return (SM_FAIL);
+ return SM_FAIL;
}
status = SM_SUCCESS;
@@ -649,7 +649,7 @@ mdblindwrt(char *dbstr,
pfree(path);
- return (status);
+ return status;
}
/*
@@ -695,10 +695,10 @@ mdnblocks(Relation reln)
v = v->mdfd_chain;
}
else
- return ((segno * RELSEG_SIZE) + nblocks);
+ return (segno * RELSEG_SIZE) + nblocks;
}
#else
- return (_mdnblocks(v->mdfd_vfd, BLCKSZ));
+ return _mdnblocks(v->mdfd_vfd, BLCKSZ);
#endif
}
@@ -721,7 +721,7 @@ mdtruncate(Relation reln, int nblocks)
{
elog(NOTICE, "Can't truncate multi-segments relation %s",
reln->rd_rel->relname.data);
- return (curnblk);
+ return curnblk;
}
#endif
@@ -729,9 +729,9 @@ mdtruncate(Relation reln, int nblocks)
v = &Md_fdvec[fd];
if (FileTruncate(v->mdfd_vfd, nblocks * BLCKSZ) < 0)
- return (-1);
+ return -1;
- return (nblocks);
+ return nblocks;
} /* mdtruncate */
@@ -763,14 +763,14 @@ mdcommit()
if (v->mdfd_flags & MDFD_DIRTY)
{
if (FileSync(v->mdfd_vfd) < 0)
- return (SM_FAIL);
+ return SM_FAIL;
v->mdfd_flags &= ~MDFD_DIRTY;
}
}
}
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -796,7 +796,7 @@ mdabort()
v->mdfd_flags &= ~MDFD_DIRTY;
}
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -823,7 +823,7 @@ _fdvec_alloc()
Assert(fdvec == CurFd);
CurFd++;
}
- return (fdvec);
+ return fdvec;
}
/* Must allocate more room */
@@ -857,7 +857,7 @@ _fdvec_alloc()
CurFd++;
Md_fdvec[fdvec].mdfd_flags = 0;
- return (fdvec);
+ return fdvec;
}
/*
@@ -906,7 +906,7 @@ _mdfd_openseg(Relation reln, int segno, int oflags)
pfree(fullpath);
if (fd < 0)
- return ((MdfdVec *) NULL);
+ return (MdfdVec *) NULL;
/* allocate an mdfdvec entry for it */
oldcxt = MemoryContextSwitchTo(MdCxt);
@@ -927,7 +927,7 @@ _mdfd_openseg(Relation reln, int segno, int oflags)
#endif
/* all done */
- return (v);
+ return v;
}
static MdfdVec *
@@ -967,7 +967,7 @@ _mdfd_getseg(Relation reln, int blkno, int oflag)
v = &Md_fdvec[fd];
#endif
- return (v);
+ return v;
}
static BlockNumber
@@ -976,5 +976,5 @@ _mdnblocks(File file, Size blcksz)
long len;
len = FileSeek(file, 0L, SEEK_END) - 1;
- return ((BlockNumber) ((len < 0) ? 0 : 1 + len / blcksz));
+ return (BlockNumber) ((len < 0) ? 0 : 1 + len / blcksz);
}
diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c
index 2f5b57a4516..4b9c9e885a2 100644
--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.10 1998/08/19 02:02:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.11 1998/09/01 03:25:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -107,7 +107,7 @@ mminit()
if (mmcacheblk == (char *) NULL)
{
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
info.keysize = sizeof(MMCacheTag);
@@ -121,7 +121,7 @@ mminit()
if (MMCacheHT == (HTAB *) NULL)
{
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
info.keysize = sizeof(MMRelTag);
@@ -135,14 +135,14 @@ mminit()
if (MMRelCacheHT == (HTAB *) NULL)
{
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
if (IsUnderPostmaster) /* was IsPostmaster bjm */
{
MemSet(mmcacheblk, 0, mmsize);
SpinRelease(MMCacheLock);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
SpinRelease(MMCacheLock);
@@ -155,13 +155,13 @@ mminit()
mmcacheblk += (MMNBUFFERS * sizeof(MMCacheTag));
MMBlockCache = mmcacheblk;
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
int
mmshutdown()
{
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
int
@@ -176,7 +176,7 @@ mmcreate(Relation reln)
if (*MMCurRelno == MMNRELATIONS)
{
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
(*MMCurRelno)++;
@@ -200,14 +200,14 @@ mmcreate(Relation reln)
{
/* already exists */
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
entry->mmrhe_nblocks = 0;
SpinRelease(MMCacheLock);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -305,7 +305,7 @@ mmextend(Relation reln, char *buffer)
if (i == MMNBUFFERS)
{
SpinRelease(MMCacheLock);
- return (SM_FAIL);
+ return SM_FAIL;
}
}
else
@@ -346,7 +346,7 @@ mmextend(Relation reln, char *buffer)
SpinRelease(MMCacheLock);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -356,7 +356,7 @@ int
mmopen(Relation reln)
{
/* automatically successful */
- return (0);
+ return 0;
}
/*
@@ -368,7 +368,7 @@ int
mmclose(Relation reln)
{
/* automatically successful */
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -407,7 +407,7 @@ mmread(Relation reln, BlockNumber blocknum, char *buffer)
/* reading nonexistent pages is defined to fill them with zeroes */
SpinRelease(MMCacheLock);
MemSet(buffer, 0, BLCKSZ);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
offset = (entry->mmhe_bufno * BLCKSZ);
@@ -415,7 +415,7 @@ mmread(Relation reln, BlockNumber blocknum, char *buffer)
SpinRelease(MMCacheLock);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -460,7 +460,7 @@ mmwrite(Relation reln, BlockNumber blocknum, char *buffer)
SpinRelease(MMCacheLock);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -471,7 +471,7 @@ mmwrite(Relation reln, BlockNumber blocknum, char *buffer)
int
mmflush(Relation reln, BlockNumber blocknum, char *buffer)
{
- return (mmwrite(reln, blocknum, buffer));
+ return mmwrite(reln, blocknum, buffer);
}
/*
@@ -488,7 +488,7 @@ mmblindwrt(char *dbstr,
BlockNumber blkno,
char *buffer)
{
- return (SM_FAIL);
+ return SM_FAIL;
}
/*
@@ -529,7 +529,7 @@ mmnblocks(Relation reln)
SpinRelease(MMCacheLock);
- return (nblocks);
+ return nblocks;
}
/*
@@ -540,7 +540,7 @@ mmnblocks(Relation reln)
int
mmcommit()
{
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -550,7 +550,7 @@ mmcommit()
int
mmabort()
{
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -605,7 +605,7 @@ MMShmemSize()
size += MAXALIGN(sizeof(*MMCurRelno));
size += MAXALIGN(MMNBUFFERS * sizeof(MMCacheTag));
- return (size);
+ return size;
}
#endif /* STABLE_MEMORY_STORAGE */
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 0adc16ed78e..75ea2297efa 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.18 1998/07/20 16:14:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.19 1998/09/01 03:25:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -102,7 +102,7 @@ smgrinit()
/* register the shutdown proc */
on_proc_exit(smgrshutdown, NULL);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
static void
@@ -134,7 +134,7 @@ smgrcreate(int16 which, Relation reln)
if ((fd = (*(smgrsw[which].smgr_create)) (reln)) < 0)
elog(ERROR, "cannot create %s", reln->rd_rel->relname.data);
- return (fd);
+ return fd;
}
/*
@@ -150,7 +150,7 @@ smgrunlink(int16 which, Relation reln)
if ((status = (*(smgrsw[which].smgr_unlink)) (reln)) == SM_FAIL)
elog(ERROR, "cannot unlink %s", reln->rd_rel->relname.data);
- return (status);
+ return status;
}
/*
@@ -169,7 +169,7 @@ smgrextend(int16 which, Relation reln, char *buffer)
if (status == SM_FAIL)
elog(ERROR, "%s: cannot extend", reln->rd_rel->relname.data);
- return (status);
+ return status;
}
/*
@@ -186,7 +186,7 @@ smgropen(int16 which, Relation reln)
if ((fd = (*(smgrsw[which].smgr_open)) (reln)) < 0)
elog(ERROR, "cannot open %s", reln->rd_rel->relname.data);
- return (fd);
+ return fd;
}
/*
@@ -207,7 +207,7 @@ smgrclose(int16 which, Relation reln)
if ((*(smgrsw[which].smgr_close)) (reln) == SM_FAIL)
elog(ERROR, "cannot close %s", reln->rd_rel->relname.data);
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
/*
@@ -231,7 +231,7 @@ smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
elog(ERROR, "cannot read block %d of %s",
blocknum, reln->rd_rel->relname.data);
- return (status);
+ return status;
}
/*
@@ -253,7 +253,7 @@ smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
elog(ERROR, "cannot write block %d of %s",
blocknum, reln->rd_rel->relname.data);
- return (status);
+ return status;
}
/*
@@ -270,7 +270,7 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
elog(ERROR, "cannot flush block %d of %s to stable store",
blocknum, reln->rd_rel->relname.data);
- return (status);
+ return status;
}
/*
@@ -311,7 +311,7 @@ smgrblindwrt(int16 which,
pfree(dbstr);
pfree(relstr);
- return (status);
+ return status;
}
/*
@@ -329,7 +329,7 @@ smgrnblocks(int16 which, Relation reln)
if ((nblocks = (*(smgrsw[which].smgr_nblocks)) (reln)) < 0)
elog(ERROR, "cannot count blocks for %s", reln->rd_rel->relname.data);
- return (nblocks);
+ return nblocks;
}
/*
@@ -352,7 +352,7 @@ smgrtruncate(int16 which, Relation reln, int nblocks)
reln->rd_rel->relname.data, nblocks);
}
- return (newblks);
+ return newblks;
}
/*
@@ -373,7 +373,7 @@ smgrcommit()
}
}
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
#ifdef NOT_USED
@@ -391,7 +391,7 @@ smgrabort()
}
}
- return (SM_SUCCESS);
+ return SM_SUCCESS;
}
#endif
@@ -402,5 +402,5 @@ smgriswo(int16 smgrno)
if (smgrno < 0 || smgrno >= NSmgr)
elog(ERROR, "illegal storage manager number %d", smgrno);
- return (smgrwo[smgrno]);
+ return smgrwo[smgrno];
}
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index f4ea4001323..2e30f5baa1b 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.9 1998/06/23 15:35:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.10 1998/09/01 03:25:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,7 @@ smgrin(char *s)
for (i = 0; i < NStorageManagers; i++)
{
if (strcmp(s, StorageManager[i].smgr_name) == 0)
- return ((int2) i);
+ return (int2) i;
}
elog(ERROR, "smgrin: illegal storage manager name %s", s);
return 0;
@@ -63,21 +63,21 @@ smgrout(int2 i)
s = (char *) palloc(strlen(StorageManager[i].smgr_name) + 1);
strcpy(s, StorageManager[i].smgr_name);
- return (s);
+ return s;
}
bool
smgreq(int2 a, int2 b)
{
if (a == b)
- return (true);
- return (false);
+ return true;
+ return false;
}
bool
smgrne(int2 a, int2 b)
{
if (a == b)
- return (false);
- return (true);
+ return false;
+ return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 05:37:06 +0000