5 files changed, 13 insertions, 13 deletions

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 2bd3a00b73e..b83e1372962 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: analyze.c,v 1.122 1999/11/01 05:06:21 tgl Exp $
+ *	$Id: analyze.c,v 1.123 1999/11/07 23:08:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -407,7 +407,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 				makeResdom(attrno,
 						   thisatt->atttypid,
 						   thisatt->atttypmod,
-						   pstrdup(nameout(&(thisatt->attname))),
+						   pstrdup(NameStr(thisatt->attname)),
 						   0, 0, false),
 				stringToNode(defval[ndef].adbin));
 			qry->targetList = lappend(qry->targetList, te);
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index c6f96106994..04030330d59 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.60 1999/10/07 04:23:12 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.61 1999/11/07 23:08:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -321,7 +321,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 				rd = heap_openr(typeidTypeName(toid), NoLock);
 				if (RelationIsValid(rd))
 				{
-					relname = RelationGetRelationName(rd)->data;
+					relname = RelationGetRelationName(rd);
 					heap_close(rd, NoLock);
 				}
 				else
@@ -1160,7 +1160,7 @@ find_inheritors(Oid relid, Oid **supervec)
 			rd = heap_open(qentry->sqe_relid, NoLock);
 			if (! RelationIsValid(rd))
 				elog(ERROR, "Relid %u does not exist", qentry->sqe_relid);
-			qentry->sqe_relid = typeTypeId(typenameType(RelationGetRelationName(rd)->data));
+			qentry->sqe_relid = typeTypeId(typenameType(RelationGetRelationName(rd)));
 			heap_close(rd, NoLock);
 
 			DLAddTail(visited, qe);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index fcbd6fedd2c..9d859fd0849 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.32 1999/10/07 04:23:12 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.33 1999/11/07 23:08:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -265,7 +265,7 @@ expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno)
 		Var		   *varnode;
 		TargetEntry *te = makeNode(TargetEntry);
 
-		attrname = pstrdup(rel->rd_att->attrs[varattno]->attname.data);
+		attrname = pstrdup(NameStr(rel->rd_att->attrs[varattno]->attname));
 		varnode = make_var(pstate, rte->relid, refname, attrname);
 
 		/*
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index a009bc5a77c..f87c0aca257 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.47 1999/11/01 05:06:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.48 1999/11/07 23:08:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -197,7 +197,7 @@ updateTargetListEntry(ParseState *pstate,
 		Node	   *arrayBase;
 		ArrayRef   *aref;
 
-		att->relname = pstrdup(RelationGetRelationName(rd)->data);
+		att->relname = pstrdup(RelationGetRelationName(rd));
 		att->attrs = lcons(makeString(colname), NIL);
 		arrayBase = ParseNestedFuncOrColumn(pstate, att,
 											&pstate->p_last_resno,
@@ -381,7 +381,7 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos)
 			Ident	   *id = makeNode(Ident);
 
 			id->name = palloc(NAMEDATALEN);
-			StrNCpy(id->name, attr[i]->attname.data, NAMEDATALEN);
+			StrNCpy(id->name, NameStr(attr[i]->attname), NAMEDATALEN);
 			id->indirection = NIL;
 			id->isRel = false;
 			cols = lappend(cols, id);
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 38cf29d636c..ac551e9e22c 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.25 1999/08/05 02:33:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.26 1999/11/07 23:08:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@ typeidTypeName(Oid id)
 		return NULL;
 	}
 	typetuple = (Form_pg_type) GETSTRUCT(tup);
-	return (typetuple->typname).data;
+	return NameStr(typetuple->typname);
 }
 
 /* return a Type structure, given a type id */
@@ -118,7 +118,7 @@ typeTypeName(Type t)
 	Form_pg_type typ;
 
 	typ = (Form_pg_type) GETSTRUCT(t);
-	return (typ->typname).data;
+	return NameStr(typ->typname);
 }
 
 /* given a type, return its typetype ('c' for 'c'atalog types) */