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

Fewer calls to nameout.

Better use of RelationGetRelationName.

7 files changed, 52 insertions, 51 deletions

diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 8c877c3ffdc..ad5c5453e7d 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -10,7 +10,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.31 1999/09/07 19:09:46 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.32 1999/11/07 23:08:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,7 +82,7 @@ namelike(NameData *n, struct varlena * p)
 {
 	if (!n)
 		return FALSE;
-	return fixedlen_like(n->data, p, NAMEDATALEN);
+	return fixedlen_like(NameStr(*n), p, NAMEDATALEN);
 }
 
 bool
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index b4d0a7da728..fd457afcbe0 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.23 1999/07/17 20:17:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.24 1999/11/07 23:08:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,11 +40,11 @@ namein(char *s)
 		return NULL;
 	result = (NameData *) palloc(NAMEDATALEN);
 	/* always keep it null-padded */
-	StrNCpy(result->data, s, NAMEDATALEN);
-	len = strlen(result->data);
+	StrNCpy(NameStr(*result), s, NAMEDATALEN);
+	len = strlen(NameStr(*result));
 	while (len < NAMEDATALEN)
 	{
-		*(result->data + len) = '\0';
+		*(NameStr(*result) + len) = '\0';
 		len++;
 	}
 	return result;
@@ -59,7 +59,7 @@ nameout(NameData *s)
 	if (s == NULL)
 		return "-";
 	else
-		return pstrdup(s->data);
+		return pstrdup(NameStr(*s));
 }
 
 
@@ -87,7 +87,7 @@ nameeq(NameData *arg1, NameData *arg2)
 	if (!arg1 || !arg2)
 		return 0;
 	else
-		return (bool) strncmp(arg1->data, arg2->data, NAMEDATALEN) == 0;
+		return (bool) strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) == 0;
 }
 
 bool
@@ -95,7 +95,7 @@ namene(NameData *arg1, NameData *arg2)
 {
 	if (arg1 == NULL || arg2 == NULL)
 		return (bool) 0;
-	return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) != 0);
+	return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) != 0);
 }
 
 bool
@@ -103,7 +103,7 @@ namelt(NameData *arg1, NameData *arg2)
 {
 	if (arg1 == NULL || arg2 == NULL)
 		return (bool) 0;
-	return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) < 0);
+	return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) < 0);
 }
 
 bool
@@ -111,7 +111,7 @@ namele(NameData *arg1, NameData *arg2)
 {
 	if (arg1 == NULL || arg2 == NULL)
 		return (bool) 0;
-	return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) <= 0);
+	return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) <= 0);
 }
 
 bool
@@ -120,7 +120,7 @@ namegt(NameData *arg1, NameData *arg2)
 	if (arg1 == NULL || arg2 == NULL)
 		return (bool) 0;
 
-	return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) > 0);
+	return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) > 0);
 }
 
 bool
@@ -129,7 +129,7 @@ namege(NameData *arg1, NameData *arg2)
 	if (arg1 == NULL || arg2 == NULL)
 		return (bool) 0;
 
-	return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) >= 0);
+	return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) >= 0);
 }
 
 
@@ -140,7 +140,7 @@ namecpy(Name n1, Name n2)
 {
 	if (!n1 || !n2)
 		return -1;
-	strncpy(n1->data, n2->data, NAMEDATALEN);
+	strncpy(NameStr(*n1), NameStr(*n2), NAMEDATALEN);
 	return 0;
 }
 
@@ -148,7 +148,7 @@ namecpy(Name n1, Name n2)
 int
 namecat(Name n1, Name n2)
 {
-	return namestrcat(n1, n2->data);	/* n2 can't be any longer than n1 */
+	return namestrcat(n1, NameStr(*n2));	/* n2 can't be any longer than n1 */
 }
 
 #endif
