More cleanup of userid to be AclId rather than Oid.

2 files changed, 32 insertions, 32 deletions

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index c97e242937a..a0e94b5bbb3 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.83 2002/11/13 00:39:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.84 2002/12/05 04:04:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -703,7 +703,7 @@ has_table_privilege_name(PG_FUNCTION_ARGS)
 {
 	text	   *tablename = PG_GETARG_TEXT_P(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	Oid			tableoid;
 	AclMode		mode;
 	AclResult	aclresult;
@@ -751,7 +751,7 @@ has_table_privilege_id(PG_FUNCTION_ARGS)
 {
 	Oid			tableoid = PG_GETARG_OID(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	AclMode		mode;
 	AclResult	aclresult;
 
@@ -913,7 +913,7 @@ has_database_privilege_name(PG_FUNCTION_ARGS)
 {
 	text	   *databasename = PG_GETARG_TEXT_P(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	Oid			databaseoid;
 	AclMode		mode;
 	AclResult	aclresult;
@@ -961,7 +961,7 @@ has_database_privilege_id(PG_FUNCTION_ARGS)
 {
 	Oid			databaseoid = PG_GETARG_OID(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	AclMode		mode;
 	AclResult	aclresult;
 
@@ -1116,7 +1116,7 @@ has_function_privilege_name(PG_FUNCTION_ARGS)
 {
 	text	   *functionname = PG_GETARG_TEXT_P(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	Oid			functionoid;
 	AclMode		mode;
 	AclResult	aclresult;
@@ -1164,7 +1164,7 @@ has_function_privilege_id(PG_FUNCTION_ARGS)
 {
 	Oid			functionoid = PG_GETARG_OID(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	AclMode		mode;
 	AclResult	aclresult;
 
@@ -1315,7 +1315,7 @@ has_language_privilege_name(PG_FUNCTION_ARGS)
 {
 	text	   *languagename = PG_GETARG_TEXT_P(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	Oid			languageoid;
 	AclMode		mode;
 	AclResult	aclresult;
@@ -1363,7 +1363,7 @@ has_language_privilege_id(PG_FUNCTION_ARGS)
 {
 	Oid			languageoid = PG_GETARG_OID(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	AclMode		mode;
 	AclResult	aclresult;
 
@@ -1514,7 +1514,7 @@ has_schema_privilege_name(PG_FUNCTION_ARGS)
 {
 	text	   *schemaname = PG_GETARG_TEXT_P(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	Oid			schemaoid;
 	AclMode		mode;
 	AclResult	aclresult;
@@ -1562,7 +1562,7 @@ has_schema_privilege_id(PG_FUNCTION_ARGS)
 {
 	Oid			schemaoid = PG_GETARG_OID(0);
 	text	   *priv_type_text = PG_GETARG_TEXT_P(1);
-	int32		usesysid;
+	AclId		usesysid;
 	AclMode		mode;
 	AclResult	aclresult;
 
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 4b9cbfbaa30..b8189e8cc11 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -17,7 +17,7 @@
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.44 2002/11/29 21:39:11 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.45 2002/12/05 04:04:43 momjian Exp $
  *
  * ----------
  */
@@ -171,7 +171,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 	bool		isnull;
 	int			i;
 	int			match_type;
-	Oid			save_uid;
+	AclId		save_uid;
 
 	save_uid = GetUserId();
 
@@ -546,7 +546,7 @@ ri_Check_Pk_Match(Relation pk_rel, HeapTuple old_row, Oid tgoid, int match_type,
 	Datum		check_values[RI_MAX_NUMKEYS];
 	char		check_nulls[RI_MAX_NUMKEYS + 1];
 	int			i;
-	Oid			save_uid;
+	AclId		save_uid;
 	bool		result;
 
 	save_uid = GetUserId();
@@ -712,7 +712,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
 	bool		isnull;
 	int			i;
 	int			match_type;
-	Oid			save_uid;
+	AclId		save_uid;
 
 	save_uid = GetUserId();
 
@@ -942,7 +942,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
 	bool		isnull;
 	int			i;
 	int			match_type;
-	Oid			save_uid;
+	AclId		save_uid;
 
 	save_uid = GetUserId();
 
@@ -1179,8 +1179,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
 	char		del_nulls[RI_MAX_NUMKEYS + 1];
 	bool		isnull;
 	int			i;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -1387,8 +1387,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
 	bool		isnull;
 	int			i;
 	int			j;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -1631,8 +1631,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
 	char		del_nulls[RI_MAX_NUMKEYS + 1];
 	bool		isnull;
 	int			i;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -1854,8 +1854,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
 	char		upd_nulls[RI_MAX_NUMKEYS + 1];
 	bool		isnull;
 	int			i;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -2082,8 +2082,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 	char		upd_nulls[RI_MAX_NUMKEYS + 1];
 	bool		isnull;
 	int			i;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -2301,8 +2301,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 	int			i;
 	int			match_type;
 	bool		use_cached_query;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -2566,8 +2566,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 	char		upd_nulls[RI_MAX_NUMKEYS + 1];
 	bool		isnull;
 	int			i;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId			fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;
 
@@ -2828,8 +2828,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 	bool		isnull;
 	int			i;
 	int			match_type;
-	Oid			save_uid;
-	Oid			fk_owner;
+	AclId		save_uid;
+	AclId		fk_owner;
 
 	ReferentialIntegritySnapshotOverride = true;