Renaming cleanup, no pgindent yet.

3 files changed, 36 insertions, 36 deletions

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 82232104e29..96c11294126 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.1 1998/08/24 19:14:48 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.2 1998/09/01 03:29:03 momjian Exp $
  *
  *    This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -107,7 +107,7 @@ PLpgSQL_function *plpgsql_compile(Oid fn_oid, int functype)
     HeapTuple		procTup;
     Form_pg_proc	procStruct;
     HeapTuple		typeTup;
-    TypeTupleForm	typeStruct;
+    Form_pg_type	typeStruct;
     char		*proc_source;
     PLpgSQL_function	*function;
     PLpgSQL_var		*var;
@@ -183,7 +183,7 @@ PLpgSQL_function *plpgsql_compile(Oid fn_oid, int functype)
 		elog(ERROR, "cache lookup for return type %d failed",
 				procStruct->prorettype);
 	    }
-	    typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+	    typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 	    if (typeStruct->typrelid != InvalidOid) {
 		function->fn_retistuple = true;
 	    } else {
@@ -211,7 +211,7 @@ PLpgSQL_function *plpgsql_compile(Oid fn_oid, int functype)
 		    elog(ERROR, "cache lookup for argument type %d failed",
 				procStruct->proargtypes[i]);
 		}
-		typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+		typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 		if (typeStruct->typrelid != InvalidOid) {
 		    /* ----------
@@ -522,7 +522,7 @@ int plpgsql_parse_word(char *word)
     PLpgSQL_nsitem		*nse;
     char			*cp;
     HeapTuple			typeTup;
-    TypeTupleForm		typeStruct;
+    Form_pg_type		typeStruct;
     char			*typeXlated;
 
     /* ----------
@@ -597,7 +597,7 @@ int plpgsql_parse_word(char *word)
     if (HeapTupleIsValid(typeTup)) {
 	PLpgSQL_type	*typ;
 
-	typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+	typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 	if (typeStruct->typrelid != InvalidOid) {
 	    pfree(cp);
@@ -857,7 +857,7 @@ int plpgsql_parse_wordtype(char *word)
     PLpgSQL_nsitem		*nse;
     char			*cp;
     HeapTuple			typeTup;
-    TypeTupleForm		typeStruct;
+    Form_pg_type		typeStruct;
     char			*typeXlated;
     bool			old_nsstate;
 
@@ -901,7 +901,7 @@ int plpgsql_parse_wordtype(char *word)
     if (HeapTupleIsValid(typeTup)) {
 	PLpgSQL_type	*typ;
 
-	typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+	typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 	if (typeStruct->typrelid != InvalidOid) {
 	    pfree(cp);
@@ -945,9 +945,9 @@ int plpgsql_parse_dblwordtype(char *string)
     HeapTuple		classtup;
     Form_pg_class	classStruct;
     HeapTuple		attrtup;
-    AttributeTupleForm	attrStruct;
+    Form_pg_attribute	attrStruct;
     HeapTuple		typetup;
-    TypeTupleForm	typeStruct;
+    Form_pg_type	typeStruct;
     PLpgSQL_type	*typ;
 
 
@@ -1027,7 +1027,7 @@ int plpgsql_parse_dblwordtype(char *string)
 	pfree(word1);
 	return T_ERROR;
     }
-    attrStruct = (AttributeTupleForm)GETSTRUCT(attrtup);
+    attrStruct = (Form_pg_attribute)GETSTRUCT(attrtup);
 
     typetup = SearchSysCacheTuple(TYPOID,
 	    ObjectIdGetDatum(attrStruct->atttypid), 0, 0, 0);
@@ -1041,7 +1041,7 @@ int plpgsql_parse_dblwordtype(char *string)
      * Found that - build a compiler type struct and return it
      * ----------
      */
-    typeStruct = (TypeTupleForm)GETSTRUCT(typetup);
+    typeStruct = (Form_pg_type)GETSTRUCT(typetup);
 
     typ = (PLpgSQL_type *)malloc(sizeof(PLpgSQL_type));
 
@@ -1068,9 +1068,9 @@ int plpgsql_parse_wordrowtype(char *string)
     HeapTuple		classtup;
     Form_pg_class	classStruct;
     HeapTuple		typetup;
-    TypeTupleForm	typeStruct;
+    Form_pg_type	typeStruct;
     HeapTuple		attrtup;
-    AttributeTupleForm	attrStruct;
+    Form_pg_attribute	attrStruct;
     char		*word1;
     char		*cp;
     int			i;
@@ -1135,7 +1135,7 @@ int plpgsql_parse_wordrowtype(char *string)
 	    elog(ERROR, "cache lookup for attribute %d of class %s failed",
 	    		i + 1, word1);
 	}
