5 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index 46727d94c6e..0d438a3ddcd 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.11 1998/08/24 01:37:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.12 1998/09/01 03:24:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,7 +100,7 @@ nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum,
 		default:
 			break;
 	}
-	return (FALSE);
+	return FALSE;
 }
 
 /*
@@ -145,7 +145,7 @@ matchLocks(CmdType event,
 	if (parsetree->commandType != CMD_SELECT)
 	{
 		if (parsetree->resultRelation != varno)
-			return (NULL);
+			return NULL;
 	}
 
 	nlocks = rulelocks->numLocks;
@@ -166,7 +166,7 @@ matchLocks(CmdType event,
 
 	checkLockPerms(real_locks, parsetree, varno);
 
-	return (real_locks);
+	return real_locks;
 }
 
 
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index c5c3b887867..c055b47dd1a 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.19 1998/08/24 01:37:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.20 1998/09/01 03:24:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -133,7 +133,7 @@ InsertRule(char *rulname,
 
 	pg_exec_query_acl_override(rulebuf);
 
-	return (LastOidProcessed);
+	return LastOidProcessed;
 }
 
 /*
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 7606698afdf..83b6c9f5c57 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.15 1998/07/19 05:49:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.16 1998/09/01 03:24:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -288,7 +288,7 @@ FindMatchingNew(List *tlist, int attno)
 		TargetEntry *tle = lfirst(i);
 
 		if (tle->resdom->resno == attno)
-			return (tle->expr);
+			return tle->expr;
 	}
 	return NULL;
 }
@@ -305,7 +305,7 @@ FindMatchingTLEntry(List *tlist, char *e_attname)
 
 		resname = tle->resdom->resname;
 		if (!strcmp(e_attname, resname))
-			return (tle->expr);
+			return tle->expr;
 	}
 	return NULL;
 }
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index e9d3e791fb1..eaa4e0112cc 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.16 1998/08/19 02:02:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.17 1998/09/01 03:24:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -103,7 +103,7 @@ RemoveRewriteRule(char *ruleName)
 	ruleId = tuple->t_oid;
 	eventRelationOidDatum =	heap_getattr(tuple,
 								 Anum_pg_rewrite_ev_class,
-								 RelationGetTupleDescriptor(RewriteRelation),
+								 RelationGetDescr(RewriteRelation),
 								 &isNull);
 	if (isNull)
 	{
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 4c17cccb7f7..035c92f52fe 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.26 1998/08/24 01:38:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.27 1998/09/01 03:24:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
 	Node	   *rule_evqual = NULL;
 
 	ruleRelation = heap_openr(RewriteRelationName);
-	ruleTupdesc = RelationGetTupleDescriptor(ruleRelation);
+	ruleTupdesc = RelationGetDescr(ruleRelation);
 	ruletuple = SearchSysCacheTuple(RULOID,
 									ObjectIdGetDatum(ruleoid),
 									0, 0, 0);
@@ -105,7 +105,7 @@ IsDefinedRewriteRule(char *ruleName)
 	 * return whether or not the rewrite rule existed
 	 */
 	heap_close(RewriteRelation);
-	return (HeapTupleIsValid(tuple));
+	return HeapTupleIsValid(tuple);
 }
 
 static void