New NameStr macro to convert Name to Str. No need for var.data anymore.

Fewer calls to nameout.

Better use of RelationGetRelationName.

4 files changed, 13 insertions, 12 deletions

diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index 789e05b2246..4a148ac2d50 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.23 1999/10/01 04:08:24 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.24 1999/11/07 23:08:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -179,7 +179,7 @@ checkLockPerms(List *locks, Query *parsetree, int rt_index)
 			 ev_rel->rd_rel->relowner);
 	}
 	heap_close(ev_rel, AccessShareLock);
-	evowner = nameout(&(((Form_pg_shadow) GETSTRUCT(usertup))->usename));
+	evowner = pstrdup(NameStr(((Form_pg_shadow) GETSTRUCT(usertup))->usename));
 
 	/*
 	 * Check all the locks, that should get fired on this query
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 26f91d32e3f..4d7fa3a47a4 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.38 1999/10/21 02:33:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.39 1999/11/07 23:08:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -118,9 +118,9 @@ InsertRule(char *rulname,
 	appendStringInfo(&rulebuf, "::text, '%s'::bool);",
 					 is_instead);
 
-	pg_exec_query_dest(rulebuf.data, None, true);
+	pg_exec_query_dest(NameStr(rulebuf), None, true);
 
-	pfree(rulebuf.data);
+	pfree(NameStr(rulebuf));
 
 	return LastOidProcessed;
 }
@@ -272,7 +272,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 			tle = (TargetEntry *) nth(i - 1, query->targetList);
 			resdom = tle->resdom;
 			attr = event_relation->rd_att->attrs[i - 1];
-			attname = nameout(&(attr->attname));
+			attname = pstrdup(NameStr(attr->attname));
 
 			if (strcmp(resdom->resname, attname) != 0)
 				elog(ERROR, "select rules target entry %d has different column name from %s", i, attname);
@@ -295,7 +295,8 @@ DefineQueryRewrite(RuleStmt *stmt)
 
 				rule = event_relation->rd_rules->rules[i];
 				if (rule->event == CMD_SELECT)
-					elog(ERROR, "%s is already a view", nameout(&(event_relation->rd_rel->relname)));
+					elog(ERROR, "%s is already a view",
+						RelationGetRelationName(event_relation));
 			}
 		}
 
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 3f9b4da2698..0e379174047 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.41 1999/10/01 04:08:24 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.42 1999/11/07 23:08:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -564,12 +564,12 @@ HandleRIRAttributeRule_mutator(Node *node,
 			{
 				NameData	name_to_look_for;
 
-				name_to_look_for.data[0] = '\0';
+				NameStr(name_to_look_for)[0] = '\0';
 				namestrcpy(&name_to_look_for,
 						   (char *) get_attname(getrelid(this_varno,
 														 context->rtable),
 												this_varattno));
-				if (name_to_look_for.data[0])
+				if (NameStr(name_to_look_for)[0])
 				{
 					Node	   *n;
 
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index c751550e494..412915253da 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.30 1999/10/26 03:12:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.31 1999/11/07 23:08:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ RewriteGetRuleEventRel(char *rulename)
 	if (!HeapTupleIsValid(htup))
 		elog(ERROR, "Class '%u' not found", eventrel);
 
-	return ((Form_pg_class) GETSTRUCT(htup))->relname.data;
+	return NameStr(((Form_pg_class) GETSTRUCT(htup))->relname);
 }
 
 /* ----------------------------------------------------------------