Change parameters to func_error().

diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 813e06a10243b86426aea8b2389966288e5e74db..14fb51fdd30c559eb9a3045785f4a5dcaaf9e8bc 100644 (file)
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.9 1998/04/27 04:04:36 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.10 1998/05/09 23:42:58 thomas Exp $
  *
  * NOTES
  *       See acl.h.
@@ -616,7 +616,7 @@ pg_func_ownercheck(char *usename,
                                                          PointerGetDatum(arglist),
                                                          0);
        if (!HeapTupleIsValid(htp))
-               func_error("pg_func_ownercheck", funcname, nargs, arglist);
+               func_error("pg_func_ownercheck", funcname, nargs, arglist, NULL);
 
        owner_id = ((Form_pg_proc) GETSTRUCT(htp))->proowner;
 

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7913c68eda368e1122748c3bf1bd538852788ecd..aca9fdf6ec2c33f1f09476a27bf7290ebdd183ba 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.40 1998/04/27 04:04:55 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.41 1998/05/09 23:42:59 thomas Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -295,7 +295,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
                                                                0);
 
        if (!HeapTupleIsValid(tuple))
-               func_error("BuildFuncTupleDesc", funcname, nargs, argtypes);
+               func_error("BuildFuncTupleDesc", funcname, nargs, argtypes, NULL);
 
        retType = ((Form_pg_proc) GETSTRUCT(tuple))->prorettype;
 
@@ -1159,8 +1159,7 @@ index_create(char *heapRelationName,
                if (!HeapTupleIsValid(proc_tup))
                {
                        func_error("index_create", FIgetname(funcInfo),
-                                          FIgetnArgs(funcInfo),
-                                          FIgetArglist(funcInfo));
+                                          FIgetnArgs(funcInfo), FIgetArglist(funcInfo), NULL);
                }
                FIgetProcOid(funcInfo) = proc_tup->t_oid;
        }

diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 826b4f6a64c67967489043ab388376caac64c22c..1a7f282bde9e4cde91ba12971107d00f764c7b12 100644 (file)
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.24 1998/04/27 04:05:00 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.25 1998/05/09 23:43:00 thomas Exp $
  *
  * NOTES
  *       these routines moved here from commands/define.c and somewhat cleaned up.
@@ -550,7 +550,7 @@ OperatorDef(char *operatorName,
                                                          0);
 
        if (!PointerIsValid(tup))
-               func_error("OperatorDef", procedureName, nargs, typeId);
+               func_error("OperatorDef", procedureName, nargs, typeId, NULL);
 
        values[Anum_pg_operator_oprcode - 1] = ObjectIdGetDatum(tup->t_oid);
        values[Anum_pg_operator_oprresult - 1] =
@@ -575,7 +575,7 @@ OperatorDef(char *operatorName,
                                                                  PointerGetDatum(typeId),
                                                                  0);
                if (!HeapTupleIsValid(tup))
-                       func_error("OperatorDef", restrictionName, 5, typeId);
+                       func_error("OperatorDef", restrictionName, 5, typeId, NULL);
 
                values[Anum_pg_operator_oprrest - 1] = ObjectIdGetDatum(tup->t_oid);
        }
@@ -601,7 +601,7 @@ OperatorDef(char *operatorName,
                                                                  PointerGetDatum(typeId),
                                                                  0);
                if (!HeapTupleIsValid(tup))
-                       func_error("OperatorDef", joinName, 5, typeId);
+                       func_error("OperatorDef", joinName, 5, typeId, NULL);
 
                values[Anum_pg_operator_oprjoin - 1] = ObjectIdGetDatum(tup->t_oid);
        }

diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 55e1d4e2b397f852aef99e6642691c65504e355b..c67cbe1546988df0f45961acf131bd440a021916 100644 (file)
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.23 1998/04/27 04:05:04 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.24 1998/05/09 23:43:00 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -438,7 +438,7 @@ TypeCreate(char *typeName,
                        }
                        if (!HeapTupleIsValid(tup))
                        {
-                               func_error("TypeCreate", procname, 1, argList);
+                               func_error("TypeCreate", procname, 1, argList, NULL);
                        }
                }
 

diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 5a33f1999f26194c9d6e64c3df2533800dc36749..1eeccd9ac48fd0f89357726fcfb034044fbcaa79 100644 (file)
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.23 1998/04/27 04:05:19 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.24 1998/05/09 23:43:45 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -375,7 +375,7 @@ RemoveFunction(char *functionName,          /* function name to be removed */
                                                          Int32GetDatum(nargs),
                                                          PointerGetDatum(argList), 0);
        if (!HeapTupleIsValid(tup))
-               func_error("RemoveFunction", functionName, nargs, argList);
+               func_error("RemoveFunction", functionName, nargs, argList, NULL);
 
 #ifndef NO_SECURITY
        userName = GetPgUserName();
@@ -416,7 +416,7 @@ RemoveFunction(char *functionName,          /* function name to be removed */
        {
                heap_endscan(scan);
                heap_close(relation);
-               func_error("RemoveFunction", functionName, nargs, argList);
+               func_error("RemoveFunction", functionName, nargs, argList, NULL);
        }
 
        /* ok, function has been found */