diff options
| author | Neil Conway <neilc@samurai.com> | 2004-01-07 18:56:30 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-01-07 18:56:30 +0000 |
| commit | 192ad63bd765d448e91389c6ff1d75f8b18bb268 (patch) | |
| tree | 85873642a16b5ac877dc443a681fe9249c210693 /src/backend/utils/adt/arrayfuncs.c | |
| parent | afca5d50dc296580925b560fff0eb75bb48f0cbe (diff) | |
| download | postgresql-192ad63bd765d448e91389c6ff1d75f8b18bb268.tar.gz postgresql-192ad63bd765d448e91389c6ff1d75f8b18bb268.zip | |
More janitorial work: remove the explicit casting of NULL literals to a
pointer type when it is not necessary to do so.
For future reference, casting NULL to a pointer type is only necessary
when (a) invoking a function AND either (b) the function has no prototype
OR (c) the function is a varargs function.
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 94a5de09d90..ba734a09752 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.101 2003/11/29 19:51:57 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.102 2004/01/07 18:56:28 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -307,10 +307,8 @@ array_in(PG_FUNCTION_ARGS) retval->size = nbytes; retval->ndim = ndim; retval->elemtype = element_type; - memcpy((char *) ARR_DIMS(retval), (char *) dim, - ndim * sizeof(int)); - memcpy((char *) ARR_LBOUND(retval), (char *) lBound, - ndim * sizeof(int)); + memcpy(ARR_DIMS(retval), dim, ndim * sizeof(int)); + memcpy(ARR_LBOUND(retval), lBound, ndim * sizeof(int)); CopyArrayEls(ARR_DATA_PTR(retval), dataPtr, nitems, typlen, typbyval, typalign, true); @@ -972,10 +970,8 @@ array_recv(PG_FUNCTION_ARGS) retval->size = nbytes; retval->ndim = ndim; retval->elemtype = element_type; - memcpy((char *) ARR_DIMS(retval), (char *) dim, - ndim * sizeof(int)); - memcpy((char *) ARR_LBOUND(retval), (char *) lBound, - ndim * sizeof(int)); + memcpy(ARR_DIMS(retval), dim, ndim * sizeof(int)); + memcpy(ARR_LBOUND(retval), lBound, ndim * sizeof(int)); CopyArrayEls(ARR_DATA_PTR(retval), dataPtr, nitems, typlen, typbyval, typalign, true); @@ -1384,7 +1380,7 @@ array_ref(ArrayType *array, char *arraydataptr, *retptr; - if (array == (ArrayType *) NULL) + if (array == NULL) RETURN_NULL(Datum); if (arraylen > 0) @@ -1463,7 +1459,7 @@ array_get_slice(ArrayType *array, int bytes, span[MAXDIM]; - if (array == (ArrayType *) NULL) + if (array == NULL) RETURN_NULL(ArrayType *); if (arraylen > 0) @@ -1602,7 +1598,7 @@ array_set(ArrayType *array, lenbefore, lenafter; - if (array == (ArrayType *) NULL) + if (array == NULL) RETURN_NULL(ArrayType *); if (arraylen > 0) @@ -1798,9 +1794,9 @@ array_set_slice(ArrayType *array, lenbefore, lenafter; - if (array == (ArrayType *) NULL) + if (array == NULL) RETURN_NULL(ArrayType *); - if (srcArray == (ArrayType *) NULL) + if (srcArray == NULL) return array; if (arraylen > 0) @@ -2279,8 +2275,8 @@ construct_md_array(Datum *elems, result->ndim = ndims; result->flags = 0; result->elemtype = elmtype; - memcpy((char *) ARR_DIMS(result), (char *) dims, ndims * sizeof(int)); - memcpy((char *) ARR_LBOUND(result), (char *) lbs, ndims * sizeof(int)); + memcpy(ARR_DIMS(result), dims, ndims * sizeof(int)); + memcpy(ARR_LBOUND(result), lbs, ndims * sizeof(int)); CopyArrayEls(ARR_DATA_PTR(result), elems, nelems, elmlen, elmbyval, elmalign, false); |