diff options
Diffstat (limited to 'src/backend/parser')
-rw-r--r-- | src/backend/parser/parse_coerce.c | 6 | ||||
-rw-r--r-- | src/backend/parser/parse_func.c | 30 | ||||
-rw-r--r-- | src/backend/parser/parse_target.c | 6 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 95315d6c824..6ddc090bb0b 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.26 1999/12/10 07:37:35 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.27 2000/01/10 17:14:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,7 +142,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids) HeapTuple ftup; int i; Type tp; - Oid oid_array[MAXFARGS]; + Oid oid_array[FUNC_MAX_ARGS]; /* run through argument list... */ for (i = 0; i < nargs; i++) @@ -170,7 +170,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids) */ else if (input_typeids[i] != UNKNOWNOID) { - MemSet(oid_array, 0, MAXFARGS * sizeof(Oid)); + MemSet(oid_array, 0, FUNC_MAX_ARGS * sizeof(Oid)); oid_array[0] = input_typeids[i]; /* diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 2a197237841..1f63f6bc669 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.65 1999/12/16 22:19:48 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.66 2000/01/10 17:14:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -236,7 +236,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, Oid relid; int nargs = length(fargs); Func *funcnode; - Oid oid_array[MAXFARGS]; + Oid oid_array[FUNC_MAX_ARGS]; Oid *true_oid_array; Node *retval; bool retset; @@ -435,7 +435,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, * transform relation name arguments into varnodes of the appropriate * form. */ - MemSet(oid_array, 0, MAXFARGS * sizeof(Oid)); + MemSet(oid_array, 0, FUNC_MAX_ARGS * sizeof(Oid)); nargs = 0; foreach(i, fargs) @@ -463,7 +463,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, refname); #endif } - + relname = rte->relname; vnum = refnameRangeTablePosn(pstate, rte->refname, NULL); @@ -496,12 +496,12 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, } /* Most of the rest of the parser just assumes that functions do not - * have more than MAXFARGS parameters. We have to test here to protect + * have more than FUNC_MAX_ARGS parameters. We have to test here to protect * against array overruns, etc. */ - if (nargs >= MAXFARGS) + if (nargs >= FUNC_MAX_ARGS) elog(ERROR, "Cannot pass more than %d arguments to a function", - MAXFARGS); + FUNC_MAX_ARGS); oid_array[nargs++] = toid; } @@ -710,8 +710,8 @@ func_get_candidates(char *funcname, int nargs) current_candidate = (CandidateList) palloc(sizeof(struct _CandidateList)); current_candidate->args = (Oid *) - palloc(MAXFARGS * sizeof(Oid)); - MemSet(current_candidate->args, 0, MAXFARGS * sizeof(Oid)); + palloc(FUNC_MAX_ARGS * sizeof(Oid)); + MemSet(current_candidate->args, 0, FUNC_MAX_ARGS * sizeof(Oid)); for (i = 0; i < nargs; i++) current_candidate->args[i] = pgProcP->proargtypes[i]; @@ -1067,9 +1067,9 @@ argtype_inherit(int nargs, Oid *oid_array) { Oid relid; int i; - InhPaths arginh[MAXFARGS]; + InhPaths arginh[FUNC_MAX_ARGS]; - for (i = 0; i < MAXFARGS; i++) + for (i = 0; i < FUNC_MAX_ARGS; i++) { if (i < nargs) { @@ -1203,7 +1203,7 @@ gen_cross_product(InhPaths *arginh, int nargs) Oid *oneres; int i, j; - int cur[MAXFARGS]; + int cur[FUNC_MAX_ARGS]; nanswers = 1; for (i = 0; i < nargs; i++) @@ -1217,8 +1217,8 @@ gen_cross_product(InhPaths *arginh, int nargs) /* compute the cross product from right to left */ for (;;) { - oneres = (Oid *) palloc(MAXFARGS * sizeof(Oid)); - MemSet(oneres, 0, MAXFARGS * sizeof(Oid)); + oneres = (Oid *) palloc(FUNC_MAX_ARGS * sizeof(Oid)); + MemSet(oneres, 0, FUNC_MAX_ARGS * sizeof(Oid)); for (i = nargs - 1; i >= 0 && cur[i] > arginh[i].nsupers; i--) continue; @@ -1508,7 +1508,7 @@ ParseComplexProjection(ParseState *pstate, void func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg) { - char p[(NAMEDATALEN + 2) * MAXFMGRARGS], + char p[(NAMEDATALEN + 2) * FUNC_MAX_ARGS], *ptr; int i; diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index a5e130b8543..503f544e9ed 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.50 1999/12/10 07:37:35 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.51 2000/01/10 17:14:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -318,14 +318,14 @@ SizeTargetExpr(ParseState *pstate, int32 attrtypmod) { char *funcname; - Oid oid_array[MAXFARGS]; + Oid oid_array[FUNC_MAX_ARGS]; HeapTuple ftup; int i; funcname = typeidTypeName(attrtype); oid_array[0] = attrtype; oid_array[1] = INT4OID; - for (i = 2; i < MAXFARGS; i++) + for (i = 2; i < FUNC_MAX_ARGS; i++) oid_array[i] = InvalidOid; /* attempt to find with arguments exactly as specified... */ |