diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-14 05:24:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-14 05:24:50 +0000 |
| commit | ff7b9f55410bbfbd017af331d23371ab61b63d5e (patch) | |
| tree | 6a055be48dd161470503eb2f1a0376bc048ab73b /src/backend/utils/adt | |
| parent | 69cd08d9f79818c8ff8b7b74c7ecfe8dcdb0202c (diff) | |
| download | postgresql-ff7b9f55410bbfbd017af331d23371ab61b63d5e.tar.gz postgresql-ff7b9f55410bbfbd017af331d23371ab61b63d5e.zip | |
I had overlooked the fact that some fmgr-callable functions return void
--- ie, they're only called for side-effects. Add a PG_RETURN_VOID()
macro and use it where appropriate. This probably doesn't change the
machine code by a single bit ... it's just for documentation.
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index d54a6847bd2..aae18aa047f 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.57 2000/06/13 07:35:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.58 2000/06/14 05:24:48 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -187,7 +187,7 @@ array_in(PG_FUNCTION_ARGS) retval = (ArrayType *) palloc(sizeof(ArrayType)); MemSet(retval, 0, sizeof(ArrayType)); *(int32 *) retval = sizeof(ArrayType); - return PointerGetDatum(retval); + PG_RETURN_POINTER(retval); } if (*p == '{') @@ -238,7 +238,7 @@ array_in(PG_FUNCTION_ARGS) PG_RETURN_NULL(); } pfree(string_save); - return PointerGetDatum(retval); + PG_RETURN_POINTER(retval); } /*----------------------------------------------------------------------------- @@ -622,9 +622,6 @@ array_out(PG_FUNCTION_ARGS) int ndim, *dim; - if (v == (ArrayType *) NULL) - PG_RETURN_CSTRING((char *) NULL); - if (ARR_IS_LO(v) == true) { text *p; diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 4d0af92ba2b..7ed17da41f3 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.70 2000/06/09 01:11:09 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.71 2000/06/14 05:24:49 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1934,8 +1934,7 @@ genericcostestimate(PG_FUNCTION_ARGS) *indexTotalCost = numIndexPages + (cpu_index_tuple_cost + cost_qual_eval(indexQuals)) * numIndexTuples; - /* No real return value ... */ - PG_RETURN_POINTER(NULL); + PG_RETURN_VOID(); } /* |