@@ -157,7 +157,7 @@ namecat(Name n1, Name n2)
 int
 namecmp(Name n1, Name n2)
 {
-	return strncmp(n1->data, n2->data, NAMEDATALEN);
+	return strncmp(NameStr(*n1), NameStr(*n2), NAMEDATALEN);
 }
 
 #endif
@@ -167,7 +167,7 @@ namestrcpy(Name name, char *str)
 {
 	if (!name || !str)
 		return -1;
-	StrNCpy(name->data, str, NAMEDATALEN);
+	StrNCpy(NameStr(*name), str, NAMEDATALEN);
 	return 0;
 }
 
@@ -181,7 +181,7 @@ namestrcat(Name name, char *str)
 
 	if (!name || !str)
 		return -1;
-	for (i = 0, p = name->data; i < NAMEDATALEN && *p; ++i, ++p)
+	for (i = 0, p = NameStr(*name); i < NAMEDATALEN && *p; ++i, ++p)
 		;
 	for (q = str; i < NAMEDATALEN; ++i, ++p, ++q)
 	{
@@ -203,7 +203,7 @@ namestrcmp(Name name, char *str)
 		return -1;				/* NULL < anything */
 	if (!str)
 		return 1;				/* NULL < anything */
-	return strncmp(name->data, str, NAMEDATALEN);
+	return strncmp(NameStr(*name), str, NAMEDATALEN);
 }
 
 /*****************************************************************************
@@ -217,7 +217,7 @@ NameComputeLength(Name name)
 	char	   *charP;
 	int			length;
 
-	for (length = 0, charP = name->data;
+	for (length = 0, charP = NameStr(*name);
 		 length < NAMEDATALEN && *charP != '\0';
 		 length++, charP++)
 		;
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 082b1dba62a..bf0a598c16f 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.28 1999/07/17 20:17:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.29 1999/11/07 23:08:24 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -200,7 +200,7 @@ nameregexeq(NameData *n, struct varlena * p)
 {
 	if (!n)
 		return FALSE;
-	return fixedlen_regexeq(n->data, p, NAMEDATALEN, REG_EXTENDED);
+	return fixedlen_regexeq(NameStr(*n), p, NAMEDATALEN, REG_EXTENDED);
 }
 
 bool
@@ -248,7 +248,7 @@ nameicregexeq(NameData *n, struct varlena * p)
 {
 	if (!n)
 		return FALSE;
-	return (fixedlen_regexeq(n->data, p, NAMEDATALEN,
+	return (fixedlen_regexeq(NameStr(*n), p, NAMEDATALEN,
 							 REG_ICASE | REG_EXTENDED));
 }
 
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index b3179e864c1..74dd671e968 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.43 1999/09/18 19:07:49 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.44 1999/11/07 23:08:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -173,7 +173,7 @@ regprocout(RegProcedure proid)
 		{
 			char	   *s;
 
-			s = ((Form_pg_proc) GETSTRUCT(proctup))->proname.data;
+			s = NameStr(((Form_pg_proc) GETSTRUCT(proctup))->proname);
 			StrNCpy(result, s, NAMEDATALEN);
 		}
 		else
@@ -261,7 +261,7 @@ oid8types(Oid *oidArray)
 			{
 				char	   *s;
 
-				s = ((Form_pg_type) GETSTRUCT(typetup))->typname.data;
+				s = NameStr(((Form_pg_type) GETSTRUCT(typetup))->typname);
 				StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s,
 						NAMEDATALEN);
 				strcat(VARDATA(result), " ");
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 83e593c5301..22f904b60d5 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
  *			  out of it's tuple
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.29 1999/10/31 18:57:42 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.30 1999/11/07 23:08:24 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -138,7 +138,7 @@ pg_get_ruledef(NameData *rname)
 	 * We need the rules name somewhere deep down
 	 * ----------
 	 */
-	rulename = nameout(rname);
+	rulename = pstrdup(NameStr(*rname));
 
 	/* ----------
 	 * Connect to SPI manager
@@ -238,7 +238,7 @@ pg_get_viewdef(NameData *rname)
 	 * We need the rules name somewhere deep down
 	 * ----------
 	 */
