3 files changed, 3 insertions, 49 deletions

diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 6a13b81a1f..eb9d43943e 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.9 1997/09/08 02:21:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.10 1998/06/15 19:28:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,13 +47,9 @@ rtgettuple(IndexScanDesc s, ScanDirection dir)
 
 	/* not cached, so we'll have to do some work */
 	if (ItemPointerIsValid(&(s->currentItemData)))
-	{
 		res = rtnext(s, dir);
-	}
 	else
-	{
 		res = rtfirst(s, dir);
-	}
 	return (res);
 }
 
@@ -98,13 +94,9 @@ rtfirst(IndexScanDesc s, ScanDirection dir)
 			maxoff = PageGetMaxOffsetNumber(p);
 
 			if (ScanDirectionIsBackward(dir))
-			{
 				n = OffsetNumberPrev(stk->rts_child);
-			}
 			else
-			{
 				n = OffsetNumberNext(stk->rts_child);
-			}
 			so->s_stack = stk->rts_parent;
 			pfree(stk);
 
@@ -158,13 +150,9 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 	n = ItemPointerGetOffsetNumber(&(s->currentItemData));
 
 	if (ScanDirectionIsForward(dir))
-	{
 		n = OffsetNumberNext(n);
-	}
 	else
-	{
 		n = OffsetNumberPrev(n);
-	}
 
 	b = ReadBuffer(s->relation, blk);
 	p = BufferGetPage(b);
@@ -190,13 +178,9 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 			po = (RTreePageOpaque) PageGetSpecialPointer(p);
 
 			if (ScanDirectionIsBackward(dir))
-			{
 				n = OffsetNumberPrev(stk->rts_child);
-			}
 			else
-			{
 				n = OffsetNumberNext(stk->rts_child);
-			}
 			so->s_stack = stk->rts_parent;
 			pfree(stk);
 
@@ -230,13 +214,9 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 			po = (RTreePageOpaque) PageGetSpecialPointer(p);
 
 			if (ScanDirectionIsBackward(dir))
-			{
 				n = PageGetMaxOffsetNumber(p);
-			}
 			else
-			{
 				n = FirstOffsetNumber;
-			}
 		}
 	}
 }
@@ -283,13 +263,9 @@ findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
 		}
 
 		if (ScanDirectionIsBackward(dir))
-		{
 			n = OffsetNumberPrev(n);
-		}
 		else
-		{
 			n = OffsetNumberNext(n);
-		}
 	}
 
 	return (n);
@@ -345,9 +321,7 @@ rtheapptr(Relation r, ItemPointer itemp)
 		ReleaseBuffer(b);
 	}
 	else
-	{
 		ItemPointerSetInvalid(ip);
-	}
 
 	return (ip);
 }
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 4968162f76..57217b050b 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.23 1998/02/26 04:30:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.24 1998/06/15 19:28:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -450,9 +450,7 @@ rttighten(Relation r,
 			memmove(oldud, datum, VARSIZE(datum));
 		}
 		else
-		{
 			memmove(oldud, datum, att_size);
-		}
 		WriteBuffer(b);
 
 		/*
@@ -467,9 +465,7 @@ rttighten(Relation r,
 		pfree(tdatum);
 	}
 	else
-	{
 		ReleaseBuffer(b);
-	}
 	pfree(datum);
 }
 
@@ -587,9 +583,7 @@ dosplit(Relation r,
 	}
 
 	if ((bufblock = BufferGetBlockNumber(buffer)) != P_ROOT)
-	{
 		PageRestoreTempPage(left, p);
-	}
 	WriteBuffer(leftbuf);
 	WriteBuffer(rightbuf);
 
@@ -842,13 +836,9 @@ picksplit(Relation r,
 
 		/* okay, which page needs least enlargement? */
 		if (i == maxoff)
-		{
 			item_1 = itup;
-		}
 		else
-		{
 			item_1 = (IndexTuple) PageGetItem(page, PageGetItemId(page, i));
-		}
 
 		datum_alpha = ((char *) item_1) + sizeof(IndexTupleData);
 		union_dl = (char *) (*fmgr_faddr(&rtstate->unionFn)) (datum_l, datum_alpha);
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 2d47500e98..672d0e2005 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.15 1998/01/07 21:02:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.16 1998/06/15 19:28:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -104,17 +104,11 @@ rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
 	 * Set flags.
 	 */
 	if (RelationGetNumberOfBlocks(s->relation) == 0)
-	{
 		s->flags = ScanUnmarked;
-	}
 	else if (fromEnd)
-	{
 		s->flags = ScanUnmarked | ScanUncheckedPrevious;
-	}
 	else
-	{
 		s->flags = ScanUnmarked | ScanUncheckedNext;
-	}
 
 	s->scanFromEnd = fromEnd;
 
@@ -133,9 +127,7 @@ rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
 		p->s_stack = p->s_markstk = (RTSTACK *) NULL;
 		p->s_flags = 0x0;
 		for (i = 0; i < s->numberOfKeys; i++)
-		{
 			p->s_internalKey[i].sk_argument = s->keyData[i].sk_argument;
-		}
 	}
 	else
 	{
@@ -279,9 +271,7 @@ rtdropscan(IndexScanDesc s)
 	for (l = RTScans;
 		 l != (RTScanList) NULL && l->rtsl_scan != s;
 		 l = l->rtsl_next)
-	{
 		prev = l;
-	}
 
 	if (l == (RTScanList) NULL)
 		elog(ERROR, "rtree scan list corrupted -- cannot find 0x%lx", s);