Latest round of fmgr updates. All functions with bool,char, or int2

inputs have been converted to newstyle.  This should go a long way towards
fixing our portability problems with platforms where char and short
parameters are passed differently from int-width parameters.  Still
more to do for the Alpha port however.

1 files changed, 6 insertions, 15 deletions

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 6c27fbe03f..0a6c664e7d 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.45 2000/04/12 17:15:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.46 2000/06/05 07:28:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #include "catalog/pg_type.h"
 #include "lib/stringinfo.h"
 #include "utils/acl.h"
+#include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 
@@ -268,7 +269,6 @@ aclitemout(AclItem *aip)
 	static AclItem default_aclitem = {ACL_ID_WORLD,
 		ACL_IDTYPE_WORLD,
 	ACL_WORLD_DEFAULT};
-	extern char *int2out();
 	char	   *tmpname;
 
 	if (!aip)
@@ -287,20 +287,11 @@ aclitemout(AclItem *aip)
 									   0, 0, 0);
 			if (!HeapTupleIsValid(htup))
 			{
-				char	   *tmp = int2out(aip->ai_id);
-
-#ifdef NOT_USED
-
-				When this	elog(NOTICE) goes to the libpq client,
-							it crashes the
-							client because the NOTICE protocol is coming right in the middle
-							of a request for a field value.We skip the NOTICE for now.
-
-							elog(NOTICE, "aclitemout: usesysid %d not found",
-											 aip->ai_id);
-
-#endif
+				/* Generate numeric UID if we don't find an entry */
+				char	   *tmp;
 
+				tmp = DatumGetCString(DirectFunctionCall1(int4out,
+									  Int32GetDatum((int32) aip->ai_id)));
 				strcat(p, tmp);
 				pfree(tmp);
 			}