-	rulename = nameout(rname);
+	rulename = pstrdup(NameStr(*rname));
 
 	/* ----------
 	 * Connect to SPI manager
@@ -410,10 +410,10 @@ pg_get_indexdef(Oid indexrelid)
 	spirc = SPI_execp(plan_getam, spi_args, spi_nulls, 1);
 	if (spirc != SPI_OK_SELECT)
 		elog(ERROR, "failed to get pg_am tuple for index %s",
-			 nameout(&(idxrelrec->relname)));
+			 idxrelrec->relname);
 	if (SPI_processed != 1)
 		elog(ERROR, "failed to get pg_am tuple for index %s",
-			 nameout(&(idxrelrec->relname)));
+			 idxrelrec->relname);
 	spi_tup = SPI_tuptable->vals[0];
 	spi_ttc = SPI_tuptable->tupdesc;
 	spi_fno = SPI_fnumber(spi_ttc, "amname");
@@ -425,8 +425,8 @@ pg_get_indexdef(Oid indexrelid)
 	initStringInfo(&buf);
 	appendStringInfo(&buf, "CREATE %sINDEX %s ON %s USING %s (",
 					 idxrec->indisunique ? "UNIQUE " : "",
-					 quote_identifier(nameout(&(idxrelrec->relname))),
-					 quote_identifier(nameout(&(indrelrec->relname))),
+					 quote_identifier(pstrdup(NameStr(idxrelrec->relname))),
+					 quote_identifier(pstrdup(NameStr(indrelrec->relname))),
 					 quote_identifier(SPI_getvalue(spi_tup, spi_ttc,
 												   spi_fno)));
 
@@ -491,7 +491,7 @@ pg_get_indexdef(Oid indexrelid)
 
 		procStruct = (Form_pg_proc) GETSTRUCT(proctup);
 		appendStringInfo(&buf, "%s(%s) ",
-						 quote_identifier(nameout(&(procStruct->proname))),
+						 quote_identifier(pstrdup(NameStr(procStruct->proname))),
 						 keybuf.data);
 
 		spi_args[0] = ObjectIdGetDatum(idxrec->indclass[0]);
@@ -561,7 +561,7 @@ pg_get_userbyid(int32 uid)
 	 * ----------
 	 */
 	result = (NameData *) palloc(NAMEDATALEN);
-	memset(result->data, 0, NAMEDATALEN);
+	memset(NameStr(*result), 0, NAMEDATALEN);
 
 	/* ----------
 	 * Get the pg_shadow entry and print the result
@@ -572,7 +572,7 @@ pg_get_userbyid(int32 uid)
 	if (HeapTupleIsValid(usertup))
 	{
 		user_rec = (Form_pg_shadow) GETSTRUCT(usertup);
-		StrNCpy(result->data, (&(user_rec->usename))->data, NAMEDATALEN);
+		StrNCpy(NameStr(*result), NameStr(user_rec->usename), NAMEDATALEN);
 	}
 	else
 		sprintf((char *) result, "unknown (UID=%d)", uid);
@@ -1446,7 +1446,7 @@ get_func_expr(Expr *expr, deparse_context *context)
 		elog(ERROR, "cache lookup for proc %u failed", func->funcid);
 
 	procStruct = (Form_pg_proc) GETSTRUCT(proctup);
-	proname = nameout(&(procStruct->proname));
+	proname = pstrdup(NameStr(procStruct->proname));
 
 	/*
 	 * nullvalue() and nonnullvalue() should get turned into special syntax
@@ -1555,7 +1555,8 @@ get_tle_expr(TargetEntry *tle, deparse_context *context)
 		elog(ERROR, "cache lookup for type %u failed",
 			 procStruct->prorettype);
 	typeStruct = (Form_pg_type) GETSTRUCT(tup);
-	if (strncmp(procStruct->proname.data, typeStruct->typname.data,
+	if (strncmp(NameStr(procStruct->proname),
+				NameStr(typeStruct->typname),
 				NAMEDATALEN) != 0)
 	{
 		get_rule_expr(tle->expr, context);
@@ -1662,7 +1663,7 @@ get_const_expr(Const *constval, deparse_context *context)
 			/* These types can be left unlabeled */
 			break;
 		default:
