diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-01 18:56:19 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-01 18:56:19 +0000 |
| commit | 6c412f0605afeb809014553ff7ad28cf9ed5526b (patch) | |
| tree | 5540a678c19dcfa1a7023e0f59a970fe2a9a79ee /src/backend/utils/adt/arrayfuncs.c | |
| parent | ae793ff63cb9167ea6d0f24ca018ffabad157ece (diff) | |
Change CREATE TYPE to require datatype output and send functions to have
only one argument. (Per recent discussion, the option to accept multiple
arguments is pretty useless for user-defined types, and would be a likely
source of security holes if it was used.) Simplify call sites of
output/send functions to not bother passing more than one argument.
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index ec21eac9c03..794b95e2297 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.119 2005/03/29 03:01:31 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.120 2005/05/01 18:56:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -885,7 +885,6 @@ array_out(PG_FUNCTION_ARGS) bool typbyval; char typalign; char typdelim; - Oid typioparam; char *p, *tmp, *retval, @@ -944,7 +943,6 @@ array_out(PG_FUNCTION_ARGS) typbyval = my_extra->typbyval; typalign = my_extra->typalign; typdelim = my_extra->typdelim; - typioparam = my_extra->typioparam; ndim = ARR_NDIM(v); dims = ARR_DIMS(v); @@ -986,10 +984,8 @@ array_out(PG_FUNCTION_ARGS) bool needquote; itemvalue = fetch_att(p, typbyval, typlen); - values[i] = DatumGetCString(FunctionCall3(&my_extra->proc, - itemvalue, - ObjectIdGetDatum(typioparam), - Int32GetDatum(-1))); + values[i] = DatumGetCString(FunctionCall1(&my_extra->proc, + itemvalue)); p = att_addlength(p, typlen, PointerGetDatum(p)); p = (char *) att_align(p, typalign); @@ -1344,7 +1340,6 @@ array_send(PG_FUNCTION_ARGS) int typlen; bool typbyval; char typalign; - Oid typioparam; char *p; int nitems, i; @@ -1389,7 +1384,6 @@ array_send(PG_FUNCTION_ARGS) typlen = my_extra->typlen; typbyval = my_extra->typbyval; typalign = my_extra->typalign; - typioparam = my_extra->typioparam; ndim = ARR_NDIM(v); dim = ARR_DIMS(v); @@ -1416,9 +1410,8 @@ array_send(PG_FUNCTION_ARGS) itemvalue = fetch_att(p, typbyval, typlen); - outputbytes = DatumGetByteaP(FunctionCall2(&my_extra->proc, - itemvalue, - ObjectIdGetDatum(typioparam))); + outputbytes = DatumGetByteaP(FunctionCall1(&my_extra->proc, + itemvalue)); /* We assume the result will not have been toasted */ pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4); pq_sendbytes(&buf, VARDATA(outputbytes), |