Skip to content

Commit de75f9e

Browse files
author
Thomas G. Lockhart
committed
Change parameters to func_error().
1 parent 3ace5fd commit de75f9e

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

‎src/backend/catalog/aclchk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.9 1998/04/27 04:04:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.10 1998/05/09 23:42:58 thomas Exp $
1111
*
1212
* NOTES
1313
* See acl.h.
@@ -616,7 +616,7 @@ pg_func_ownercheck(char *usename,
616616
PointerGetDatum(arglist),
617617
0);
618618
if (!HeapTupleIsValid(htp))
619-
func_error("pg_func_ownercheck", funcname, nargs, arglist);
619+
func_error("pg_func_ownercheck", funcname, nargs, arglist, NULL);
620620

621621
owner_id = ((Form_pg_proc) GETSTRUCT(htp))->proowner;
622622

‎src/backend/catalog/index.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.40 1998/04/27 04:04:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.41 1998/05/09 23:42:59 thomas Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -295,7 +295,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
295295
0);
296296

297297
if (!HeapTupleIsValid(tuple))
298-
func_error("BuildFuncTupleDesc", funcname, nargs, argtypes);
298+
func_error("BuildFuncTupleDesc", funcname, nargs, argtypes, NULL);
299299

300300
retType = ((Form_pg_proc) GETSTRUCT(tuple))->prorettype;
301301

@@ -1159,8 +1159,7 @@ index_create(char *heapRelationName,
11591159
if (!HeapTupleIsValid(proc_tup))
11601160
{
11611161
func_error("index_create", FIgetname(funcInfo),
1162-
FIgetnArgs(funcInfo),
1163-
FIgetArglist(funcInfo));
1162+
FIgetnArgs(funcInfo), FIgetArglist(funcInfo), NULL);
11641163
}
11651164
FIgetProcOid(funcInfo) = proc_tup->t_oid;
11661165
}

‎src/backend/catalog/pg_operator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.24 1998/04/27 04:05:00 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.25 1998/05/09 23:43:00 thomas Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -550,7 +550,7 @@ OperatorDef(char *operatorName,
550550
0);
551551

552552
if (!PointerIsValid(tup))
553-
func_error("OperatorDef", procedureName, nargs, typeId);
553+
func_error("OperatorDef", procedureName, nargs, typeId, NULL);
554554

555555
values[Anum_pg_operator_oprcode - 1] = ObjectIdGetDatum(tup->t_oid);
556556
values[Anum_pg_operator_oprresult - 1] =
@@ -575,7 +575,7 @@ OperatorDef(char *operatorName,
575575
PointerGetDatum(typeId),
576576
0);
577577
if (!HeapTupleIsValid(tup))
578-
func_error("OperatorDef", restrictionName, 5, typeId);
578+
func_error("OperatorDef", restrictionName, 5, typeId, NULL);
579579

580580
values[Anum_pg_operator_oprrest - 1] = ObjectIdGetDatum(tup->t_oid);
581581
}
@@ -601,7 +601,7 @@ OperatorDef(char *operatorName,
601601
PointerGetDatum(typeId),
602602
0);
603603
if (!HeapTupleIsValid(tup))
604-
func_error("OperatorDef", joinName, 5, typeId);
604+
func_error("OperatorDef", joinName, 5, typeId, NULL);
605605

606606
values[Anum_pg_operator_oprjoin - 1] = ObjectIdGetDatum(tup->t_oid);
607607
}

‎src/backend/catalog/pg_type.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.23 1998/04/27 04:05:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.24 1998/05/09 23:43:00 thomas Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -438,7 +438,7 @@ TypeCreate(char *typeName,
438438
}
439439
if (!HeapTupleIsValid(tup))
440440
{
441-
func_error("TypeCreate", procname, 1, argList);
441+
func_error("TypeCreate", procname, 1, argList, NULL);
442442
}
443443
}
444444

‎src/backend/commands/remove.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.23 1998/04/27 04:05:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.24 1998/05/09 23:43:45 thomas Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -375,7 +375,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
375375
Int32GetDatum(nargs),
376376
PointerGetDatum(argList), 0);
377377
if (!HeapTupleIsValid(tup))
378-
func_error("RemoveFunction", functionName, nargs, argList);
378+
func_error("RemoveFunction", functionName, nargs, argList, NULL);
379379

380380
#ifndef NO_SECURITY
381381
userName = GetPgUserName();
@@ -416,7 +416,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
416416
{
417417
heap_endscan(scan);
418418
heap_close(relation);
419-
func_error("RemoveFunction", functionName, nargs, argList);
419+
func_error("RemoveFunction", functionName, nargs, argList, NULL);
420420
}
421421

422422
/* ok, function has been found */

0 commit comments

Comments
 (0)