Another batch of fmgr updates. I think I have gotten all old-style

functions that take pass-by-value datatypes.  Should be ready for
port testing ...

5 files changed, 32 insertions, 35 deletions

diff --git a/src/test/regress/input/create_function_1.source b/src/test/regress/input/create_function_1.source
index e3c1d22c1db..0466249be8d 100644
--- a/src/test/regress/input/create_function_1.source
+++ b/src/test/regress/input/create_function_1.source
@@ -40,5 +40,5 @@ CREATE FUNCTION ttdummy ()
 CREATE FUNCTION set_ttdummy (int4)
         RETURNS int4
         AS '_OBJWD_/regress_DLSUFFIX_'
-        LANGUAGE 'c';
+        LANGUAGE 'newC';
 
diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source
index a135a8fa9c2..a8742b7d207 100644
--- a/src/test/regress/input/create_function_2.source
+++ b/src/test/regress/input/create_function_2.source
@@ -28,9 +28,9 @@ CREATE FUNCTION user_relns()
    LANGUAGE 'sql';
 
 CREATE FUNCTION pt_in_widget(point, widget)
-   RETURNS int4
+   RETURNS bool
    AS '_OBJWD_/regress_DLSUFFIX_'
-   LANGUAGE 'c';
+   LANGUAGE 'newC';
 
 CREATE FUNCTION overpaid(emp)
    RETURNS bool
@@ -38,9 +38,9 @@ CREATE FUNCTION overpaid(emp)
    LANGUAGE 'newC';
 
 CREATE FUNCTION boxarea(box)
-   RETURNS int4
+   RETURNS float8
    AS '_OBJWD_/regress_DLSUFFIX_'
-   LANGUAGE 'c';
+   LANGUAGE 'newC';
 
 CREATE FUNCTION interpt_pp(path, path)
    RETURNS point
diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source
index 9eb0ce6e61a..ec7e82ba32f 100644
--- a/src/test/regress/output/create_function_1.source
+++ b/src/test/regress/output/create_function_1.source
@@ -33,4 +33,4 @@ CREATE FUNCTION ttdummy ()
 CREATE FUNCTION set_ttdummy (int4)
         RETURNS int4
         AS '_OBJWD_/regress_DLSUFFIX_'
-        LANGUAGE 'c';
+        LANGUAGE 'newC';
diff --git a/src/test/regress/output/create_function_2.source b/src/test/regress/output/create_function_2.source
index f04cf7356cc..105b35858ab 100644
--- a/src/test/regress/output/create_function_2.source
+++ b/src/test/regress/output/create_function_2.source
@@ -21,17 +21,17 @@ CREATE FUNCTION user_relns()
              relkind <> ''i'' '
    LANGUAGE 'sql';
 CREATE FUNCTION pt_in_widget(point, widget)
-   RETURNS int4
+   RETURNS bool
    AS '_OBJWD_/regress_DLSUFFIX_'
-   LANGUAGE 'c';
+   LANGUAGE 'newC';
 CREATE FUNCTION overpaid(emp)
    RETURNS bool
    AS '_OBJWD_/regress_DLSUFFIX_'
    LANGUAGE 'newC';
 CREATE FUNCTION boxarea(box)
-   RETURNS int4
+   RETURNS float8
    AS '_OBJWD_/regress_DLSUFFIX_'
-   LANGUAGE 'c';
+   LANGUAGE 'newC';
 CREATE FUNCTION interpt_pp(path, path)
    RETURNS point
    AS '_OBJWD_/regress_DLSUFFIX_'
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index c2ffb81ba2c..67c62c8ab65 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.39 2000/06/11 20:07:44 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.40 2000/06/13 07:35:34 tgl Exp $
  */
 
 #include <float.h>				/* faked on sunos */
@@ -23,7 +23,7 @@ extern PATH *poly2path(POLYGON *poly);
 extern Point *interpt_pp(PATH *p1, PATH *p2);
 extern void regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
 extern Datum overpaid(PG_FUNCTION_ARGS);
-extern int	boxarea(BOX *box);
+extern Datum boxarea(PG_FUNCTION_ARGS);
 extern char *reverse_name(char *string);
 
 /*
@@ -203,7 +203,7 @@ typedef struct
 
 WIDGET	   *widget_in(char *str);
 char	   *widget_out(WIDGET * widget);
-int			pt_in_widget(Point *point, WIDGET * widget);
+extern Datum pt_in_widget(PG_FUNCTION_ARGS);
 
 #define NARGS	3
 
@@ -249,30 +249,27 @@ WIDGET	   *widget;
 	return result;
 }
 
-int
-pt_in_widget(point, widget)
-Point	   *point;
-WIDGET	   *widget;
+Datum
+pt_in_widget(PG_FUNCTION_ARGS)
 {
-	extern double point_dt();
+	Point	   *point = PG_GETARG_POINT_P(0);
+	WIDGET	   *widget = (WIDGET *) PG_GETARG_POINTER(1);
 
-	return point_dt(point, &widget->center) < widget->radius;
+	PG_RETURN_BOOL(point_dt(point, &widget->center) < widget->radius);
 }
 
-#define ABS(X) ((X) > 0 ? (X) : -(X))
-
-int
-boxarea(box)
-
-BOX		   *box;
+#define ABS(X) ((X) >= 0 ? (X) : -(X))
 
+Datum
+boxarea(PG_FUNCTION_ARGS)
 {
-	int			width,
+	BOX		   *box = PG_GETARG_BOX_P(0);
+	double		width,
 				height;
 
 	width = ABS(box->high.x - box->low.x);
 	height = ABS(box->high.y - box->low.y);
-	return width * height;
+	PG_RETURN_FLOAT8(width * height);
 }
 
 char *
@@ -419,7 +416,7 @@ funny_dup17(PG_FUNCTION_ARGS)
 }
 
 extern Datum ttdummy(PG_FUNCTION_ARGS);
-int32		set_ttdummy(int32 on);
+extern Datum set_ttdummy(PG_FUNCTION_ARGS);
 
 #define TTDUMMY_INFINITY	999999
 
@@ -622,27 +619,27 @@ ttdummy(PG_FUNCTION_ARGS)
 	return PointerGetDatum(rettuple);
 }
 
-int32
-set_ttdummy(int32 on)
+Datum
+set_ttdummy(PG_FUNCTION_ARGS)
 {
+	int32		on = PG_GETARG_INT32(0);
 
 	if (ttoff)					/* OFF currently */
 	{
 		if (on == 0)
-			return 0;
+			PG_RETURN_INT32(0);
 
 		/* turn ON */
 		ttoff = false;
-		return 0;
+		PG_RETURN_INT32(0);
 	}
 
 	/* ON currently */
 	if (on != 0)
-		return 1;
+		PG_RETURN_INT32(1);
 
 	/* turn OFF */
 	ttoff = true;
 
-	return 1;
-
+	PG_RETURN_INT32(1);
 }