*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.56 2000/06/13 07:34:27 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.57 2000/06/14 05:24:35 tgl Exp $
*
*-------------------------------------------------------------------------
*/
pfree(nulls);
pfree(d);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
WriteBuffer(buf);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
void
}
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
gistfreestack(p->s_markstk);
p->s_markstk = o;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
gistfreestack(p->s_stack);
p->s_stack = o;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
gistdropscan(s);
/* XXX don't unset read lock -- two-phase locking */
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
static void
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.38 2000/06/13 07:34:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.39 2000/06/14 05:24:35 tgl Exp $
*
* NOTES
* This file contains only the public interface routines.
/* all done */
BuildingHash = false;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
scan->numberOfKeys * sizeof(ScanKeyData));
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
/* be tidy */
pfree(scan->opaque);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
scan->currentMarkData = scan->currentItemData;
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
scan->currentItemData = scan->currentMarkData;
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/* stubs */
/* delete the data from the page */
_hash_pagedel(rel, tid);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.56 2000/06/13 07:34:38 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.57 2000/06/14 05:24:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
/* all done */
BuildingBtree = false;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
so->numberOfKeys * sizeof(ScanKeyData));
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
void
_bt_dropscan(scan);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
so->mrkHeapIptr = so->curHeapIptr;
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
so->curHeapIptr = so->mrkHeapIptr;
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/* stubs */
/* delete the data from the page */
_bt_pagedel(rel, tid);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
static void
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.26 2000/06/13 07:34:49 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.27 2000/06/14 05:24:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "utils/builtins.h"
-BOX
- *
+BOX *
rt_box_union(BOX *a, BOX *b)
{
BOX *n;
*size = (float) (xdim * ydim);
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
POLYGON *
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.48 2000/06/13 07:34:49 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.49 2000/06/14 05:24:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
pfree(nulls);
pfree(d);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
/*
WriteBuffer(buf);
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
static void
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.33 2000/06/13 07:34:49 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.34 2000/06/14 05:24:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
}
}
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
freestack(p->s_markstk);
p->s_markstk = o;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
freestack(p->s_stack);
p->s_stack = o;
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
Datum
rtdropscan(s);
/* XXX don't unset read lock -- two-phase locking */
- PG_RETURN_POINTER(NULL); /* no real return value */
+ PG_RETURN_VOID();
}
static void
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
retval = (ArrayType *) palloc(sizeof(ArrayType));
MemSet(retval, 0, sizeof(ArrayType));
*(int32 *) retval = sizeof(ArrayType);
- return PointerGetDatum(retval);
+ PG_RETURN_POINTER(retval);
}
if (*p == '{')
PG_RETURN_NULL();
}
pfree(string_save);
- return PointerGetDatum(retval);
+ PG_RETURN_POINTER(retval);
}
/*-----------------------------------------------------------------------------
int ndim,
*dim;
- if (v == (ArrayType *) NULL)
- PG_RETURN_CSTRING((char *) NULL);
-
if (ARR_IS_LO(v) == true)
{
text *p;
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
*indexTotalCost = numIndexPages +
(cpu_index_tuple_cost + cost_qual_eval(indexQuals)) * numIndexTuples;
- /* No real return value ... */
- PG_RETURN_POINTER(NULL);
+ PG_RETURN_VOID();
}
/*
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: fmgr.h,v 1.5 2000/06/13 07:35:23 tgl Exp $
+ * $Id: fmgr.h,v 1.6 2000/06/14 05:24:50 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#define PG_RETURN_NULL() \
do { fcinfo->isnull = true; return (Datum) 0; } while (0)
+/* A few internal functions return void (which is not the same as NULL!) */
+#define PG_RETURN_VOID() return (Datum) 0
+
/* Macros for returning results of standard types */
#define PG_RETURN_INT32(x) return Int32GetDatum(x)