fmgr interface mopup work. Use new DatumGetBool and BoolGetDatum

macros where appropriate (the code used to have several different ways
of doing that, including Int32, Int8, UInt8, ...).  Remove last few
references to float32 and float64 typedefs --- it's all float4/float8
now.  The typedefs themselves should probably stay in c.h for a release
or two, though, to avoid breaking user-written C functions.

3 files changed, 33 insertions, 33 deletions

diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 5796b11b98..a0c6dd70a3 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.50 2000/05/28 17:55:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.51 2000/08/21 17:22:35 tgl Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -262,10 +262,10 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc,
 	namestrcpy(&oname, operatorName);
 	values[i++] = NameGetDatum(&oname);
 	values[i++] = Int32GetDatum(GetUserId());
-	values[i++] = (Datum) (uint16) 0;
-	values[i++] = (Datum) 'b';	/* assume it's binary */
-	values[i++] = (Datum) (bool) 0;
-	values[i++] = (Datum) (bool) 0;
+	values[i++] = UInt16GetDatum(0);
+	values[i++] = CharGetDatum('b'); /* assume it's binary */
+	values[i++] = BoolGetDatum(false);
+	values[i++] = BoolGetDatum(false);
 	values[i++] = ObjectIdGetDatum(leftObjectId);		/* <-- left oid */
 	values[i++] = ObjectIdGetDatum(rightObjectId);		/* <-- right oid */
 	values[i++] = ObjectIdGetDatum(InvalidOid);
@@ -648,9 +648,9 @@ OperatorDef(char *operatorName,
 	values[i++] = NameGetDatum(&oname);
 	values[i++] = Int32GetDatum(GetUserId());
 	values[i++] = UInt16GetDatum(precedence);
-	values[i++] = leftTypeName ? (rightTypeName ? 'b' : 'r') : 'l';
-	values[i++] = Int8GetDatum(isLeftAssociative);
-	values[i++] = Int8GetDatum(canHash);
+	values[i++] = CharGetDatum(leftTypeName ? (rightTypeName ? 'b' : 'r') : 'l');
+	values[i++] = BoolGetDatum(isLeftAssociative);
+	values[i++] = BoolGetDatum(canHash);
 	values[i++] = ObjectIdGetDatum(leftTypeId);
 	values[i++] = ObjectIdGetDatum(rightTypeId);
 
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 0322d982d1..ab6ce91e46 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.46 2000/07/05 23:11:07 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.47 2000/08/21 17:22:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -295,14 +295,14 @@ ProcedureCreate(char *procedureName,
 	values[i++] = Int32GetDatum(GetUserId());
 	values[i++] = ObjectIdGetDatum(languageObjectId);
 	/* XXX isinherited is always false for now */
-	values[i++] = Int8GetDatum((bool) false);
-	values[i++] = Int8GetDatum(trusted);
-	values[i++] = Int8GetDatum(canCache);
-	values[i++] = Int8GetDatum(isStrict);
+	values[i++] = BoolGetDatum(false);
+	values[i++] = BoolGetDatum(trusted);
+	values[i++] = BoolGetDatum(canCache);
+	values[i++] = BoolGetDatum(isStrict);
 	values[i++] = UInt16GetDatum(parameterCount);
-	values[i++] = Int8GetDatum(returnsSet);
+	values[i++] = BoolGetDatum(returnsSet);
 	values[i++] = ObjectIdGetDatum(typeObjectId);
-	values[i++] = (Datum) typev;
+	values[i++] = PointerGetDatum(typev);
 	values[i++] = Int32GetDatum(byte_pct);		/* probyte_pct */
 	values[i++] = Int32GetDatum(perbyte_cpu);	/* properbyte_cpu */
 	values[i++] = Int32GetDatum(percall_cpu);	/* propercall_cpu */
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 8356958d32..2e5970cfcc 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.54 2000/07/05 23:11:07 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.55 2000/08/21 17:22:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -177,17 +177,17 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	values[i++] = Int16GetDatum(0);				/* 3 */
 	values[i++] = Int16GetDatum(0);				/* 4 */
 	values[i++] = BoolGetDatum(false);			/* 5 */
-	values[i++] = BoolGetDatum(false);			/* 6 */
+	values[i++] = CharGetDatum(0);				/* 6 */
 	values[i++] = BoolGetDatum(false);			/* 7 */
-	values[i++] = BoolGetDatum(false);			/* 8 */
+	values[i++] = CharGetDatum(0);				/* 8 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 9 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 10 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 11 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 12 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 13 */
 	values[i++] = ObjectIdGetDatum(InvalidOid);	/* 14 */
-	values[i++] = CharGetDatum('p');			/* 15 */
-	values[i++] = CharGetDatum('i');			/* 16 */
+	values[i++] = CharGetDatum('i');			/* 15 */
+	values[i++] = CharGetDatum('p');			/* 16 */
 	values[i++] = DirectFunctionCall1(textin,
 									  CStringGetDatum(typeName));	/* 17 */
 
@@ -370,16 +370,16 @@ TypeCreate(char *typeName,
 	 */
 	i = 0;
 	namestrcpy(&name, typeName);
-	values[i++] = NameGetDatum(&name);	/* 1 */
-	values[i++] = (Datum) GetUserId();	/* 2 */
-	values[i++] = (Datum) internalSize; /* 3 */
-	values[i++] = (Datum) externalSize; /* 4 */
-	values[i++] = (Datum) passedByValue;		/* 5 */
-	values[i++] = (Datum) typeType;		/* 6 */
-	values[i++] = (Datum) (bool) 1;		/* 7 */
-	values[i++] = (Datum) typDelim;		/* 8 */
-	values[i++] = (Datum) (typeType == 'c' ? relationOid : InvalidOid); /* 9 */
-	values[i++] = (Datum) elementObjectId;		/* 10 */
+	values[i++] = NameGetDatum(&name);			/* 1 */
+	values[i++] = Int32GetDatum(GetUserId());	/* 2 */
+	values[i++] = Int16GetDatum(internalSize);	/* 3 */
+	values[i++] = Int16GetDatum(externalSize);	/* 4 */
+	values[i++] = BoolGetDatum(passedByValue);	/* 5 */
+	values[i++] = CharGetDatum(typeType);		/* 6 */
+	values[i++] = BoolGetDatum(true);			/* 7 */
+	values[i++] = CharGetDatum(typDelim);		/* 8 */
+	values[i++] = ObjectIdGetDatum(typeType == 'c' ? relationOid : InvalidOid); /* 9 */
+	values[i++] = ObjectIdGetDatum(elementObjectId); /* 10 */
 
 	procs[0] = inputProcedure;
 	procs[1] = outputProcedure;
@@ -438,20 +438,20 @@ TypeCreate(char *typeName,
 				func_error("TypeCreate", procname, 1, argList, NULL);
 		}
 
-		values[i++] = (Datum) tup->t_data->t_oid;		/* 11 - 14 */
+		values[i++] = ObjectIdGetDatum(tup->t_data->t_oid);	/* 11 - 14 */
 	}
 
 	/* ----------------
 	 * set default alignment
 	 * ----------------
 	 */
-	values[i++] = (Datum) alignment;	/* 15 */
+	values[i++] = CharGetDatum(alignment);	/* 15 */
 
 	/* ----------------
 	 *	set default storage for TOAST
 	 * ----------------
 	 */
-	values[i++] = (Datum) storage; /* 16 */
+	values[i++] = CharGetDatum(storage);	/* 16 */
 
 	/* ----------------
 	 *	initialize the default value for this type.