diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-11-10 07:25:14 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-11-10 07:25:14 +0000 |
| commit | 8fee9615ccdfb7ed99de3dfe0d964952ed45d978 (patch) | |
| tree | b13cf68a8e97d5e89a106fd7da9c3b524ad7a8c2 /src/backend/utils/adt/arrayfuncs.c | |
| parent | 78822b328c2907accf590d5473a0508ea3ee07a5 (diff) | |
| download | postgresql-8fee9615ccdfb7ed99de3dfe0d964952ed45d978.tar.gz postgresql-8fee9615ccdfb7ed99de3dfe0d964952ed45d978.zip | |
Merge palloc()/MemSet(0) calls into a single palloc0() call.
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 1b6a4d9e0fd..3340449b1a2 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.82 2002/11/08 17:27:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.83 2002/11/10 07:25:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -235,8 +235,7 @@ array_in(PG_FUNCTION_ARGS) if (nitems == 0) { /* Return empty array */ - retval = (ArrayType *) palloc(sizeof(ArrayType)); - MemSet(retval, 0, sizeof(ArrayType)); + retval = (ArrayType *) palloc0(sizeof(ArrayType)); retval->size = sizeof(ArrayType); retval->elemtype = element_type; PG_RETURN_ARRAYTYPE_P(retval); @@ -249,8 +248,7 @@ array_in(PG_FUNCTION_ARGS) typmod, typdelim, typlen, typbyval, typalign, &nbytes); nbytes += ARR_OVERHEAD(ndim); - retval = (ArrayType *) palloc(nbytes); - MemSet(retval, 0, nbytes); + retval = (ArrayType *) palloc0(nbytes); retval->size = nbytes; retval->ndim = ndim; retval->elemtype = element_type; @@ -397,8 +395,7 @@ ReadArrayStr(char *arrayStr, prod[MAXDIM]; mda_get_prod(ndim, dim, prod); - values = (Datum *) palloc(nitems * sizeof(Datum)); - MemSet(values, 0, nitems * sizeof(Datum)); + values = (Datum *) palloc0(nitems * sizeof(Datum)); MemSet(indx, 0, sizeof(indx)); /* read array enclosed within {} */ @@ -514,10 +511,7 @@ ReadArrayStr(char *arrayStr, if (!typbyval) for (i = 0; i < nitems; i++) if (values[i] == (Datum) 0) - { - values[i] = PointerGetDatum(palloc(typlen)); - MemSet(DatumGetPointer(values[i]), 0, typlen); - } + values[i] = PointerGetDatum(palloc0(typlen)); } else { @@ -1593,8 +1587,7 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType) /* Allocate and initialize the result array */ nbytes += ARR_OVERHEAD(ndim); - result = (ArrayType *) palloc(nbytes); - MemSet(result, 0, nbytes); + result = (ArrayType *) palloc0(nbytes); result->size = nbytes; result->ndim = ndim; |