Use fmgr_array_args() to avoid dependency on FUNC_MAX_ARGS.

tglsfdc · tglsfdc · commit 0b14b0c87eaf · 2000-01-12T05:28:47.000Z
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.35 2000/01/11 03:33:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.36 2000/01/12 05:28:47 tgl Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -280,6 +280,7 @@ HandleFunctionRequest()
 	int			tmp;
 	char	   *arg[FUNC_MAX_ARGS];
 	char	   *retval;
+	bool		isNull;
 	int			i;
 	uint32		palloced;
 	char	   *p;
@@ -361,12 +362,7 @@ HandleFunctionRequest()
 	}
 
 #ifndef NO_FASTPATH
-	retval = fmgr(fid,
-				  arg[0], arg[1], arg[2], arg[3],
-				  arg[4], arg[5], arg[6], arg[7],
-				  arg[8], arg[9], arg[10], arg[11],
-				  arg[12], arg[13], arg[14], arg[15]);
-
+	retval = fmgr_array_args(fid, nargs, arg, &isNull);
 #else
 	retval = NULL;
 #endif	 /* NO_FASTPATH */