-			extval = (char *) nameout(&(typeStruct->typname));
+			extval = pstrdup(NameStr(typeStruct->typname));
 			appendStringInfo(buf, "::%s", quote_identifier(extval));
 			pfree(extval);
 			break;
@@ -1800,7 +1801,7 @@ get_relation_name(Oid relid)
 		elog(ERROR, "cache lookup of relation %u failed", relid);
 
 	classStruct = (Form_pg_class) GETSTRUCT(classtup);
-	return nameout(&(classStruct->relname));
+	return pstrdup(NameStr(classStruct->relname));
 }
 
 
@@ -1823,7 +1824,7 @@ get_attribute_name(Oid relid, int2 attnum)
 			 attnum, relid);
 
 	attStruct = (Form_pg_attribute) GETSTRUCT(atttup);
-	return nameout(&(attStruct->attname));
+	return pstrdup(NameStr(attStruct->attname));
 }
 
 
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 8d27a1ca6d8..9ac113301d7 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.54 1999/07/17 20:18:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.55 1999/11/07 23:08:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -273,12 +273,12 @@ bpchar_name(char *s)
 #endif
 
 	result = (NameData *) palloc(NAMEDATALEN);
-	StrNCpy(result->data, VARDATA(s), NAMEDATALEN);
+	StrNCpy(NameStr(*result), VARDATA(s), NAMEDATALEN);
 
 	/* now null pad to full length... */
 	while (len < NAMEDATALEN)
 	{
-		*(result->data + len) = '\0';
+		*(NameStr(*result) + len) = '\0';
 		len++;
 	}
 
@@ -297,7 +297,7 @@ name_bpchar(NameData *s)
 	if (s == NULL)
 		return NULL;
 
-	len = strlen(s->data);
+	len = strlen(NameStr(*s));
 
 #ifdef STRINGDEBUG
 	printf("bpchar- convert string length %d (%d) ->%d\n",
@@ -305,7 +305,7 @@ name_bpchar(NameData *s)
 #endif
 
 	result = (char *) palloc(VARHDRSZ + len);
-	strncpy(VARDATA(result), s->data, len);
+	strncpy(VARDATA(result), NameStr(*s), len);
 	VARSIZE(result) = len + VARHDRSZ;
 
 	return result;
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 08eac37460a..90f898fe971 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.53 1999/07/17 20:18:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.54 1999/11/07 23:08:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -801,12 +801,12 @@ text_name(text *s)
 #endif
 
 	result = palloc(NAMEDATALEN);
-	StrNCpy(result->data, VARDATA(s), NAMEDATALEN);
+	StrNCpy(NameStr(*result), VARDATA(s), NAMEDATALEN);
 
 	/* now null pad to full length... */
 	while (len < NAMEDATALEN)
 	{
-		*(result->data + len) = '\0';
+		*(NameStr(*result) + len) = '\0';
 		len++;
 	}
 
@@ -825,7 +825,7 @@ name_text(NameData *s)
 	if (s == NULL)
 		return NULL;
 
-	len = strlen(s->data);
+	len = strlen(NameStr(*s));
 
 #ifdef STRINGDEBUG
 	printf("text- convert string length %d (%d) ->%d\n",
@@ -833,7 +833,7 @@ name_text(NameData *s)
 #endif
 
 	result = palloc(VARHDRSZ + len);
-	strncpy(VARDATA(result), s->data, len);
+	strncpy(VARDATA(result), NameStr(*s), len);
 	VARSIZE(result) = len + VARHDRSZ;
 
 	return result;