Commit de75f9ef authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

Change parameters to func_error().

parent 3ace5fd0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* See acl.h. * See acl.h.
...@@ -616,7 +616,7 @@ pg_func_ownercheck(char *usename, ...@@ -616,7 +616,7 @@ pg_func_ownercheck(char *usename,
PointerGetDatum(arglist), PointerGetDatum(arglist),
0); 0);
if (!HeapTupleIsValid(htp)) 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; owner_id = ((Form_pg_proc) GETSTRUCT(htp))->proowner;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 * INTERFACE ROUTINES
...@@ -295,7 +295,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo) ...@@ -295,7 +295,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
0); 0);
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
func_error("BuildFuncTupleDesc", funcname, nargs, argtypes); func_error("BuildFuncTupleDesc", funcname, nargs, argtypes, NULL);
retType = ((Form_pg_proc) GETSTRUCT(tuple))->prorettype; retType = ((Form_pg_proc) GETSTRUCT(tuple))->prorettype;
...@@ -1159,8 +1159,7 @@ index_create(char *heapRelationName, ...@@ -1159,8 +1159,7 @@ index_create(char *heapRelationName,
if (!HeapTupleIsValid(proc_tup)) if (!HeapTupleIsValid(proc_tup))
{ {
func_error("index_create", FIgetname(funcInfo), func_error("index_create", FIgetname(funcInfo),
FIgetnArgs(funcInfo), FIgetnArgs(funcInfo), FIgetArglist(funcInfo), NULL);
FIgetArglist(funcInfo));
} }
FIgetProcOid(funcInfo) = proc_tup->t_oid; FIgetProcOid(funcInfo) = proc_tup->t_oid;
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* these routines moved here from commands/define.c and somewhat cleaned up. * these routines moved here from commands/define.c and somewhat cleaned up.
...@@ -550,7 +550,7 @@ OperatorDef(char *operatorName, ...@@ -550,7 +550,7 @@ OperatorDef(char *operatorName,
0); 0);
if (!PointerIsValid(tup)) 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_oprcode - 1] = ObjectIdGetDatum(tup->t_oid);
values[Anum_pg_operator_oprresult - 1] = values[Anum_pg_operator_oprresult - 1] =
...@@ -575,7 +575,7 @@ OperatorDef(char *operatorName, ...@@ -575,7 +575,7 @@ OperatorDef(char *operatorName,
PointerGetDatum(typeId), PointerGetDatum(typeId),
0); 0);
if (!HeapTupleIsValid(tup)) 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); values[Anum_pg_operator_oprrest - 1] = ObjectIdGetDatum(tup->t_oid);
} }
...@@ -601,7 +601,7 @@ OperatorDef(char *operatorName, ...@@ -601,7 +601,7 @@ OperatorDef(char *operatorName,
PointerGetDatum(typeId), PointerGetDatum(typeId),
0); 0);
if (!HeapTupleIsValid(tup)) 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); values[Anum_pg_operator_oprjoin - 1] = ObjectIdGetDatum(tup->t_oid);
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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, ...@@ -438,7 +438,7 @@ TypeCreate(char *typeName,
} }
if (!HeapTupleIsValid(tup)) if (!HeapTupleIsValid(tup))
{ {
func_error("TypeCreate", procname, 1, argList); func_error("TypeCreate", procname, 1, argList, NULL);
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 */ ...@@ -375,7 +375,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
Int32GetDatum(nargs), Int32GetDatum(nargs),
PointerGetDatum(argList), 0); PointerGetDatum(argList), 0);
if (!HeapTupleIsValid(tup)) if (!HeapTupleIsValid(tup))
func_error("RemoveFunction", functionName, nargs, argList); func_error("RemoveFunction", functionName, nargs, argList, NULL);
#ifndef NO_SECURITY #ifndef NO_SECURITY
userName = GetPgUserName(); userName = GetPgUserName();
...@@ -416,7 +416,7 @@ RemoveFunction(char *functionName, /* function name to be removed */ ...@@ -416,7 +416,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
{ {
heap_endscan(scan); heap_endscan(scan);
heap_close(relation); heap_close(relation);
func_error("RemoveFunction", functionName, nargs, argList); func_error("RemoveFunction", functionName, nargs, argList, NULL);
} }
/* ok, function has been found */ /* ok, function has been found */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment