Cleanup of source files where 'return' or 'var =' is alone on a line.

5 files changed, 16 insertions, 27 deletions

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 96232c9d79f..404b28e5620 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.46 1999/02/02 03:44:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.47 1999/02/03 21:17:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1373,8 +1373,7 @@ BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld)
 BlockNumber
 RelationGetNumberOfBlocks(Relation relation)
 {
-	return
-	((relation->rd_myxactonly) ? relation->rd_nblocks :
+	return ((relation->rd_myxactonly) ? relation->rd_nblocks :
 	 smgrnblocks(DEFAULT_SMGR, relation));
 }
 
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index e08450da854..f4be40723fd 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.19 1998/08/19 02:02:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.20 1999/02/03 21:17:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -245,8 +245,7 @@ InitLocalBuffer(void)
 		buf->buf_id = -i - 2;
 	}
 
-	LocalRefCount =
-		(long *) malloc(sizeof(long) * NLocBuffer);
+	LocalRefCount = (long *) malloc(sizeof(long) * NLocBuffer);
 	MemSet(LocalRefCount, 0, sizeof(long) * NLocBuffer);
 }
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index d8b95b32f01..36db311540d 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.35 1998/10/26 01:00:13 tgl Exp $
+ *	  $Id: fd.c,v 1.36 1999/02/03 21:17:14 momjian Exp $
  *
  * NOTES:
  *
@@ -235,10 +235,8 @@ Delete(File file)
 
 	fileP = &VfdCache[file];
 
-	VfdCache[fileP->lruLessRecently].lruMoreRecently =
-		VfdCache[file].lruMoreRecently;
-	VfdCache[fileP->lruMoreRecently].lruLessRecently =
-		VfdCache[file].lruLessRecently;
+	VfdCache[fileP->lruLessRecently].lruMoreRecently = VfdCache[file].lruMoreRecently;
+	VfdCache[fileP->lruMoreRecently].lruLessRecently = VfdCache[file].lruLessRecently;
 
 	DO_DB(_dump_lru());
 }
@@ -347,8 +345,7 @@ tryAgain:
 		/* seek to the right position */
 		if (vfdP->seekPos != 0L)
 		{
-			returnValue =
-				lseek(vfdP->fd, vfdP->seekPos, SEEK_SET);
+			returnValue = lseek(vfdP->fd, vfdP->seekPos, SEEK_SET);
 			Assert(returnValue != -1);
 		}
 
@@ -751,8 +748,7 @@ FileSeek(File file, long offset, int whence)
 				return VfdCache[file].seekPos;
 			case SEEK_END:
 				FileAccess(file);
-				returnCode = VfdCache[file].seekPos =
-					lseek(VfdCache[file].fd, offset, whence);
+				returnCode = VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence);
 				return returnCode;
 			default:
 				elog(ERROR, "FileSeek: invalid whence: %d", whence);
@@ -761,8 +757,7 @@ FileSeek(File file, long offset, int whence)
 	}
 	else
 	{
-		returnCode = VfdCache[file].seekPos =
-			lseek(VfdCache[file].fd, offset, whence);
+		returnCode = VfdCache[file].seekPos = lseek(VfdCache[file].fd, offset, whence);
 		return returnCode;
 	}
 	/* NOTREACHED */
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 979a3ebe967..d09c2f6dd90 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.34 1998/12/18 09:10:34 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.35 1999/02/03 21:17:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -189,8 +189,7 @@ InitShmem(unsigned int key, unsigned int size)
 	/* next is ShmemVariableCache */
 	ShmemVariableCache = (VariableCache) (ShmemIndexOffset + 1);
 
-	currFreeSpace +=
-		sizeof(ShmemFreeStart) + sizeof(ShmemIndexOffset) +
+	currFreeSpace += sizeof(ShmemFreeStart) + sizeof(ShmemIndexOffset) +
 		LONGALIGN(sizeof(VariableCacheData));
 
 	/*
@@ -360,8 +359,7 @@ ShmemInitHash(char *name,		/* table string name for shmem index */
 	hash_flags |= HASH_SHARED_MEM;
 
 	/* look it up in the shmem index */
-	location =
-		ShmemInitStruct(name, my_log2(max_size) + sizeof(HHDR), &found);
+	location = ShmemInitStruct(name, my_log2(max_size) + sizeof(HHDR), &found);
 
 	/*
 	 * shmem index is corrupted.	Let someone else give the error
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 7e2a0b37230..2802a16c13b 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.46 1999/02/02 03:44:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.47 1999/02/03 21:17:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,8 +192,7 @@ inv_create(int flags)
 	retval->iscan = (IndexScanDesc) NULL;
 	retval->hdesc = RelationGetDescr(r);
 	retval->idesc = RelationGetDescr(indr);
-	retval->offset = retval->lowbyte =
-		retval->highbyte = 0;
+	retval->offset = retval->lowbyte = retval->highbyte = 0;
 	ItemPointerSetInvalid(&(retval->htid));
 
 	if (flags & INV_WRITE)
@@ -631,8 +630,7 @@ inv_fetchtup(LargeObjectDesc *obj_desc, HeapTuple tuple, Buffer *buffer)
 			 */
 			ScanKeyEntryInitialize(&skey, 0x0, 1, F_INT4GE,
 								   Int32GetDatum(obj_desc->offset));
-			obj_desc->iscan =
-				index_beginscan(obj_desc->index_r,
+			obj_desc->iscan = index_beginscan(obj_desc->index_r,
 								(bool) 0, (uint16) 1,
 								&skey);
 		}