-	attrStruct = (AttributeTupleForm)GETSTRUCT(attrtup);
+	attrStruct = (Form_pg_attribute)GETSTRUCT(attrtup);
 
 	typetup = SearchSysCacheTuple(TYPOID,
 		ObjectIdGetDatum(attrStruct->atttypid), 0, 0, 0);
@@ -1145,7 +1145,7 @@ int plpgsql_parse_wordrowtype(char *string)
 	    		attrStruct->atttypid, word1,
 			nameout(&(attrStruct->attname)));
 	}
-	typeStruct = (TypeTupleForm)GETSTRUCT(typetup);
+	typeStruct = (Form_pg_type)GETSTRUCT(typetup);
 
 	cp = strdup(nameout(&(attrStruct->attname)));
 
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d33b79ef53e..9c43f90ef50 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.1 1998/08/24 19:14:48 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.2 1998/09/01 03:29:05 momjian Exp $
  *
  *    This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1459,7 +1459,7 @@ static int exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt
 static int exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 {
     HeapTuple		typetup;
-    TypeTupleForm	typeStruct;
+    Form_pg_type	typeStruct;
     FmgrInfo		finfo_output;
     char		*extval;
     int			pidx = 0;
@@ -1505,7 +1505,7 @@ static int exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			if (!HeapTupleIsValid(typetup)) {
 			    elog(ERROR, "cache lookup for type %d failed (1)", var->datatype->typoid);
 			}
-			typeStruct = (TypeTupleForm) GETSTRUCT(typetup);
+			typeStruct = (Form_pg_type) GETSTRUCT(typetup);
 
 			fmgr_info(typeStruct->typoutput, &finfo_output);
 			extval = (char *)(*fmgr_faddr(&finfo_output))(var->value, &(var->isnull), var->datatype->atttypmod);
@@ -1794,7 +1794,7 @@ static void exec_assign_value(PLpgSQL_execstate *estate,
     Oid			atttype;
     int4		atttypmod;
     HeapTuple		typetup;
-    TypeTupleForm	typeStruct;
+    Form_pg_type	typeStruct;
     FmgrInfo		finfo_input;
 
     switch (target->dtype) {
@@ -1883,7 +1883,7 @@ static void exec_assign_value(PLpgSQL_execstate *estate,
 		if (!HeapTupleIsValid(typetup)) {
 		    elog(ERROR, "cache lookup for type %d failed", atttype);
 		}
-		typeStruct = (TypeTupleForm) GETSTRUCT(typetup);
+		typeStruct = (Form_pg_type) GETSTRUCT(typetup);
 		fmgr_info(typeStruct->typinput, &finfo_input);
 
 		attisnull = *isNull;
@@ -2203,7 +2203,7 @@ static Datum exec_cast_value(Datum value, Oid valtype,
 	 */
 	if (valtype != reqtype || reqtypmod > 0) {
 	    HeapTuple		typetup;
-	    TypeTupleForm	typeStruct;
+	    Form_pg_type	typeStruct;
 	    FmgrInfo		finfo_output;
 	    char		*extval;
 
@@ -2212,7 +2212,7 @@ static Datum exec_cast_value(Datum value, Oid valtype,
 	    if (!HeapTupleIsValid(typetup)) {
 		elog(ERROR, "cache lookup for type %d failed", valtype);
 	    }
-	    typeStruct = (TypeTupleForm) GETSTRUCT(typetup);
+	    typeStruct = (Form_pg_type) GETSTRUCT(typetup);
 
 	    fmgr_info(typeStruct->typoutput, &finfo_output);
 	    extval = (char *)(*fmgr_faddr(&finfo_output))(value, &isnull, -1);
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index a0736dbcdac..6202816afe8 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -3,7 +3,7 @@
  *			  procedural language (PL)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.4 1998/08/19 02:04:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.5 1998/09/01 03:29:08 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -481,7 +481,7 @@ pltcl_func_handler(FmgrInfo *proinfo,
 		HeapTuple	procTup;
 		HeapTuple	typeTup;
 		Form_pg_proc procStruct;
-		TypeTupleForm typeStruct;
+		Form_pg_type typeStruct;
 		Tcl_DString proc_internal_def;
 		Tcl_DString proc_internal_body;
 		char		proc_internal_args[4096];
@@ -522,7 +522,7 @@ pltcl_func_handler(FmgrInfo *proinfo,
 			free(prodesc);
 			elog(ERROR, "pltcl: cache lookup for return type failed");
 		}
-		typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+		typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 		if (typeStruct->typrelid != InvalidOid)
 		{
@@ -552,7 +552,7 @@ pltcl_func_handler(FmgrInfo *proinfo,
 				free(prodesc);
 				elog(ERROR, "pltcl: cache lookup for argument type failed");
 			}
-			typeStruct = (TypeTupleForm) GETSTRUCT(typeTup);
+			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			if (typeStruct->typrelid != InvalidOid)
 			{
@@ -1147,8 +1147,8 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
 				 ret_values[--i],
 				 ObjectIdGetDatum(tupdesc->attrs[attnum - 1]->atttypid));
 		}
-		typinput = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typinput);
-		typelem = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typelem);
+		typinput = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typinput);
+		typelem = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typelem);
 
 		/************************************************************
 		 * Set the attribute to NOT NULL and convert the contents
@@ -1616,11 +1616,11 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp,
 		if (!HeapTupleIsValid(typeTup))
 			elog(ERROR, "pltcl: Cache lookup of type %s failed", args[i]);
 		qdesc->argtypes[i] = typeTup->t_oid;
-		fmgr_info(((TypeTupleForm) GETSTRUCT(typeTup))->typinput,
+		fmgr_info(((Form_pg_type) GETSTRUCT(typeTup))->typinput,
 				  &(qdesc->arginfuncs[i]));
-		qdesc->argtypelems[i] = ((TypeTupleForm) GETSTRUCT(typeTup))->typelem;
+		qdesc->argtypelems[i] = ((Form_pg_type) GETSTRUCT(typeTup))->typelem;
 		qdesc->argvalues[i] = (Datum) NULL;
-		qdesc->arglen[i] = (int) (((TypeTupleForm) GETSTRUCT(typeTup))->typlen);
+		qdesc->arglen[i] = (int) (((Form_pg_type) GETSTRUCT(typeTup))->typlen);
 	}
 
 	/************************************************************
@@ -2164,8 +2164,8 @@ pltcl_set_tuple_values(Tcl_Interp * interp, char *arrayname,
 				 attname, ObjectIdGetDatum(tupdesc->attrs[i]->atttypid));
 		}
 
-		typoutput = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typoutput);
-		typelem = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typelem);
+		typoutput = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typoutput);
+		typelem = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typelem);
 
 		/************************************************************
 		 * If there is a value, set the variable
@@ -2237,8 +2237,8 @@ pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc,
 				 attname, ObjectIdGetDatum(tupdesc->attrs[i]->atttypid));
 		}
 
-		typoutput = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typoutput);
-		typelem = (Oid) (((TypeTupleForm) GETSTRUCT(typeTup))->typelem);
+		typoutput = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typoutput);
+		typelem = (Oid) (((Form_pg_type) GETSTRUCT(typeTup))->typelem);
 
 		/************************************************************
 		 * If there is a value, append the attribute name and the