diff --git a/contrib/datetime/datetime_functions.c b/contrib/datetime/datetime_functions.c
index a59bd20db6434ae8af5f7cbfe5f2b20e4327a449..d2c097583cf91d61a3644b2c7c405cc132e8f3a5 100644
--- a/contrib/datetime/datetime_functions.c
+++ b/contrib/datetime/datetime_functions.c
@@ -14,7 +14,7 @@
TimeADT *
-time_difference(TimeADT * time1, TimeADT * time2)
+time_difference(TimeADT *time1, TimeADT *time2)
{
TimeADT *result = (TimeADT *) palloc(sizeof(TimeADT));
@@ -51,25 +51,25 @@ currentdate()
}
int4
-hours(TimeADT * time)
+hours(TimeADT *time)
{
return (*time / (60 * 60));
}
int4
-minutes(TimeADT * time)
+minutes(TimeADT *time)
{
return (((int) (*time / 60)) % 60);
}
int4
-seconds(TimeADT * time)
+seconds(TimeADT *time)
{
return (((int) *time) % 60);
}
int4
-day(DateADT * date)
+day(DateADT *date)
{
struct tm tm;
@@ -80,7 +80,7 @@ day(DateADT * date)
}
int4
-month(DateADT * date)
+month(DateADT *date)
{
struct tm tm;
@@ -91,7 +91,7 @@ month(DateADT * date)
}
int4
-year(DateADT * date)
+year(DateADT *date)
{
struct tm tm;
@@ -102,7 +102,7 @@ year(DateADT * date)
}
int4
-asminutes(TimeADT * time)
+asminutes(TimeADT *time)
{
int seconds = (int) *time;
@@ -110,7 +110,7 @@ asminutes(TimeADT * time)
}
int4
-asseconds(TimeADT * time)
+asseconds(TimeADT *time)
{
int seconds = (int) *time;
diff --git a/contrib/int8/int8.c b/contrib/int8/int8.c
index ac59515a2c8b980afe48ad016439b47f8532f2dc..6685370592a0c10a329523592fa8a5d0a971654f 100644
--- a/contrib/int8/int8.c
+++ b/contrib/int8/int8.c
@@ -71,7 +71,7 @@ int64 *int48(int32 val);
int32 int84(int64 * val);
#if FALSE
-int64 *int28(int16 val);
+int64 *int28 (int16 val);
int16 int82(int64 * val);
#endif
@@ -340,7 +340,7 @@ int84(int64 * val)
#if FALSE
int64 *
-int28(int16 val)
+int28 (int16 val)
{
int64 *result;
diff --git a/contrib/pginterface/halt.c b/contrib/pginterface/halt.c
index a9db390de7d4da5a8ef72153a472df6464115f79..f56385898f84c6bd97165714d31fd9c7c7e3975a 100644
--- a/contrib/pginterface/halt.c
+++ b/contrib/pginterface/halt.c
@@ -44,17 +44,17 @@ va_dcl
fflush(stderr);
/* call one clean up function if defined */
- if ((sig_func = signal(SIGTERM, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ if ((sig_func = signal(SIGTERM, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGHUP, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGHUP, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGINT, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGINT, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGQUIT, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGQUIT, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
exit(1);
}
diff --git a/contrib/soundex/soundex.c b/contrib/soundex/soundex.c
index 9b06808fa2736502774423e48600f2b742f0be57..20b99759a16aca4c8a42b9bf126917d751c4760b 100644
--- a/contrib/soundex/soundex.c
+++ b/contrib/soundex/soundex.c
@@ -14,7 +14,7 @@
char *soundex(char *instr, char *outstr);
text *
-text_soundex(text * t)
+text_soundex(text *t)
{
/* ABCDEFGHIJKLMNOPQRSTUVWXYZ */
char *table = "01230120022455012623010202";
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 9ce59d8165cdc1082d00c0f7a0675a082f688f44..ee3c3e9e351297c16b281ab67ee176017c7f999d 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.23 1997/09/08 02:19:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.24 1997/09/08 21:40:18 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -116,7 +116,7 @@ DataFill(char *data,
Datum value[],
char nulls[],
char *infomask,
- bits8 * bit)
+ bits8 *bit)
{
bits8 *bitP = 0;
int bitmask = 0;
@@ -448,7 +448,7 @@ char *
fastgetattr(HeapTuple tup,
int attnum,
TupleDesc tupleDesc,
- bool * isnull)
+ bool *isnull)
{
char *tp; /* ptr to att in tuple */
bits8 *bp = NULL; /* ptr to att in tuple */
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index e0a6e2ba5cab4b706ac9b9a45e69ac31102bc543..d2f1ba92abd48b106c6948d41fe4a9201f7a2ede 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.17 1997/09/08 02:19:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.18 1997/09/08 21:40:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
static Size IndexInfoFindDataOffset(unsigned short t_info);
static char *
fastgetiattr(IndexTuple tup, int attnum,
- TupleDesc att, bool * isnull);
+ TupleDesc att, bool *isnull);
/* ----------------------------------------------------------------
* index_ tuple interface routines
@@ -137,7 +137,7 @@ static char *
fastgetiattr(IndexTuple tup,
int attnum,
TupleDesc tupleDesc,
- bool * isnull)
+ bool *isnull)
{
register char *tp; /* ptr to att in tuple */
register char *bp = NULL; /* ptr to att in tuple */
@@ -368,7 +368,7 @@ fastgetiattr(IndexTuple tup,
off = SHORTALIGN(off) +sizeof(short);
break;
case sizeof(int32):
- off = INTALIGN(off) + sizeof(int32);
+ off = INTALIGN(off) +sizeof(int32);
break;
case -1:
usecache = false;
@@ -430,7 +430,7 @@ Datum
index_getattr(IndexTuple tuple,
AttrNumber attNum,
TupleDesc tupDesc,
- bool * isNullOutP)
+ bool *isNullOutP)
{
Assert(attNum > 0);
@@ -483,7 +483,7 @@ IndexInfoFindDataOffset(unsigned short t_info)
* we assume we have space that is already palloc'ed.
*/
void
-CopyIndexTuple(IndexTuple source, IndexTuple * target)
+CopyIndexTuple(IndexTuple source, IndexTuple *target)
{
Size size;
IndexTuple ret;
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index f0bcd60493e6a019b629f6715961c81e7343b24b..18be4d120cd97a4cc4d9e878ec30b21746c7f1f4 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.22 1997/09/08 20:53:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.23 1997/09/08 21:40:27 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -437,7 +437,7 @@ TupleDescMakeSelfReference(TupleDesc desc,
* ----------------------------------------------------------------
*/
TupleDesc
-BuildDescForRelation(List * schema, char *relname)
+BuildDescForRelation(List *schema, char *relname)
{
int natts;
AttrNumber attnum;
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index b35cf77573e45c724745629795769408e1e682ec..a66244eda05748198fed0c0e22bcb2dbc797131c 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -34,42 +34,42 @@
/* non-export function prototypes */
static InsertIndexResult
gistdoinsert(Relation r, IndexTuple itup,
- GISTSTATE * GISTstate);
+ GISTSTATE *GISTstate);
static InsertIndexResult
-gistentryinsert(Relation r, GISTSTACK * stk,
+gistentryinsert(Relation r, GISTSTACK *stk,
IndexTuple tup,
- GISTSTATE * giststate);
+ GISTSTATE *giststate);
static void
-gistentryinserttwo(Relation r, GISTSTACK * stk, IndexTuple ltup,
- IndexTuple rtup, GISTSTATE * giststate);
+gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
+ IndexTuple rtup, GISTSTATE *giststate);
static void
-gistAdjustKeys(Relation r, GISTSTACK * stk, BlockNumber blk,
- char *datum, int att_size, GISTSTATE * giststate);
+gistAdjustKeys(Relation r, GISTSTACK *stk, BlockNumber blk,
+ char *datum, int att_size, GISTSTATE *giststate);
static void
-gistintinsert(Relation r, GISTSTACK * stk, IndexTuple ltup,
- IndexTuple rtup, GISTSTATE * giststate);
+gistintinsert(Relation r, GISTSTACK *stk, IndexTuple ltup,
+ IndexTuple rtup, GISTSTATE *giststate);
static InsertIndexResult
gistSplit(Relation r, Buffer buffer,
- GISTSTACK * stack, IndexTuple itup,
- GISTSTATE * giststate);
+ GISTSTACK *stack, IndexTuple itup,
+ GISTSTATE *giststate);
static void
-gistnewroot(GISTSTATE * giststate, Relation r, IndexTuple lt,
+gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt,
IndexTuple rt);
static void GISTInitBuffer(Buffer b, uint32 f);
static BlockNumber
gistChooseSubtree(Relation r, IndexTuple itup, int level,
- GISTSTATE * giststate,
- GISTSTACK ** retstack, Buffer *leafbuf);
+ GISTSTATE *giststate,
+ GISTSTACK **retstack, Buffer *leafbuf);
static OffsetNumber
gistchoose(Relation r, Page p, IndexTuple it,
- GISTSTATE * giststate);
+ GISTSTATE *giststate);
static int gistnospace(Page p, IndexTuple it);
void gistdelete(Relation r, ItemPointer tid);
static IndexTuple gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t);
static void
-gistcentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr,
+gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
Relation r, Page pg, OffsetNumber o, int b, bool l);
-static char *int_range_out(INTRANGE * r);
+static char *int_range_out(INTRANGE *r);
/*
** routine to build an index. Basically calls insert over and over
@@ -81,9 +81,9 @@ gistbuild(Relation heap,
AttrNumber *attnum,
IndexStrategy istrat,
uint16 pint,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo)
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo)
{
HeapScanDesc scan;
Buffer buffer;
@@ -328,7 +328,7 @@ gistbuild(Relation heap,
* It doesn't do any work; just locks the relation and passes the buck.
*/
InsertIndexResult
-gistinsert(Relation r, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
+gistinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
{
InsertIndexResult res;
IndexTuple itup;
@@ -374,15 +374,15 @@ gistinsert(Relation r, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation
** on the page, for example, or do something special for leaf nodes.)
*/
static OffsetNumber
-gistPageAddItem(GISTSTATE * giststate,
+gistPageAddItem(GISTSTATE *giststate,
Relation r,
Page page,
Item item,
Size size,
OffsetNumber offsetNumber,
ItemIdFlags flags,
- GISTENTRY * dentry,
- IndexTuple * newtup)
+ GISTENTRY *dentry,
+ IndexTuple *newtup)
{
GISTENTRY tmpcentry;
IndexTuple itup = (IndexTuple) item;
@@ -403,7 +403,7 @@ gistPageAddItem(GISTSTATE * giststate,
&& tmpcentry.pred != (((char *) itup) + sizeof(IndexTupleData)))
pfree(tmpcentry.pred);
- return (PageAddItem(page, (Item) * newtup, IndexTupleSize(*newtup),
+ return (PageAddItem(page, (Item) *newtup, IndexTupleSize(*newtup),
offsetNumber, flags));
}
@@ -411,7 +411,7 @@ gistPageAddItem(GISTSTATE * giststate,
static InsertIndexResult
gistdoinsert(Relation r,
IndexTuple itup, /* itup contains compressed entry */
- GISTSTATE * giststate)
+ GISTSTATE *giststate)
{
GISTENTRY tmpdentry;
InsertIndexResult res;
@@ -468,8 +468,8 @@ static BlockNumber
gistChooseSubtree(Relation r, IndexTuple itup, /* itup has compressed
* entry */
int level,
- GISTSTATE * giststate,
- GISTSTACK ** retstack /* out */ ,
+ GISTSTATE *giststate,
+ GISTSTACK **retstack /* out */ ,
Buffer *leafbuf /* out */ )
{
Buffer buffer;
@@ -520,11 +520,11 @@ gistChooseSubtree(Relation r, IndexTuple itup, /* itup has compressed
static void
gistAdjustKeys(Relation r,
- GISTSTACK * stk,
+ GISTSTACK *stk,
BlockNumber blk,
char *datum, /* datum is uncompressed */
int att_size,
- GISTSTATE * giststate)
+ GISTSTATE *giststate)
{
char *oldud;
Page p;
@@ -603,14 +603,14 @@ gistAdjustKeys(Relation r,
/* delete old tuple */
ItemPointerSet(&oldtid, stk->gs_blk, stk->gs_child);
- gistdelete(r, (ItemPointer) & oldtid);
+ gistdelete(r, (ItemPointer) &oldtid);
/* generate and insert new tuple */
tupDesc = r->rd_att;
isnull = (char *) palloc(r->rd_rel->relnatts);
memset(isnull, ' ', r->rd_rel->relnatts);
newtup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & centry.pred, isnull);
+ (Datum *) ¢ry.pred, isnull);
pfree(isnull);
/* set pointer in new tuple to point to current child */
ItemPointerSet(&oldtid, blk, 1);
@@ -644,9 +644,9 @@ gistAdjustKeys(Relation r,
static InsertIndexResult
gistSplit(Relation r,
Buffer buffer,
- GISTSTACK * stack,
+ GISTSTACK *stack,
IndexTuple itup, /* contains compressed entry */
- GISTSTATE * giststate)
+ GISTSTATE *giststate)
{
Page p;
Buffer leftbuf,
@@ -861,9 +861,9 @@ gistSplit(Relation r,
tupDesc = r->rd_att;
ltup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & (v.spl_ldatum), isnull);
+ (Datum *) &(v.spl_ldatum), isnull);
rtup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & (v.spl_rdatum), isnull);
+ (Datum *) &(v.spl_rdatum), isnull);
pfree(isnull);
/* set pointers to new child pages in the internal index tuples */
@@ -884,10 +884,10 @@ gistSplit(Relation r,
*/
static void
gistintinsert(Relation r,
- GISTSTACK * stk,
+ GISTSTACK *stk,
IndexTuple ltup, /* new version of entry for old page */
IndexTuple rtup, /* entry for new page */
- GISTSTATE * giststate)
+ GISTSTATE *giststate)
{
ItemPointerData ltid;
@@ -899,7 +899,7 @@ gistintinsert(Relation r,
/* remove old left pointer, insert the 2 new entries */
ItemPointerSet(<id, stk->gs_blk, stk->gs_child);
- gistdelete(r, (ItemPointer) & ltid);
+ gistdelete(r, (ItemPointer) <id);
gistentryinserttwo(r, stk, ltup, rtup, giststate);
}
@@ -908,8 +908,8 @@ gistintinsert(Relation r,
** Insert two entries onto one page, handling a split for either one!
*/
static void
-gistentryinserttwo(Relation r, GISTSTACK * stk, IndexTuple ltup,
- IndexTuple rtup, GISTSTATE * giststate)
+gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
+ IndexTuple rtup, GISTSTATE *giststate)
{
Buffer b;
Page p;
@@ -950,8 +950,8 @@ gistentryinserttwo(Relation r, GISTSTACK * stk, IndexTuple ltup,
** Insert an entry onto a page
*/
static InsertIndexResult
-gistentryinsert(Relation r, GISTSTACK * stk, IndexTuple tup,
- GISTSTATE * giststate)
+gistentryinsert(Relation r, GISTSTACK *stk, IndexTuple tup,
+ GISTSTATE *giststate)
{
Buffer b;
Page p;
@@ -990,7 +990,7 @@ gistentryinsert(Relation r, GISTSTACK * stk, IndexTuple tup,
static void
-gistnewroot(GISTSTATE * giststate, Relation r, IndexTuple lt, IndexTuple rt)
+gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt, IndexTuple rt)
{
Buffer b;
Page p;
@@ -1042,7 +1042,7 @@ GISTInitBuffer(Buffer b, uint32 f)
*/
static OffsetNumber
gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
- GISTSTATE * giststate)
+ GISTSTATE *giststate)
{
OffsetNumber maxoff;
OffsetNumber i;
@@ -1095,7 +1095,7 @@ gistnospace(Page p, IndexTuple it)
}
void
-gistfreestack(GISTSTACK * s)
+gistfreestack(GISTSTACK *s)
{
GISTSTACK *p;
@@ -1140,7 +1140,7 @@ gistdelete(Relation r, ItemPointer tid)
}
void
-initGISTstate(GISTSTATE * giststate, Relation index)
+initGISTstate(GISTSTATE *giststate, Relation index)
{
RegProcedure consistent_proc,
union_proc,
@@ -1237,7 +1237,7 @@ gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t)
for (blank = 0; blank < r->rd_rel->relnatts; blank++)
isnull[blank] = ' ';
newtup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & (entry.pred),
+ (Datum *) &(entry.pred),
isnull);
newtup->t_tid = t->t_tid;
pfree(isnull);
@@ -1250,7 +1250,7 @@ gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t)
** initialize a GiST entry with a decompressed version of pred
*/
void
-gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr, Relation r,
+gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r,
Page pg, OffsetNumber o, int b, bool l)
{
GISTENTRY *dep;
@@ -1271,7 +1271,7 @@ gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr, Relation r,
** initialize a GiST entry with a compressed version of pred
*/
static void
-gistcentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr, Relation r,
+gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r,
Page pg, OffsetNumber o, int b, bool l)
{
GISTENTRY *cep;
@@ -1351,7 +1351,7 @@ _gistdump(Relation r)
#ifdef NOT_USED
static char *
-text_range_out(TXTRANGE * r)
+text_range_out(TXTRANGE *r)
{
char *result;
char *lower,
@@ -1378,7 +1378,7 @@ text_range_out(TXTRANGE * r)
#endif
static char *
-int_range_out(INTRANGE * r)
+int_range_out(INTRANGE *r)
{
char *result;
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 0820389ff43faca8b3ab9d7e09d63b3f935d20c1..3e09374584460b590be5845851432b9067950767 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -37,7 +37,7 @@ static RetrieveIndexResult gistnext(IndexScanDesc s, ScanDirection dir);
static ItemPointer gistheapptr(Relation r, ItemPointer itemp);
static bool
gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc,
- int scanKeySize, ScanKey key, GISTSTATE * giststate,
+ int scanKeySize, ScanKey key, GISTSTATE *giststate,
Relation r, Page p, OffsetNumber offset);
@@ -252,7 +252,7 @@ gistindex_keytest(IndexTuple tuple,
TupleDesc tupdesc,
int scanKeySize,
ScanKey key,
- GISTSTATE * giststate,
+ GISTSTATE *giststate,
Relation r,
Page p,
OffsetNumber offset)
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 67070997754791d14b7ff4479a28658cf8b047d1..ee5d93e0565d69c2d3dfa74ee715c2887baf26ba 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -33,7 +33,7 @@ static void
gistadjone(IndexScanDesc s, int op, BlockNumber blkno,
OffsetNumber offnum);
static void
-adjuststack(GISTSTACK * stk, BlockNumber blkno,
+adjuststack(GISTSTACK *stk, BlockNumber blkno,
OffsetNumber offnum);
static void
adjustiptr(IndexScanDesc s, ItemPointer iptr,
@@ -53,7 +53,7 @@ typedef struct GISTScanListData
{
IndexScanDesc gsl_scan;
struct GISTScanListData *gsl_next;
-} GISTScanListData;
+} GISTScanListData;
typedef GISTScanListData *GISTScanList;
@@ -418,7 +418,7 @@ adjustiptr(IndexScanDesc s,
*/
/*ARGSUSED*/
static void
-adjuststack(GISTSTACK * stk,
+adjuststack(GISTSTACK *stk,
BlockNumber blkno,
OffsetNumber offnum)
{
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 427c222dfcf08abdf472c3dcced5de3b64f147ad..93ae2885378f92f8c0e4bf646c91fe7bcd1a516c 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.15 1997/09/08 20:53:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.16 1997/09/08 21:40:45 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -48,9 +48,9 @@ hashbuild(Relation heap,
AttrNumber *attnum,
IndexStrategy istrat,
uint16 pcount,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo)
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo)
{
HeapScanDesc hscan;
Buffer buffer;
@@ -278,7 +278,7 @@ hashbuild(Relation heap,
* to the caller.
*/
InsertIndexResult
-hashinsert(Relation rel, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
+hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
{
HashItem hitem;
IndexTuple itup;
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 1178586769119c167801baa5451351208c423caf..8da88101dd125758974778a3baa6af6a7036a806 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.5 1997/09/08 02:20:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.6 1997/09/08 21:40:47 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -23,7 +23,7 @@
uint32
hashint2(int16 key)
{
- return ((uint32) ~ key);
+ return ((uint32) ~key);
}
uint32
@@ -130,7 +130,7 @@ hashfloat8(float64 keyp)
uint32
hashoid(Oid key)
{
- return ((uint32) ~ key);
+ return ((uint32) ~key);
}
@@ -204,7 +204,7 @@ hashchar8(char *key)
}
uint32
-hashname(NameData * n)
+hashname(NameData *n)
{
uint32 h;
int len;
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index de64ebdd06153884d5218404991f5deb97d10072..777fb3a5cfadf9e9b2dbdcda92eea74920ed22c2 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.10 1997/09/08 02:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.11 1997/09/08 21:40:48 momjian Exp $
*
* NOTES
* Because we can be doing an index scan on a relation while we
@@ -38,7 +38,7 @@ typedef struct HashScanListData
{
IndexScanDesc hashsl_scan;
struct HashScanListData *hashsl_next;
-} HashScanListData;
+} HashScanListData;
typedef HashScanListData *HashScanList;
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 4c161edb891ce36348207b8ae296e8b97bb4bc02..0ebb301c8779a2cc1f8dcc0714b56a687a140117 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.13 1997/09/08 20:54:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.14 1997/09/08 21:40:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -127,7 +127,7 @@ _hash_next(IndexScanDesc scan, ScanDirection dir)
static void
_hash_readnext(Relation rel,
- Buffer *bufp, Page * pagep, HashPageOpaque * opaquep)
+ Buffer *bufp, Page *pagep, HashPageOpaque *opaquep)
{
BlockNumber blkno;
@@ -146,7 +146,7 @@ _hash_readnext(Relation rel,
static void
_hash_readprev(Relation rel,
- Buffer *bufp, Page * pagep, HashPageOpaque * opaquep)
+ Buffer *bufp, Page *pagep, HashPageOpaque *opaquep)
{
BlockNumber blkno;
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index e1f969dffa244fc2a11bae62851595e1e3704d57..19bdf5b34ceb6461ca8eb2a9672a5d8baa3de579 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.18 1997/09/08 20:54:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.19 1997/09/08 21:40:57 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -1188,7 +1188,7 @@ heap_insert(Relation relation, HeapTuple tup)
*/
SetRefreshWhenInvalidate(ImmediateInvalidation);
RelationInvalidateHeapTuple(relation, tup);
- SetRefreshWhenInvalidate((bool) ! ImmediateInvalidation);
+ SetRefreshWhenInvalidate((bool) !ImmediateInvalidation);
}
return (tup->t_oid);
@@ -1287,7 +1287,7 @@ heap_delete(Relation relation, ItemPointer tid)
*/
SetRefreshWhenInvalidate(ImmediateInvalidation);
RelationInvalidateHeapTuple(relation, tp);
- SetRefreshWhenInvalidate((bool) ! ImmediateInvalidation);
+ SetRefreshWhenInvalidate((bool) !ImmediateInvalidation);
WriteBuffer(b);
if (IsSystemRelationName(RelationGetRelationName(relation)->data))
@@ -1441,7 +1441,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
*/
SetRefreshWhenInvalidate(ImmediateInvalidation);
RelationInvalidateHeapTuple(relation, tp);
- SetRefreshWhenInvalidate((bool) ! ImmediateInvalidation);
+ SetRefreshWhenInvalidate((bool) !ImmediateInvalidation);
WriteBuffer(buffer);
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 9d0eee39b6449d5bba5391ce0332b5a1121eef1f..c2b1642cafa55e8ffb5c2befc4479e86c76fca27 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.15 1997/09/08 02:20:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.16 1997/09/08 21:41:06 momjian Exp $
*
* INTERFACE ROUTINES
* index_open - open an index relation by relationId
@@ -162,7 +162,7 @@ index_close(Relation relation)
*/
InsertIndexResult
index_insert(Relation relation,
- Datum * datum,
+ Datum *datum,
char *nulls,
ItemPointer heap_t_ctid,
Relation heapRel)
@@ -371,8 +371,8 @@ GetIndexValue(HeapTuple tuple,
TupleDesc hTupDesc,
int attOff,
AttrNumber attrNums[],
- FuncIndexInfo * fInfo,
- bool * attNull,
+ FuncIndexInfo *fInfo,
+ bool *attNull,
Buffer buffer)
{
Datum returnVal;
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 9cc9c06e98fc31c6a643f61f12def8ca1c186509..d47ceed6d6a7e41e872f768f4cbf18180003ead7 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.11 1997/09/08 02:20:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.12 1997/09/08 21:41:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -540,7 +540,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
*/
void
IndexSupportInitialize(IndexStrategy indexStrategy,
- RegProcedure * indexSupport,
+ RegProcedure *indexSupport,
Oid indexObjectId,
Oid accessMethodObjectId,
StrategyNumber maxStrategyNumber,
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index f107e2138a1c12c889236bb610d26c951fbdd1b2..55942379dca17148d431cca168d74b4b8cc120f0 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.12 1997/09/08 02:20:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.13 1997/09/08 21:41:11 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -126,7 +126,7 @@ btchar16cmp(char *a, char *b)
}
int32
-btnamecmp(NameData * a, NameData * b)
+btnamecmp(NameData *a, NameData *b)
{
return (strncmp(a->data, b->data, NAMEDATALEN));
}
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 53c56d43ec5b64350a81f4b2c39064d83c2dfd81..f634cf6715de30933f9d9952569eae45ff421438 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.19 1997/09/08 02:20:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.20 1997/09/08 21:41:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -435,7 +435,7 @@ _bt_insertonpg(Relation rel,
maxoff = PageGetMaxOffsetNumber(page);
llimit = PageGetPageSize(page) - sizeof(PageHeaderData) -
DOUBLEALIGN(sizeof(BTPageOpaqueData))
- + sizeof(ItemIdData);
+ +sizeof(ItemIdData);
llimit /= 2;
firstright = _bt_findsplitloc(rel, page, start, maxoff, llimit);
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 203772ee2d4fdfb2180a9efa6a3672a1b417f40f..0bdd55d73223201ad08d773c5b17627803b8c209 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.22 1997/09/08 20:54:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.23 1997/09/08 21:41:24 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -59,9 +59,9 @@ btbuild(Relation heap,
AttrNumber *attnum,
IndexStrategy istrat,
uint16 pcount,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo)
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo)
{
HeapScanDesc hscan;
Buffer buffer;
@@ -356,7 +356,7 @@ btbuild(Relation heap,
* return an InsertIndexResult to the caller.
*/
InsertIndexResult
-btinsert(Relation rel, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
+btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
{
BTItem btitem;
IndexTuple itup;
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 5cfc12e8ccffb645bdf18d51a7b3649d64b7cc18..154c3a81bfc6955b8a6efc0b33010f4c735e8bc3 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
- * $Id: nbtsort.c,v 1.22 1997/09/08 20:54:28 momjian Exp $
+ * $Id: nbtsort.c,v 1.23 1997/09/08 21:41:28 momjian Exp $
*
* NOTES
*
@@ -800,7 +800,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
* allocate a new, clean btree page, not linked to any siblings.
*/
static void
-_bt_blnewpage(Relation index, Buffer *buf, Page * page, int flags)
+_bt_blnewpage(Relation index, Buffer *buf, Page *page, int flags)
{
BTPageOpaque opaque;
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 0ee1ef9d321f3537d9be4b217d7e34310aa1aa96..2b77d77d4b38b42023e236a441a0533baaac2ba7 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.13 1997/09/08 02:21:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.14 1997/09/08 21:41:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -347,7 +347,7 @@ _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz)
#endif
bool
-_bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size * keysok)
+_bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok)
{
BTScanOpaque so = (BTScanOpaque) scan->opaque;
Size keysz = so->numberOfKeys;
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index b2c967e58521583efefed815eabbf2f01469e258..d93285c231ae0d9c7e24fd8da609695b7d597e82 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.10 1997/09/08 20:54:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.11 1997/09/08 21:41:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -87,7 +87,7 @@ rt_bigbox_size(BOX *a, float *size)
}
POLYGON *
-rt_poly_union(POLYGON * a, POLYGON * b)
+rt_poly_union(POLYGON *a, POLYGON *b)
{
POLYGON *p;
@@ -107,7 +107,7 @@ rt_poly_union(POLYGON * a, POLYGON * b)
}
void
-rt_poly_size(POLYGON * a, float *size)
+rt_poly_size(POLYGON *a, float *size)
{
double xdim,
ydim;
@@ -129,7 +129,7 @@ rt_poly_size(POLYGON * a, float *size)
}
POLYGON *
-rt_poly_inter(POLYGON * a, POLYGON * b)
+rt_poly_inter(POLYGON *a, POLYGON *b)
{
POLYGON *p;
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 2d18f20540f803eb7a9b214212f85bbe5f618ab3..02d8aaead36f20ababafd0bb7ba1d235416ec226 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.16 1997/09/08 20:54:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.17 1997/09/08 21:41:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,38 +40,38 @@ typedef struct SPLITVEC
OffsetNumber *spl_right;
int spl_nright;
char *spl_rdatum;
-} SPLITVEC;
+} SPLITVEC;
typedef struct RTSTATE
{
func_ptr unionFn; /* union function */
func_ptr sizeFn; /* size function */
func_ptr interFn; /* intersection function */
-} RTSTATE;
+} RTSTATE;
/* non-export function prototypes */
static InsertIndexResult
rtdoinsert(Relation r, IndexTuple itup,
- RTSTATE * rtstate);
+ RTSTATE *rtstate);
static void
-rttighten(Relation r, RTSTACK * stk, char *datum, int att_size,
- RTSTATE * rtstate);
+rttighten(Relation r, RTSTACK *stk, char *datum, int att_size,
+ RTSTATE *rtstate);
static InsertIndexResult
-dosplit(Relation r, Buffer buffer, RTSTACK * stack,
- IndexTuple itup, RTSTATE * rtstate);
+dosplit(Relation r, Buffer buffer, RTSTACK *stack,
+ IndexTuple itup, RTSTATE *rtstate);
static void
-rtintinsert(Relation r, RTSTACK * stk, IndexTuple ltup,
- IndexTuple rtup, RTSTATE * rtstate);
+rtintinsert(Relation r, RTSTACK *stk, IndexTuple ltup,
+ IndexTuple rtup, RTSTATE *rtstate);
static void rtnewroot(Relation r, IndexTuple lt, IndexTuple rt);
static void
-picksplit(Relation r, Page page, SPLITVEC * v, IndexTuple itup,
- RTSTATE * rtstate);
+picksplit(Relation r, Page page, SPLITVEC *v, IndexTuple itup,
+ RTSTATE *rtstate);
static void RTInitBuffer(Buffer b, uint32 f);
static OffsetNumber
choose(Relation r, Page p, IndexTuple it,
- RTSTATE * rtstate);
+ RTSTATE *rtstate);
static int nospace(Page p, IndexTuple it);
-static void initRtstate(RTSTATE * rtstate, Relation index);
+static void initRtstate(RTSTATE *rtstate, Relation index);
void
@@ -81,9 +81,9 @@ rtbuild(Relation heap,
AttrNumber *attnum,
IndexStrategy istrat,
uint16 pcount,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo)
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo)
{
HeapScanDesc scan;
Buffer buffer;
@@ -305,7 +305,7 @@ rtbuild(Relation heap,
* It doesn't do any work; just locks the relation and passes the buck.
*/
InsertIndexResult
-rtinsert(Relation r, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
+rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel)
{
InsertIndexResult res;
IndexTuple itup;
@@ -324,7 +324,7 @@ rtinsert(Relation r, Datum * datum, char *nulls, ItemPointer ht_ctid, Relation h
}
static InsertIndexResult
-rtdoinsert(Relation r, IndexTuple itup, RTSTATE * rtstate)
+rtdoinsert(Relation r, IndexTuple itup, RTSTATE *rtstate)
{
Page page;
Buffer buffer;
@@ -409,10 +409,10 @@ rtdoinsert(Relation r, IndexTuple itup, RTSTATE * rtstate)
static void
rttighten(Relation r,
- RTSTACK * stk,
+ RTSTACK *stk,
char *datum,
int att_size,
- RTSTATE * rtstate)
+ RTSTATE *rtstate)
{
char *oldud;
char *tdatum;
@@ -483,9 +483,9 @@ rttighten(Relation r,
static InsertIndexResult
dosplit(Relation r,
Buffer buffer,
- RTSTACK * stack,
+ RTSTACK *stack,
IndexTuple itup,
- RTSTATE * rtstate)
+ RTSTATE *rtstate)
{
Page p;
Buffer leftbuf,
@@ -614,9 +614,9 @@ dosplit(Relation r,
tupDesc = r->rd_att;
ltup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & (v.spl_ldatum), isnull);
+ (Datum *) &(v.spl_ldatum), isnull);
rtup = (IndexTuple) index_formtuple(tupDesc,
- (Datum *) & (v.spl_rdatum), isnull);
+ (Datum *) &(v.spl_rdatum), isnull);
pfree(isnull);
/* set pointers to new child pages in the internal index tuples */
@@ -633,10 +633,10 @@ dosplit(Relation r,
static void
rtintinsert(Relation r,
- RTSTACK * stk,
+ RTSTACK *stk,
IndexTuple ltup,
IndexTuple rtup,
- RTSTATE * rtstate)
+ RTSTATE *rtstate)
{
IndexTuple old;
Buffer b;
@@ -714,9 +714,9 @@ rtnewroot(Relation r, IndexTuple lt, IndexTuple rt)
static void
picksplit(Relation r,
Page page,
- SPLITVEC * v,
+ SPLITVEC *v,
IndexTuple itup,
- RTSTATE * rtstate)
+ RTSTATE *rtstate)
{
OffsetNumber maxoff;
OffsetNumber i,
@@ -900,7 +900,7 @@ RTInitBuffer(Buffer b, uint32 f)
}
static OffsetNumber
-choose(Relation r, Page p, IndexTuple it, RTSTATE * rtstate)
+choose(Relation r, Page p, IndexTuple it, RTSTATE *rtstate)
{
OffsetNumber maxoff;
OffsetNumber i;
@@ -944,7 +944,7 @@ nospace(Page p, IndexTuple it)
}
void
-freestack(RTSTACK * s)
+freestack(RTSTACK *s)
{
RTSTACK *p;
@@ -986,7 +986,7 @@ rtdelete(Relation r, ItemPointer tid)
}
static void
-initRtstate(RTSTATE * rtstate, Relation index)
+initRtstate(RTSTATE *rtstate, Relation index)
{
RegProcedure union_proc,
size_proc,
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 2a4810ccae3966d5763a9e9fef0fd622cf128af9..73038a2ee8c84a100804820009cf948712741a55 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.12 1997/09/08 02:21:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.13 1997/09/08 21:41:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@ static void
rtadjone(IndexScanDesc s, int op, BlockNumber blkno,
OffsetNumber offnum);
static void
-adjuststack(RTSTACK * stk, BlockNumber blkno,
+adjuststack(RTSTACK *stk, BlockNumber blkno,
OffsetNumber offnum);
static void
adjustiptr(IndexScanDesc s, ItemPointer iptr,
@@ -54,7 +54,7 @@ typedef struct RTScanListData
{
IndexScanDesc rtsl_scan;
struct RTScanListData *rtsl_next;
-} RTScanListData;
+} RTScanListData;
typedef RTScanListData *RTScanList;
@@ -421,7 +421,7 @@ adjustiptr(IndexScanDesc s,
*/
/*ARGSUSED*/
static void
-adjuststack(RTSTACK * stk,
+adjuststack(RTSTACK *stk,
BlockNumber blkno,
OffsetNumber offnum)
{
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 9d5724fad14d41d7fd928f90ca4f0b02fb74e94b..91c7ec8a3d2d5cf1c8c86f99fd4ccfe441df2c2b 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.12 1997/09/08 20:54:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.13 1997/09/08 21:41:42 momjian Exp $
*
* NOTES
* This file contains the high level access-method interface to the
@@ -134,7 +134,7 @@ SetRecoveryCheckingEnabled(bool state)
* --------------------------------
*/
-static bool /* true/false: does transaction id have
+static bool /* true/false: does transaction id have
* specified status? */
TransactionLogTest(TransactionId transactionId, /* transaction id to test */
XidStatus status) /* transaction status */
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 15645d61b19a999620a1d406f970cb897567b5ae..227c47ef54664cbe6ac143abcf51fdaccb1fdf5d 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.12 1997/09/08 20:54:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.13 1997/09/08 21:41:46 momjian Exp $
*
* NOTES
* This file contains support functions for the high
@@ -111,7 +111,7 @@ TransComputeBlockNumber(Relation relation, /* relation to test */
static XidStatus
TransBlockGetLastTransactionIdStatus(Block tblock,
TransactionId baseXid,
- TransactionId * returnXidP)
+ TransactionId *returnXidP)
{
Index index;
Index maxIndex;
@@ -392,7 +392,7 @@ XidStatus
TransBlockNumberGetXidStatus(Relation relation,
BlockNumber blockNumber,
TransactionId xid,
- bool * failP)
+ bool *failP)
{
Buffer buffer; /* buffer associated with block */
Block block; /* block containing xstatus */
@@ -449,7 +449,7 @@ TransBlockNumberSetXidStatus(Relation relation,
BlockNumber blockNumber,
TransactionId xid,
XidStatus xstatus,
- bool * failP)
+ bool *failP)
{
Buffer buffer; /* buffer associated with block */
Block block; /* block containing xstatus */
@@ -502,7 +502,7 @@ AbsoluteTime
TransBlockNumberGetCommitTime(Relation relation,
BlockNumber blockNumber,
TransactionId xid,
- bool * failP)
+ bool *failP)
{
Buffer buffer; /* buffer associated with block */
Block block; /* block containing commit time */
@@ -563,7 +563,7 @@ TransBlockNumberSetCommitTime(Relation relation,
BlockNumber blockNumber,
TransactionId xid,
AbsoluteTime xtime,
- bool * failP)
+ bool *failP)
{
Buffer buffer; /* buffer associated with block */
Block block; /* block containing commit time */
@@ -618,7 +618,7 @@ void
TransGetLastRecordedTransaction(Relation relation,
TransactionId xid, /* return: transaction
* id */
- bool * failP)
+ bool *failP)
{
BlockNumber blockNumber; /* block number */
Buffer buffer; /* buffer associated with block */
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index fb44b210bed350a219a6bb31a8f6359aab72c205..7fdbfd3bcc8c706b99fe78ef9bca57a5b3bf46fb 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.11 1997/09/08 02:21:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.12 1997/09/08 21:41:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,12 +20,12 @@
#include <access/heapam.h>
#include <catalog/catname.h>
-static void GetNewObjectIdBlock(Oid * oid_return, int oid_block_size);
-static void VariableRelationGetNextOid(Oid * oid_return);
-static void VariableRelationGetNextXid(TransactionId * xidP);
+static void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size);
+static void VariableRelationGetNextOid(Oid *oid_return);
+static void VariableRelationGetNextXid(TransactionId *xidP);
static void VariableRelationPutLastXid(TransactionId xid);
-static void VariableRelationPutNextOid(Oid * oidP);
-static void VariableRelationGetLastXid(TransactionId * xidP);
+static void VariableRelationPutNextOid(Oid *oidP);
+static void VariableRelationGetLastXid(TransactionId *xidP);
/* ---------------------
* spin lock for oid generation
@@ -43,7 +43,7 @@ int OidGenLockId;
* --------------------------------
*/
static void
-VariableRelationGetNextXid(TransactionId * xidP)
+VariableRelationGetNextXid(TransactionId *xidP)
{
Buffer buf;
VariableRelationContents var;
@@ -85,7 +85,7 @@ VariableRelationGetNextXid(TransactionId * xidP)
* --------------------------------
*/
static void
-VariableRelationGetLastXid(TransactionId * xidP)
+VariableRelationGetLastXid(TransactionId *xidP)
{
Buffer buf;
VariableRelationContents var;
@@ -217,7 +217,7 @@ VariableRelationPutLastXid(TransactionId xid)
* --------------------------------
*/
static void
-VariableRelationGetNextOid(Oid * oid_return)
+VariableRelationGetNextOid(Oid *oid_return)
{
Buffer buf;
VariableRelationContents var;
@@ -287,7 +287,7 @@ VariableRelationGetNextOid(Oid * oid_return)
* --------------------------------
*/
static void
-VariableRelationPutNextOid(Oid * oidP)
+VariableRelationPutNextOid(Oid *oidP)
{
Buffer buf;
VariableRelationContents var;
@@ -387,7 +387,7 @@ static int prefetched_xid_count = 0;
static TransactionId next_prefetched_xid;
void
-GetNewTransactionId(TransactionId * xid)
+GetNewTransactionId(TransactionId *xid)
{
TransactionId nextid;
@@ -497,7 +497,7 @@ UpdateLastCommittedXid(TransactionId xid)
* ----------------
*/
static void
-GetNewObjectIdBlock(Oid * oid_return, /* place to return the new object
+GetNewObjectIdBlock(Oid *oid_return, /* place to return the new object
* id */
int oid_block_size) /* number of oids desired */
{
@@ -558,7 +558,7 @@ static int prefetched_oid_count = 0;
static Oid next_prefetched_oid;
void
-GetNewObjectId(Oid * oid_return)/* place to return the new object id */
+GetNewObjectId(Oid *oid_return) /* place to return the new object id */
{
/* ----------------
* if we run out of prefetched oids, then we get some
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index b6ff2dd2963e4ff4c7b44d9a1e5326dbcb8f831f..e5e1057bba20fc8e0dab71c3e6e7b64a7e13d53a 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.15 1997/09/08 02:21:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.16 1997/09/08 21:41:52 momjian Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -202,9 +202,9 @@ TransactionState CurrentTransactionState =
* V1 transaction system. -cim 3/18/90
* ----------------
*/
-TransactionId DisabledTransactionId = (TransactionId) - 1;
+TransactionId DisabledTransactionId = (TransactionId) -1;
-CommandId DisabledCommandId = (CommandId) - 1;
+CommandId DisabledCommandId = (CommandId) -1;
AbsoluteTime DisabledStartTime = (AbsoluteTime) BIG_ABSTIME; /* 1073741823; */
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 9cfc8235d434de669a60930bcfa875b3fa66cabe..b60c6ba7ef36b53d63743ba5f303c44cea2170f8 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.9 1997/09/08 02:21:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.10 1997/09/08 21:41:56 momjian Exp $
*
* OLD COMMENTS
* XXX WARNING
@@ -73,7 +73,7 @@ xidout(TransactionId transactionId)
* ----------------------------------------------------------------
*/
void
-StoreInvalidTransactionId(TransactionId * destination)
+StoreInvalidTransactionId(TransactionId *destination)
{
*destination = NullTransactionId;
}
@@ -86,7 +86,7 @@ StoreInvalidTransactionId(TransactionId * destination)
*/
void
TransactionIdStore(TransactionId transactionId,
- TransactionId * destination)
+ TransactionId *destination)
{
*destination = transactionId;
}
@@ -134,7 +134,7 @@ xideq(TransactionId xid1, TransactionId xid2)
*/
#ifdef NOT_USED
void
-TransactionIdIncrement(TransactionId * transactionId)
+TransactionIdIncrement(TransactionId *transactionId)
{
(*transactionId)++;
@@ -150,7 +150,7 @@ TransactionIdIncrement(TransactionId * transactionId)
* ----------------------------------------------------------------
*/
void
-TransactionIdAdd(TransactionId * xid, int value)
+TransactionIdAdd(TransactionId *xid, int value)
{
*xid += value;
return;
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index ff0c5ef7ba00dbc5bfbd14fadbabb8c3451dc176..829ad1b6347e6360d617bbfc57f8fb80e8d6ca93 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.24 1997/09/08 20:54:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.25 1997/09/08 21:42:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -108,7 +108,7 @@ static hashnode *AddStr(char *str, int strlength, int mderef);
static AttributeTupleForm AllocateAttribute(void);
static bool BootstrapAlreadySeen(Oid id);
static int CompHash(char *str, int len);
-static hashnode *FindStr(char *str, int length, hashnode * mderef);
+static hashnode *FindStr(char *str, int length, hashnode *mderef);
static int gettype(char *type);
static void cleanup(void);
@@ -234,7 +234,7 @@ typedef struct _IndexList
FuncIndexInfo *il_finfo;
PredInfo *il_predInfo;
struct _IndexList *il_next;
-} IndexList;
+} IndexList;
static IndexList *ILHead = (IndexList *) NULL;
@@ -1002,7 +1002,7 @@ CompHash(char *str, int len)
* ----------------
*/
static hashnode *
-FindStr(char *str, int length, hashnode * mderef)
+FindStr(char *str, int length, hashnode *mderef)
{
hashnode *node;
@@ -1113,9 +1113,9 @@ index_register(char *heap,
int natts,
AttrNumber *attnos,
uint16 nparams,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo)
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo)
{
Datum *v;
IndexList *newind;
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 779dfec4b276eb25b8f93f08d0cb18be5f4100db..09eac542eea951406b059b78cd8a3a9ea0db09df 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.9 1997/09/08 02:21:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.10 1997/09/08 21:42:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -183,7 +183,7 @@ fillatt(TupleDesc tupleDesc)
}
else
{
- (*attributeP)->attnum = (int16)++ i;
+ (*attributeP)->attnum = (int16) ++i;
/*
* Check if the attr is a set before messing with the length
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 4c6c421758cbf725effcd66b953e2da5de827648..a3fd60640367d07d81c4c414019d53b333caa4df 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.27 1997/09/08 20:54:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.28 1997/09/08 21:42:16 momjian Exp $
*
* INTERFACE ROUTINES
* heap_creatr() - Create an uncataloged heap relation
@@ -164,7 +164,7 @@ typedef struct tempRelList
int num; /* number of temporary relations */
int size; /* size of space allocated for the rels
* array */
-} TempRelList;
+} TempRelList;
#define TEMP_REL_LIST_SIZE 32
@@ -1518,10 +1518,10 @@ DestroyTempRels(void)
tempRels = NULL;
}
-extern List *flatten_tlist(List * tlist);
+extern List *flatten_tlist(List *tlist);
extern List *
-pg_plan(char *query_string, Oid * typev, int nargs,
- QueryTreeList ** queryListP, CommandDest dest);
+pg_plan(char *query_string, Oid *typev, int nargs,
+ QueryTreeList **queryListP, CommandDest dest);
static void
StoreAttrDefault(Relation rel, AttrDefault *attrdef)
@@ -1598,7 +1598,7 @@ start:;
}
static void
-StoreRelCheck(Relation rel, ConstrCheck * check)
+StoreRelCheck(Relation rel, ConstrCheck *check)
{
char str[MAX_PARSE_BUFFER];
QueryTreeList *queryTree_list;
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index d6459fbe2b88116e69926d9c58c68eab372ffdbf..7255593330b812f9b50e2ab7b9dd0a829b78f1f7 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.21 1997/09/08 02:21:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.22 1997/09/08 21:42:18 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -67,10 +67,10 @@ static Oid
RelationNameGetObjectId(char *relationName, Relation pg_class,
bool setHasIndexAttribute);
static Oid GetHeapRelationOid(char *heapRelationName, char *indexRelationName);
-static TupleDesc BuildFuncTupleDesc(FuncIndexInfo * funcInfo);
+static TupleDesc BuildFuncTupleDesc(FuncIndexInfo *funcInfo);
static TupleDesc
ConstructTupleDescriptor(Oid heapoid, Relation heapRelation,
- List * attributeList,
+ List *attributeList,
int numatts, AttrNumber attNums[]);
static void ConstructIndexReldesc(Relation indexRelation, Oid amoid);
@@ -83,14 +83,14 @@ static void
AppendAttributeTuples(Relation indexRelation, int numatts);
static void
UpdateIndexRelation(Oid indexoid, Oid heapoid,
- FuncIndexInfo * funcInfo, int natts,
- AttrNumber attNums[], Oid classOids[], Node * predicate,
- List * attributeList, bool islossy, bool unique);
+ FuncIndexInfo *funcInfo, int natts,
+ AttrNumber attNums[], Oid classOids[], Node *predicate,
+ List *attributeList, bool islossy, bool unique);
static void
DefaultBuild(Relation heapRelation, Relation indexRelation,
int numberOfAttributes, AttrNumber attributeNumber[],
IndexStrategy indexStrategy, uint16 parameterCount,
- Datum parameter[], FuncIndexInfoPtr funcInfo, PredInfo * predInfo);
+ Datum parameter[], FuncIndexInfoPtr funcInfo, PredInfo *predInfo);
/* ----------------------------------------------------------------
* sysatts is a structure containing attribute tuple forms
@@ -269,7 +269,7 @@ GetHeapRelationOid(char *heapRelationName, char *indexRelationName)
}
static TupleDesc
-BuildFuncTupleDesc(FuncIndexInfo * funcInfo)
+BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
{
HeapTuple tuple;
TupleDesc funcTupDesc;
@@ -334,7 +334,7 @@ BuildFuncTupleDesc(FuncIndexInfo * funcInfo)
static TupleDesc
ConstructTupleDescriptor(Oid heapoid,
Relation heapRelation,
- List * attributeList,
+ List *attributeList,
int numatts,
AttrNumber attNums[])
{
@@ -777,12 +777,12 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
static void
UpdateIndexRelation(Oid indexoid,
Oid heapoid,
- FuncIndexInfo * funcInfo,
+ FuncIndexInfo *funcInfo,
int natts,
AttrNumber attNums[],
Oid classOids[],
- Node * predicate,
- List * attributeList,
+ Node *predicate,
+ List *attributeList,
bool islossy,
bool unique)
{
@@ -901,7 +901,7 @@ UpdateIndexRelation(Oid indexoid,
* ----------------------------------------------------------------
*/
void
-UpdateIndexPredicate(Oid indexoid, Node * oldPred, Node * predicate)
+UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
{
Node *newPred;
char *predString;
@@ -1065,15 +1065,15 @@ InitIndexStrategy(int numatts,
void
index_create(char *heapRelationName,
char *indexRelationName,
- FuncIndexInfo * funcInfo,
- List * attributeList,
+ FuncIndexInfo *funcInfo,
+ List *attributeList,
Oid accessMethodObjectId,
int numatts,
AttrNumber attNums[],
Oid classObjectId[],
uint16 parameterCount,
- Datum * parameter,
- Node * predicate,
+ Datum *parameter,
+ Node *predicate,
bool islossy,
bool unique)
{
@@ -1321,7 +1321,7 @@ FormIndexDatum(int numberOfAttributes,
HeapTuple heapTuple,
TupleDesc heapDescriptor,
Buffer buffer,
- Datum * datum,
+ Datum *datum,
char *nullv,
FuncIndexInfoPtr fInfo)
{
@@ -1379,7 +1379,7 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
char nulls[Natts_pg_class];
char replace[Natts_pg_class];
- fmgr_info(ObjectIdEqualRegProcedure, (func_ptr *) & key[0].sk_func,
+ fmgr_info(ObjectIdEqualRegProcedure, (func_ptr *) &key[0].sk_func,
&key[0].sk_nargs);
/* ----------------
@@ -1501,8 +1501,8 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
* -------------------------
*/
void
-FillDummyExprContext(ExprContext * econtext,
- TupleTableSlot * slot,
+FillDummyExprContext(ExprContext *econtext,
+ TupleTableSlot *slot,
TupleDesc tupdesc,
Buffer buffer)
{
@@ -1532,7 +1532,7 @@ DefaultBuild(Relation heapRelation,
uint16 parameterCount, /* not used */
Datum parameter[], /* not used */
FuncIndexInfoPtr funcInfo,
- PredInfo * predInfo)
+ PredInfo *predInfo)
{
HeapScanDesc scan;
HeapTuple heapTuple;
@@ -1732,9 +1732,9 @@ index_build(Relation heapRelation,
int numberOfAttributes,
AttrNumber attributeNumber[],
uint16 parameterCount,
- Datum * parameter,
- FuncIndexInfo * funcInfo,
- PredInfo * predInfo)
+ Datum *parameter,
+ FuncIndexInfo *funcInfo,
+ PredInfo *predInfo)
{
RegProcedure procedure;
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 4e36b1ecd699bc85212e5378457ce9cc9c9efc6b..1927d84f06336512a3be9f1a4ec48a5ab9806e54 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.14 1997/09/08 20:55:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.15 1997/09/08 21:42:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -88,7 +88,7 @@ CatalogOpenIndices(int nIndices, char *names[], Relation idescs[])
* This is the inverse routine to CatalogOpenIndices()
*/
void
-CatalogCloseIndices(int nIndices, Relation * idescs)
+CatalogCloseIndices(int nIndices, Relation *idescs)
{
int i;
@@ -103,7 +103,7 @@ CatalogCloseIndices(int nIndices, Relation * idescs)
* each catalog index.
*/
void
-CatalogIndexInsert(Relation * idescs,
+CatalogIndexInsert(Relation *idescs,
int nIndices,
Relation heapRelation,
HeapTuple heapTuple)
@@ -345,7 +345,7 @@ HeapTuple
ProcedureNameIndexScan(Relation heapRelation,
char *procName,
int nargs,
- Oid * argTypes)
+ Oid *argTypes)
{
Relation idesc;
ScanKeyData skey;
@@ -435,7 +435,7 @@ ProcedureNameIndexScan(Relation heapRelation,
HeapTuple
-ProcedureSrcIndexScan(Relation heapRelation, text * procSrc)
+ProcedureSrcIndexScan(Relation heapRelation, text *procSrc)
{
Relation idesc;
IndexScanDesc sd;
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 32c89110c01f81ec91fd5fcca66b64ed62c0ccdd..95287334a60184b1a55e2c5bef0fff2fc5c87b93 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.7 1997/09/08 02:21:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.8 1997/09/08 21:42:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -268,7 +268,7 @@ AggregateCreate(char *aggName,
}
char *
-AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool * isNull)
+AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
{
HeapTuple tup;
Relation aggRel;
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index e135784ca634dfa4ab9d3c102dade61414672ccf..50c74c8d782e161506b287481765369647dbb722 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.7 1997/09/08 02:21:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.8 1997/09/08 21:42:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,7 +52,7 @@ ProcedureCreate(char *procedureName,
int32 perbyte_cpu,
int32 percall_cpu,
int32 outin_ratio,
- List * argList,
+ List *argList,
CommandDest dest)
{
register i;
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 63bae1ec59b2e6463be600cfa6410f18ed77a913..b6fe76bc1f7c53d92907d729ddbbb4c5f7af2f84 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.9 1997/09/08 02:21:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.10 1997/09/08 21:42:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc,
static Oid
TypeGetWithOpenRelation(Relation pg_type_desc,
char *typeName,
- bool * defined)
+ bool *defined)
{
HeapScanDesc scan;
HeapTuple tup;
@@ -116,7 +116,7 @@ TypeGetWithOpenRelation(Relation pg_type_desc,
*/
Oid
TypeGet(char *typeName, /* name of type to be fetched */
- bool * defined) /* has the type been defined? */
+ bool *defined) /* has the type been defined? */
{
Relation pg_type_desc;
Oid typeoid;
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 0e409396acedc12590673135c17c79c9011da37b..c8e13949af3f3dd3f2b123c25a64549603e78027 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.15 1997/09/08 02:22:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.16 1997/09/08 21:42:29 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -255,7 +255,7 @@ void
PerformAddAttribute(char *relationName,
char *userName,
bool inherits,
- ColumnDef * colDef)
+ ColumnDef *colDef)
{
Relation relrdesc,
attrdesc;
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 9fa3ad163d32b426bd9ac5ca26040e672a36da37..ba8df5ff8d4da5cea3585abcfce327e67ee69cef 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.32 1997/09/08 20:55:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.33 1997/09/08 21:42:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,8 +42,8 @@
/* non-export function prototypes */
-static void CopyTo(Relation rel, bool binary, bool oids, FILE * fp, char *delim);
-static void CopyFrom(Relation rel, bool binary, bool oids, FILE * fp, char *delim);
+static void CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim);
+static void CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim);
static Oid GetOutputFunction(Oid type);
static Oid GetTypeElement(Oid type);
static Oid GetInputFunction(Oid type);
@@ -51,17 +51,17 @@ static Oid IsTypeByVal(Oid type);
static void
GetIndexRelations(Oid main_relation_oid,
int *n_indices,
- Relation ** index_rels);
+ Relation **index_rels);
#ifdef COPY_PATCH
-static void CopyReadNewline(FILE * fp, int *newline);
-static char *CopyReadAttribute(FILE * fp, bool * isnull, char *delim, int *newline);
+static void CopyReadNewline(FILE *fp, int *newline);
+static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim, int *newline);
#else
-static char *CopyReadAttribute(FILE * fp, bool * isnull, char *delim);
+static char *CopyReadAttribute(FILE *fp, bool *isnull, char *delim);
#endif
-static void CopyAttributeOut(FILE * fp, char *string, char *delim);
+static void CopyAttributeOut(FILE *fp, char *string, char *delim);
static int CountTuples(Relation relation);
extern FILE *Pfout,
@@ -197,7 +197,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
static void
-CopyTo(Relation rel, bool binary, bool oids, FILE * fp, char *delim)
+CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
{
HeapTuple tuple;
HeapScanDesc scandesc;
@@ -356,7 +356,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE * fp, char *delim)
}
static void
-CopyFrom(Relation rel, bool binary, bool oids, FILE * fp, char *delim)
+CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
{
HeapTuple tuple;
AttrNumber attr_count;
@@ -648,17 +648,17 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE * fp, char *delim)
switch (attr[i]->attlen)
{
case sizeof(char):
- values[i] = (Datum) * (unsigned char *) ptr;
+ values[i] = (Datum) *(unsigned char *) ptr;
ptr += sizeof(char);
break;
case sizeof(short):
ptr = (char *) SHORTALIGN(ptr);
- values[i] = (Datum) * (unsigned short *) ptr;
+ values[i] = (Datum) *(unsigned short *) ptr;
ptr += sizeof(short);
break;
case sizeof(int32):
ptr = (char *) INTALIGN(ptr);
- values[i] = (Datum) * (uint32 *) ptr;
+ values[i] = (Datum) *(uint32 *) ptr;
ptr += sizeof(int32);
break;
default:
@@ -904,12 +904,12 @@ typedef struct rel_list
{
Oid index_rel_oid;
struct rel_list *next;
-} RelationList;
+} RelationList;
static void
GetIndexRelations(Oid main_relation_oid,
int *n_indices,
- Relation ** index_rels)
+ Relation **index_rels)
{
RelationList *head,
*scan;
@@ -1002,7 +1002,7 @@ inString(char c, char *s)
*/
void
-CopyReadNewline(FILE * fp, int *newline)
+CopyReadNewline(FILE *fp, int *newline)
{
if (!*newline)
{
@@ -1028,9 +1028,9 @@ CopyReadNewline(FILE * fp, int *newline)
static char *
#ifdef COPY_PATCH
-CopyReadAttribute(FILE * fp, bool * isnull, char *delim, int *newline)
+CopyReadAttribute(FILE *fp, bool *isnull, char *delim, int *newline)
#else
-CopyReadAttribute(FILE * fp, bool * isnull, char *delim)
+CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
#endif
{
static char attribute[EXT_ATTLEN];
@@ -1151,7 +1151,7 @@ CopyReadAttribute(FILE * fp, bool * isnull, char *delim)
}
static void
-CopyAttributeOut(FILE * fp, char *string, char *delim)
+CopyAttributeOut(FILE *fp, char *string, char *delim)
{
char c;
int is_array = false;
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index e1dac613fe6eb8c33cc5a9cc51761b38c456d487..36d81bdc4e255fe5fb79ca0a6c3ef49d32adf7e0 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.16 1997/09/08 02:22:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.17 1997/09/08 21:42:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,9 +35,9 @@
static int
checkAttrExists(char *attributeName,
- char *attributeType, List * schema);
-static List *MergeAttributes(List * schema, List * supers, List ** supconstr);
-static void StoreCatalogInheritance(Oid relationId, List * supers);
+ char *attributeType, List *schema);
+static List *MergeAttributes(List *schema, List *supers, List **supconstr);
+static void StoreCatalogInheritance(Oid relationId, List *supers);
/* ----------------------------------------------------------------
* DefineRelation --
@@ -45,7 +45,7 @@ static void StoreCatalogInheritance(Oid relationId, List * supers);
* ----------------------------------------------------------------
*/
void
-DefineRelation(CreateStmt * stmt)
+DefineRelation(CreateStmt *stmt)
{
char *relname = palloc(NAMEDATALEN);
List *schema = stmt->tableElts;
@@ -280,7 +280,7 @@ RemoveRelation(char *name)
* stud_emp {7:percent}
*/
static List *
-MergeAttributes(List * schema, List * supers, List ** supconstr)
+MergeAttributes(List *schema, List *supers, List **supconstr)
{
List *entry;
List *inhSchema = NIL;
@@ -459,7 +459,7 @@ MergeAttributes(List * schema, List * supers, List ** supconstr)
* Updates the system catalogs with proper inheritance information.
*/
static void
-StoreCatalogInheritance(Oid relationId, List * supers)
+StoreCatalogInheritance(Oid relationId, List *supers)
{
Relation relation;
TupleDesc desc;
@@ -640,7 +640,7 @@ again:
* returns 1 if attribute already exists in schema, 0 otherwise.
*/
static int
-checkAttrExists(char *attributeName, char *attributeType, List * schema)
+checkAttrExists(char *attributeName, char *attributeType, List *schema)
{
List *s;
diff --git a/src/backend/commands/defind.c b/src/backend/commands/defind.c
index 52f7736b5fb56976d69485b2e90c4a2e337348c3..8b48e638ceb2e7c9668c2586604a6b14ff218585 100644
--- a/src/backend/commands/defind.c
+++ b/src/backend/commands/defind.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.15 1997/09/08 20:55:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.16 1997/09/08 21:42:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,18 +39,18 @@
#define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
/* non-export function prototypes */
-static void CheckPredicate(List * predList, List * rangeTable, Oid baseRelOid);
+static void CheckPredicate(List *predList, List *rangeTable, Oid baseRelOid);
static void
-CheckPredExpr(Node * predicate, List * rangeTable,
+CheckPredExpr(Node *predicate, List *rangeTable,
Oid baseRelOid);
static void
- CheckPredClause(Expr * predicate, List * rangeTable, Oid baseRelOid);
+ CheckPredClause(Expr *predicate, List *rangeTable, Oid baseRelOid);
static void
-FuncIndexArgs(IndexElem * funcIndex, AttrNumber *attNumP,
- Oid * argTypes, Oid * opOidP, Oid relId);
+FuncIndexArgs(IndexElem *funcIndex, AttrNumber *attNumP,
+ Oid *argTypes, Oid *opOidP, Oid relId);
static void
-NormIndexAttrs(List * attList, AttrNumber *attNumP,
- Oid * opOidP, Oid relId);
+NormIndexAttrs(List *attList, AttrNumber *attNumP,
+ Oid *opOidP, Oid relId);
static char *GetDefaultOpClass(Oid atttypid);
/*
@@ -70,11 +70,11 @@ void
DefineIndex(char *heapRelationName,
char *indexRelationName,
char *accessMethodName,
- List * attributeList,
- List * parameterList,
+ List *attributeList,
+ List *parameterList,
bool unique,
- Expr * predicate,
- List * rangetable)
+ Expr *predicate,
+ List *rangetable)
{
Oid *classObjectId;
Oid accessMethodId;
@@ -223,7 +223,7 @@ DefineIndex(char *heapRelationName,
* XXX
*/
void
-ExtendIndex(char *indexRelationName, Expr * predicate, List * rangetable)
+ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable)
{
Oid *classObjectId;
Oid accessMethodId;
@@ -364,7 +364,7 @@ ExtendIndex(char *indexRelationName, Expr * predicate, List * rangetable)
*/
static void
-CheckPredicate(List * predList, List * rangeTable, Oid baseRelOid)
+CheckPredicate(List *predList, List *rangeTable, Oid baseRelOid)
{
List *item;
@@ -375,7 +375,7 @@ CheckPredicate(List * predList, List * rangeTable, Oid baseRelOid)
}
static void
-CheckPredExpr(Node * predicate, List * rangeTable, Oid baseRelOid)
+CheckPredExpr(Node *predicate, List *rangeTable, Oid baseRelOid)
{
List *clauses = NIL,
*clause;
@@ -399,7 +399,7 @@ CheckPredExpr(Node * predicate, List * rangeTable, Oid baseRelOid)
}
static void
-CheckPredClause(Expr * predicate, List * rangeTable, Oid baseRelOid)
+CheckPredClause(Expr *predicate, List *rangeTable, Oid baseRelOid)
{
Var *pred_var;
Const *pred_const;
@@ -421,10 +421,10 @@ CheckPredClause(Expr * predicate, List * rangeTable, Oid baseRelOid)
static void
-FuncIndexArgs(IndexElem * funcIndex,
+FuncIndexArgs(IndexElem *funcIndex,
AttrNumber *attNumP,
- Oid * argTypes,
- Oid * opOidP,
+ Oid *argTypes,
+ Oid *opOidP,
Oid relId)
{
List *rest;
@@ -470,9 +470,9 @@ FuncIndexArgs(IndexElem * funcIndex,
}
static void
-NormIndexAttrs(List * attList, /* list of IndexElem's */
+NormIndexAttrs(List *attList, /* list of IndexElem's */
AttrNumber *attNumP,
- Oid * opOidP,
+ Oid *opOidP,
Oid relId)
{
List *rest;
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 52a0b716f974120a4c7e43a13e48d95e1a09f57d..903bb5164953f71bc757fef085b4265c1867767b 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.15 1997/09/08 02:22:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.16 1997/09/08 21:42:38 momjian Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -53,8 +53,8 @@
#include <tcop/dest.h>
#include <catalog/pg_user.h>
-static char *defGetString(DefElem * def);
-static int defGetTypeLength(DefElem * def);
+static char *defGetString(DefElem *def);
+static int defGetTypeLength(DefElem *def);
#define DEFAULT_TYPDELIM ','
@@ -80,8 +80,8 @@ case_translate_language_name(const char *input, char *output)
static void
-compute_return_type(const Node * returnType,
- char **prorettype_p, bool * returnsSet_p)
+compute_return_type(const Node *returnType,
+ char **prorettype_p, bool *returnsSet_p)
{
/*---------------------------------------------------------------------------
Examine the "returns" clause returnType of the CREATE FUNCTION statement
@@ -106,9 +106,9 @@ compute_return_type(const Node * returnType,
static void
-compute_full_attributes(const List * parameters, int32 * byte_pct_p,
- int32 * perbyte_cpu_p, int32 * percall_cpu_p,
- int32 * outin_ratio_p, bool * canCache_p)
+compute_full_attributes(const List *parameters, int32 *byte_pct_p,
+ int32 *perbyte_cpu_p, int32 *percall_cpu_p,
+ int32 *outin_ratio_p, bool *canCache_p)
{
/*--------------------------------------------------------------------------
Interpret the parameters *parameters and return their contents as
@@ -210,7 +210,7 @@ interpret_AS_clause(const char languageName[], const char as[],
*
*/
void
-CreateFunction(ProcedureStmt * stmt, CommandDest dest)
+CreateFunction(ProcedureStmt *stmt, CommandDest dest)
{
char *probin_str;
@@ -315,7 +315,7 @@ CreateFunction(ProcedureStmt * stmt, CommandDest dest)
*/
void
DefineOperator(char *oprName,
- List * parameters)
+ List *parameters)
{
uint16 precedence = 0; /* operator precedence */
bool canHash = false;/* operator hashes */
@@ -461,7 +461,7 @@ DefineOperator(char *oprName,
* ------------------
*/
void
-DefineAggregate(char *aggName, List * parameters)
+DefineAggregate(char *aggName, List *parameters)
{
char *stepfunc1Name = NULL;
@@ -570,7 +570,7 @@ DefineAggregate(char *aggName, List * parameters)
*
*/
void
-DefineType(char *typeName, List * parameters)
+DefineType(char *typeName, List *parameters)
{
int16 internalLength = 0; /* int2 */
int16 externalLength = 0; /* int2 */
@@ -720,7 +720,7 @@ DefineType(char *typeName, List * parameters)
}
static char *
-defGetString(DefElem * def)
+defGetString(DefElem *def)
{
if (nodeTag(def->arg) != T_String)
elog(WARN, "Define: \"%s\" = what?", def->defname);
@@ -728,7 +728,7 @@ defGetString(DefElem * def)
}
static int
-defGetTypeLength(DefElem * def)
+defGetTypeLength(DefElem *def)
{
if (nodeTag(def->arg) == T_Integer)
return (intVal(def->arg));
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index c1ad092e92f129a3e1110880d8642dbac39a909e..55a8d2b85dc4c08b48471637b657bb1cde5979f4 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.12 1997/09/08 02:22:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.13 1997/09/08 21:42:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,9 +32,9 @@ typedef struct ExplainState
bool printNodes; /* do nodeToString() instead */
/* other states */
List *rtable; /* range table */
-} ExplainState;
+} ExplainState;
-static char *Explain_PlanToString(Plan * plan, ExplainState * es);
+static char *Explain_PlanToString(Plan *plan, ExplainState *es);
/*
* ExplainQuery -
@@ -42,7 +42,7 @@ static char *Explain_PlanToString(Plan * plan, ExplainState * es);
*
*/
void
-ExplainQuery(Query * query, bool verbose, CommandDest dest)
+ExplainQuery(Query *query, bool verbose, CommandDest dest)
{
char *s = NULL,
*s2;
@@ -116,7 +116,7 @@ ExplainQuery(Query * query, bool verbose, CommandDest dest)
* converts a Node into ascii string and append it to 'str'
*/
static void
-explain_outNode(StringInfo str, Plan * plan, int indent, ExplainState * es)
+explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
{
char *pname;
char buf[1000];
@@ -225,7 +225,7 @@ explain_outNode(StringInfo str, Plan * plan, int indent, ExplainState * es)
}
static char *
-Explain_PlanToString(Plan * plan, ExplainState * es)
+Explain_PlanToString(Plan *plan, ExplainState *es)
{
StringInfo str;
char *s;
diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c
index 7796b164c3abd6a23020dcfde574c0e32b748413..945dc7d7c2bcac21ef461f475b925e0ff0db68db 100644
--- a/src/backend/commands/recipe.c
+++ b/src/backend/commands/recipe.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.8 1997/09/08 02:22:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.9 1997/09/08 21:42:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,7 +36,7 @@ extern CommandDest whereToSendOutput;
#ifndef TIOGA
void
-beginRecipe(RecipeStmt * stmt)
+beginRecipe(RecipeStmt *stmt)
{
elog(NOTICE, "You must compile with TIOGA defined in order to use recipes\n");
}
@@ -61,36 +61,36 @@ typedef struct _teeInfo
TeePlanInfo *val;
} TeeInfo;
-QueryTreeList *appendQlist(QueryTreeList * q1, QueryTreeList * q2);
-void OffsetVarAttno(Node * node, int varno, int offset);
+QueryTreeList *appendQlist(QueryTreeList *q1, QueryTreeList *q2);
+void OffsetVarAttno(Node *node, int varno, int offset);
static void
appendTeeQuery(TeeInfo * teeInfo,
- QueryTreeList * q,
+ QueryTreeList *q,
char *teeNodeName);
static Plan *
-replaceTeeScans(Plan * plan,
- Query * parsetree,
+replaceTeeScans(Plan *plan,
+ Query *parsetree,
TeeInfo * teeInfo);
static void
-replaceSeqScan(Plan * plan,
- Plan * parent,
+replaceSeqScan(Plan *plan,
+ Plan *parent,
int rt_ind,
- Plan * tplan);
+ Plan *tplan);
static void
tg_rewriteQuery(TgRecipe * r, TgNode * n,
- QueryTreeList * q,
- QueryTreeList * inputQlist);
+ QueryTreeList *q,
+ QueryTreeList *inputQlist);
static Node *
-tg_replaceNumberedParam(Node * expression,
+tg_replaceNumberedParam(Node *expression,
int pnum,
int rt_ind,
char *teeRelName);
static Node *
-tg_rewriteParamsInExpr(Node * expression,
- QueryTreeList * inputQlist);
+tg_rewriteParamsInExpr(Node *expression,
+ QueryTreeList *inputQlist);
static QueryTreeList *
tg_parseSubQuery(TgRecipe * r,
TgNode * n,
@@ -99,7 +99,7 @@ static QueryTreeList *
tg_parseTeeNode(TgRecipe * r,
TgNode * n,
int i,
- QueryTreeList * qList,
+ QueryTreeList *qList,
TeeInfo * teeInfo);
@@ -127,7 +127,7 @@ tg_parseTeeNode(TgRecipe * r,
*/
void
-beginRecipe(RecipeStmt * stmt)
+beginRecipe(RecipeStmt *stmt)
{
TgRecipe *r;
int i;
@@ -317,8 +317,8 @@ beginRecipe(RecipeStmt * stmt)
static void
tg_rewriteQuery(TgRecipe * r,
TgNode * n,
- QueryTreeList * q,
- QueryTreeList * inputQlist)
+ QueryTreeList *q,
+ QueryTreeList *inputQlist)
{
Query *orig;
Query *inputQ;
@@ -426,7 +426,7 @@ tg_rewriteQuery(TgRecipe * r,
*/
static Node *
-tg_replaceNumberedParam(Node * expression,
+tg_replaceNumberedParam(Node *expression,
int pnum, /* the number of the parameter */
int rt_ind, /* the range table index */
char *teeRelName) /* the relname of the tee
@@ -573,7 +573,7 @@ tg_replaceNumberedParam(Node * expression,
*/
static Node *
-tg_rewriteParamsInExpr(Node * expression, QueryTreeList * inputQlist)
+tg_rewriteParamsInExpr(Node *expression, QueryTreeList *inputQlist)
{
List *tl;
TargetEntry *param_tle,
@@ -759,7 +759,7 @@ static QueryTreeList *
tg_parseTeeNode(TgRecipe * r,
TgNode * n, /* the tee node */
int i, /* which input this node is to its parent */
- QueryTreeList * qList,
+ QueryTreeList *qList,
TeeInfo * teeInfo)
{
@@ -1104,7 +1104,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
*/
void
-OffsetVarAttno(Node * node, int varno, int offset)
+OffsetVarAttno(Node *node, int varno, int offset)
{
if (node == NULL)
return;
@@ -1157,7 +1157,7 @@ OffsetVarAttno(Node * node, int varno, int offset)
*/
QueryTreeList *
-appendQlist(QueryTreeList * q1, QueryTreeList * q2)
+appendQlist(QueryTreeList *q1, QueryTreeList *q2)
{
QueryTreeList *newq;
int i,
@@ -1189,7 +1189,7 @@ appendQlist(QueryTreeList * q1, QueryTreeList * q2)
* modify the query field of the teeInfo list of the particular tee node
*/
static void
-appendTeeQuery(TeeInfo * teeInfo, QueryTreeList * q, char *teeNodeName)
+appendTeeQuery(TeeInfo * teeInfo, QueryTreeList *q, char *teeNodeName)
{
int i;
@@ -1220,8 +1220,8 @@ appendTeeQuery(TeeInfo * teeInfo, QueryTreeList * q, char *teeNodeName)
* qual or targetlist because the child plan has been replaced with a tee node
*/
static void
-replaceSeqScan(Plan * plan, Plan * parent,
- int rt_ind, Plan * tplan)
+replaceSeqScan(Plan *plan, Plan *parent,
+ int rt_ind, Plan *tplan)
{
Scan *snode;
Tee *teePlan;
@@ -1307,7 +1307,7 @@ replaceSeqScan(Plan * plan, Plan * parent,
* a connection to the actual tee plan node
*/
static Plan *
-replaceTeeScans(Plan * plan, Query * parsetree, TeeInfo * teeInfo)
+replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo)
{
int i;
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 41f18a8f8b7d23bb277ced6a39bef20d3aed5935..5a5f811d7eb53bd18dc9195c3c26132d6c0c9173 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.13 1997/09/08 20:55:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.14 1997/09/08 21:42:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -330,7 +330,7 @@ RemoveType(char *typeName) /* type name to be removed */
void
RemoveFunction(char *functionName, /* function name to be removed */
int nargs,
- List * argNameList /* list of TypeNames */ )
+ List *argNameList /* list of TypeNames */ )
{
Relation relation;
HeapScanDesc scan;
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 82c3deaf64406a43fad504a5108a4d525e5f8a14..1f63b9e96e1bf07a6eb6976c1ca6ab47e95212c2 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -36,14 +36,14 @@ typedef struct FormData_pg_sequence
int4 cache_value;
char is_cycled;
char is_called;
-} FormData_pg_sequence;
+} FormData_pg_sequence;
typedef FormData_pg_sequence *SequenceTupleForm;
typedef struct sequence_magic
{
uint32 magic;
-} sequence_magic;
+} sequence_magic;
typedef struct SeqTableData
{
@@ -54,7 +54,7 @@ typedef struct SeqTableData
int4 last;
int4 increment;
struct SeqTableData *next;
-} SeqTableData;
+} SeqTableData;
typedef SeqTableData *SeqTable;
@@ -62,15 +62,15 @@ static SeqTable seqtab = NULL;
static SeqTable init_sequence(char *caller, char *name);
static SequenceTupleForm read_info(char *caller, SeqTable elm, Buffer *buf);
-static void init_params(CreateSeqStmt * seq, SequenceTupleForm new);
-static int get_param(DefElem * def);
+static void init_params(CreateSeqStmt *seq, SequenceTupleForm new);
+static int get_param(DefElem *def);
/*
* DefineSequence --
* Creates a new sequence relation
*/
void
-DefineSequence(CreateSeqStmt * seq)
+DefineSequence(CreateSeqStmt *seq)
{
FormData_pg_sequence new;
CreateStmt *stmt = makeNode(CreateStmt);
@@ -459,7 +459,7 @@ CloseSequences(void)
static void
-init_params(CreateSeqStmt * seq, SequenceTupleForm new)
+init_params(CreateSeqStmt *seq, SequenceTupleForm new)
{
DefElem *last_value = NULL;
DefElem *increment_by = NULL;
@@ -544,7 +544,7 @@ init_params(CreateSeqStmt * seq, SequenceTupleForm new)
static int
-get_param(DefElem * def)
+get_param(DefElem *def)
{
if (def->arg == (Node *) NULL)
elog(WARN, "DefineSequence: \"%s\" value unspecified", def->defname);
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index e25c955d8d7089cd5ef996d315e26781f4f1ac3c..cb5cc434f3f8b31a9d33a26d0e4a6b447ab8895c 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -37,13 +37,13 @@ TriggerData *CurrentTriggerData = NULL;
void RelationBuildTriggers(Relation relation);
void FreeTriggerDesc(Relation relation);
-static void DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger);
+static void DescribeTrigger(TriggerDesc *trigdesc, Trigger *trigger);
-extern void fmgr_info(Oid procedureId, func_ptr * function, int *nargs);
+extern void fmgr_info(Oid procedureId, func_ptr *function, int *nargs);
extern GlobalMemory CacheCxt;
void
-CreateTrigger(CreateTrigStmt * stmt)
+CreateTrigger(CreateTrigStmt *stmt)
{
int16 tgtype;
int16 tgattr[8] = {0};
@@ -211,7 +211,7 @@ CreateTrigger(CreateTrigStmt * stmt)
}
void
-DropTrigger(DropTrigStmt * stmt)
+DropTrigger(DropTrigStmt *stmt)
{
Relation rel;
Relation tgrel;
@@ -481,7 +481,7 @@ FreeTriggerDesc(Relation relation)
}
static void
-DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger)
+DescribeTrigger(TriggerDesc *trigdesc, Trigger *trigger)
{
uint16 *n;
Trigger ***t,
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 1bd08c8a3f3749916a03ab0c10891b11cf96a0b4..7f93d0243307bc800b1975abb633bd5a5160f984 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.45 1997/09/08 20:55:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.46 1997/09/08 21:42:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,37 +74,37 @@ static int MESSAGE_LEVEL; /* message level */
/* non-export function prototypes */
static void vc_init(void);
static void vc_shutdown(void);
-static void vc_vacuum(NameData * VacRelP, bool analyze, List * va_cols);
-static VRelList vc_getrels(NameData * VacRelP);
-static void vc_vacone(Oid relid, bool analyze, List * va_cols);
-static void vc_scanheap(VRelStats * vacrelstats, Relation onerel, VPageList Vvpl, VPageList Fvpl);
-static void vc_rpfheap(VRelStats * vacrelstats, Relation onerel, VPageList Vvpl, VPageList Fvpl, int nindices, Relation * Irel);
-static void vc_vacheap(VRelStats * vacrelstats, Relation onerel, VPageList vpl);
+static void vc_vacuum(NameData *VacRelP, bool analyze, List *va_cols);
+static VRelList vc_getrels(NameData *VacRelP);
+static void vc_vacone(Oid relid, bool analyze, List *va_cols);
+static void vc_scanheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl, VPageList Fvpl);
+static void vc_rpfheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl, VPageList Fvpl, int nindices, Relation *Irel);
+static void vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList vpl);
static void vc_vacpage(Page page, VPageDescr vpd, Relation archrel);
static void vc_vaconeind(VPageList vpl, Relation indrel, int nhtups);
static void vc_scanoneind(Relation indrel, int nhtups);
-static void vc_attrstats(Relation onerel, VRelStats * vacrelstats, HeapTuple htup);
-static void vc_bucketcpy(AttributeTupleForm attr, Datum value, Datum * bucket, int16 * bucket_len);
-static void vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats * vacrelstats);
+static void vc_attrstats(Relation onerel, VRelStats *vacrelstats, HeapTuple htup);
+static void vc_bucketcpy(AttributeTupleForm attr, Datum value, Datum *bucket, int16 *bucket_len);
+static void vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelstats);
static void vc_delhilowstats(Oid relid, int attcnt, int *attnums);
static void vc_setpagelock(Relation rel, BlockNumber blkno);
static VPageDescr vc_tidreapped(ItemPointer itemptr, VPageList vpl);
static void vc_reappage(VPageList vpl, VPageDescr vpc);
static void vc_vpinsert(VPageList vpl, VPageDescr vpnew);
static void vc_free(VRelList vrl);
-static void vc_getindices(Oid relid, int *nindices, Relation ** Irel);
-static void vc_clsindices(int nindices, Relation * Irel);
+static void vc_getindices(Oid relid, int *nindices, Relation **Irel);
+static void vc_clsindices(int nindices, Relation *Irel);
static Relation vc_getarchrel(Relation heaprel);
static void vc_archive(Relation archrel, HeapTuple htup);
static bool vc_isarchrel(char *rname);
-static void vc_mkindesc(Relation onerel, int nindices, Relation * Irel, IndDesc ** Idesc);
+static void vc_mkindesc(Relation onerel, int nindices, Relation *Irel, IndDesc **Idesc);
static char *vc_find_eq(char *bot, int nelem, int size, char *elm, int (*compar) (char *, char *));
static int vc_cmp_blk(char *left, char *right);
static int vc_cmp_offno(char *left, char *right);
static bool vc_enough_space(VPageDescr vpd, Size len);
void
-vacuum(char *vacrel, bool verbose, bool analyze, List * va_spec)
+vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec)
{
char *pname;
MemoryContext old;
@@ -236,7 +236,7 @@ vc_abort()
* locks at one time.
*/
static void
-vc_vacuum(NameData * VacRelP, bool analyze, List * va_cols)
+vc_vacuum(NameData *VacRelP, bool analyze, List *va_cols)
{
VRelList vrl,
cur;
@@ -255,7 +255,7 @@ vc_vacuum(NameData * VacRelP, bool analyze, List * va_cols)
}
static VRelList
-vc_getrels(NameData * VacRelP)
+vc_getrels(NameData *VacRelP)
{
Relation pgclass;
TupleDesc pgcdesc;
@@ -402,7 +402,7 @@ vc_getrels(NameData * VacRelP)
* us to lock the entire database during one pass of the vacuum cleaner.
*/
static void
-vc_vacone(Oid relid, bool analyze, List * va_cols)
+vc_vacone(Oid relid, bool analyze, List *va_cols)
{
Relation pgclass;
TupleDesc pgcdesc;
@@ -639,7 +639,7 @@ vc_vacone(Oid relid, bool analyze, List * va_cols)
* on the number of live tuples in a heap.
*/
static void
-vc_scanheap(VRelStats * vacrelstats, Relation onerel,
+vc_scanheap(VRelStats *vacrelstats, Relation onerel,
VPageList Vvpl, VPageList Fvpl)
{
int nblocks,
@@ -969,8 +969,8 @@ Tup %u: Vac %u, Crash %u, UnUsed %u, MinLen %u, MaxLen %u; Re-using: Free/Avail.
* if some end-blocks are gone away.
*/
static void
-vc_rpfheap(VRelStats * vacrelstats, Relation onerel,
- VPageList Vvpl, VPageList Fvpl, int nindices, Relation * Irel)
+vc_rpfheap(VRelStats *vacrelstats, Relation onerel,
+ VPageList Vvpl, VPageList Fvpl, int nindices, Relation *Irel)
{
TransactionId myXID;
CommandId myCID;
@@ -1424,7 +1424,7 @@ Elapsed %u/%u sec.",
* if there are "empty" end-blocks.
*/
static void
-vc_vacheap(VRelStats * vacrelstats, Relation onerel, VPageList Vvpl)
+vc_vacheap(VRelStats *vacrelstats, Relation onerel, VPageList Vvpl)
{
Buffer buf;
Page page;
@@ -1700,7 +1700,7 @@ vc_tidreapped(ItemPointer itemptr, VPageList vpl)
*
*/
static void
-vc_attrstats(Relation onerel, VRelStats * vacrelstats, HeapTuple htup)
+vc_attrstats(Relation onerel, VRelStats *vacrelstats, HeapTuple htup)
{
int i,
attr_cnt = vacrelstats->va_natts;
@@ -1800,7 +1800,7 @@ vc_attrstats(Relation onerel, VRelStats * vacrelstats, HeapTuple htup)
*
*/
static void
-vc_bucketcpy(AttributeTupleForm attr, Datum value, Datum * bucket, int16 * bucket_len)
+vc_bucketcpy(AttributeTupleForm attr, Datum value, Datum *bucket, int16 *bucket_len)
{
if (attr->attbyval && attr->attlen != -1)
*bucket = value;
@@ -1831,7 +1831,7 @@ vc_bucketcpy(AttributeTupleForm attr, Datum value, Datum * bucket, int16 * bucke
* historical queries very expensive.
*/
static void
-vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats * vacrelstats)
+vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelstats)
{
Relation rd,
ad,
@@ -2259,7 +2259,7 @@ vc_cmp_offno(char *left, char *right)
static void
-vc_getindices(Oid relid, int *nindices, Relation ** Irel)
+vc_getindices(Oid relid, int *nindices, Relation **Irel)
{
Relation pgindex;
Relation irel;
@@ -2336,7 +2336,7 @@ vc_getindices(Oid relid, int *nindices, Relation ** Irel)
static void
-vc_clsindices(int nindices, Relation * Irel)
+vc_clsindices(int nindices, Relation *Irel)
{
if (Irel == (Relation *) NULL)
@@ -2352,7 +2352,7 @@ vc_clsindices(int nindices, Relation * Irel)
static void
-vc_mkindesc(Relation onerel, int nindices, Relation * Irel, IndDesc ** Idesc)
+vc_mkindesc(Relation onerel, int nindices, Relation *Irel, IndDesc **Idesc)
{
IndDesc *idcur;
HeapTuple pgIndexTup;
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index c4f411021ad37bc014f141cde31557dc88d7cc60..0c4c62074c2454b991cf83470ce0edde3458c406 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.10 1997/09/08 02:22:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.11 1997/09/08 21:42:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,7 @@
*---------------------------------------------------------------------
*/
static void
-DefineVirtualRelation(char *relname, List * tlist)
+DefineVirtualRelation(char *relname, List *tlist)
{
CreateStmt createStmt;
List *attrList,
@@ -143,7 +143,7 @@ MakeRetrieveViewRuleName(char *viewName)
}
static RuleStmt *
-FormViewRetrieveRule(char *viewName, Query * viewParse)
+FormViewRetrieveRule(char *viewName, Query *viewParse)
{
RuleStmt *rule;
char *rname;
@@ -170,7 +170,7 @@ FormViewRetrieveRule(char *viewName, Query * viewParse)
}
static void
-DefineViewRules(char *viewName, Query * viewParse)
+DefineViewRules(char *viewName, Query *viewParse)
{
RuleStmt *retrieve_rule = NULL;
@@ -224,7 +224,7 @@ DefineViewRules(char *viewName, Query * viewParse)
*---------------------------------------------------------------
*/
static void
-UpdateRangeTableOfViewParse(char *viewName, Query * viewParse)
+UpdateRangeTableOfViewParse(char *viewName, Query *viewParse)
{
List *old_rt;
List *new_rt;
@@ -275,7 +275,7 @@ UpdateRangeTableOfViewParse(char *viewName, Query * viewParse)
*-------------------------------------------------------------------
*/
void
-DefineView(char *viewName, Query * viewParse)
+DefineView(char *viewName, Query *viewParse)
{
List *viewTlist;
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 3aeb78ed370f180bc2d14ff190dbb92226889e4b..ad659f5995ea192f90a8e9e42b9886920945eab1 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.7 1997/09/08 02:22:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.8 1997/09/08 21:42:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -71,8 +71,8 @@ ExecOpenScanR(Oid relOid,
bool isindex,
ScanDirection dir,
TimeQual timeRange,
- Relation * returnRelation, /* return */
- Pointer * returnScanDesc) /* return */
+ Relation *returnRelation, /* return */
+ Pointer *returnScanDesc) /* return */
{
Relation relation;
Pointer scanDesc;
@@ -195,7 +195,7 @@ ExecBeginScan(Relation relation,
* ----------------------------------------------------------------
*/
void
-ExecCloseR(Plan * node)
+ExecCloseR(Plan *node)
{
CommonScanState *state;
Relation relation;
@@ -288,7 +288,7 @@ ExecCloseR(Plan * node)
* ----------------------------------------------------------------
*/
void
-ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent)
+ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent)
{
switch (nodeTag(node))
{
@@ -328,7 +328,7 @@ ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent)
* ----------------------------------------------------------------
*/
HeapScanDesc
-ExecReScanR(Relation relDesc, /* LLL relDesc unused */
+ExecReScanR(Relation relDesc, /* LLL relDesc unused */
HeapScanDesc scanDesc,
ScanDirection direction,
int nkeys, /* LLL nkeys unused */
@@ -351,7 +351,7 @@ ExecReScanR(Relation relDesc, /* LLL relDesc unused */
* ----------------------------------------------------------------
*/
void
-ExecMarkPos(Plan * node)
+ExecMarkPos(Plan *node)
{
switch (nodeTag(node))
{
@@ -381,7 +381,7 @@ ExecMarkPos(Plan * node)
* ----------------------------------------------------------------
*/
void
-ExecRestrPos(Plan * node)
+ExecRestrPos(Plan *node)
{
switch (nodeTag(node))
{
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index cc98dd6e204ede448ba3f26ae1fff2bb06e28fd2..92bef496fcca567c5e29911636939952745b0523 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.4 1997/09/08 02:22:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.5 1997/09/08 21:42:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,16 +34,16 @@
#ifdef SETS_FIXED
static bool
-FjoinBumpOuterNodes(TargetEntry * tlist, ExprContext * econtext,
+FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext,
DatumPtr results, char *nulls);
#endif
Datum
-ExecEvalIter(Iter * iterNode,
- ExprContext * econtext,
- bool * resultIsNull,
- bool * iterIsDone)
+ExecEvalIter(Iter *iterNode,
+ ExprContext *econtext,
+ bool *resultIsNull,
+ bool *iterIsDone)
{
Node *expression;
@@ -59,10 +59,10 @@ ExecEvalIter(Iter * iterNode,
}
void
-ExecEvalFjoin(TargetEntry * tlist,
- ExprContext * econtext,
- bool * isNullVect,
- bool * fj_isDone)
+ExecEvalFjoin(TargetEntry *tlist,
+ ExprContext *econtext,
+ bool *isNullVect,
+ bool *fj_isDone)
{
#ifdef SETS_FIXED
@@ -182,8 +182,8 @@ ExecEvalFjoin(TargetEntry * tlist,
#ifdef SETS_FIXED
static bool
-FjoinBumpOuterNodes(TargetEntry * tlist,
- ExprContext * econtext,
+FjoinBumpOuterNodes(TargetEntry *tlist,
+ ExprContext *econtext,
DatumPtr results,
char *nulls)
{
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 1c9476fc35f8f21bb96016eac56f54db2e9440e9..cd07b2fa1dc888282757b4f9dcb27114fbec4b22 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.7 1997/09/08 02:22:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.8 1997/09/08 21:42:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,7 +61,7 @@
*-------------------------------------------------------------------------
*/
JunkFilter *
-ExecInitJunkFilter(List * targetList)
+ExecInitJunkFilter(List *targetList)
{
JunkFilter *junkfilter;
List *cleanTargetList;
@@ -264,11 +264,11 @@ ExecInitJunkFilter(List * targetList)
*-------------------------------------------------------------------------
*/
bool
-ExecGetJunkAttribute(JunkFilter * junkfilter,
- TupleTableSlot * slot,
+ExecGetJunkAttribute(JunkFilter *junkfilter,
+ TupleTableSlot *slot,
char *attrName,
- Datum * value,
- bool * isNull)
+ Datum *value,
+ bool *isNull)
{
List *targetList;
List *t;
@@ -328,7 +328,7 @@ ExecGetJunkAttribute(JunkFilter * junkfilter,
*-------------------------------------------------------------------------
*/
HeapTuple
-ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot)
+ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
{
HeapTuple tuple;
HeapTuple cleanTuple;
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index c7ff5aa9107587d0fcedd58b342bc153ba20667b..91dc05922a6796d0112ce330c92dc52f404fe0fe 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.24 1997/09/08 02:22:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.25 1997/09/08 21:42:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,28 +57,28 @@
/* decls for local routines only used within this module */
static void
-ExecCheckPerms(CmdType operation, int resultRelation, List * rangeTable,
- Query * parseTree);
+ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
+ Query *parseTree);
static TupleDesc
-InitPlan(CmdType operation, Query * parseTree,
- Plan * plan, EState * estate);
-static void EndPlan(Plan * plan, EState * estate);
+InitPlan(CmdType operation, Query *parseTree,
+ Plan *plan, EState *estate);
+static void EndPlan(Plan *plan, EState *estate);
static TupleTableSlot *
-ExecutePlan(EState * estate, Plan * plan,
- Query * parseTree, CmdType operation,
+ExecutePlan(EState *estate, Plan *plan,
+ Query *parseTree, CmdType operation,
int numberTuples, ScanDirection direction,
void (*printfunc) ());
-static void ExecRetrieve(TupleTableSlot * slot, void (*printfunc) (),
- EState * estate);
+static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc) (),
+ EState *estate);
static void
-ExecAppend(TupleTableSlot * slot, ItemPointer tupleid,
- EState * estate);
+ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
+ EState *estate);
static void
-ExecDelete(TupleTableSlot * slot, ItemPointer tupleid,
- EState * estate);
+ExecDelete(TupleTableSlot *slot, ItemPointer tupleid,
+ EState *estate);
static void
-ExecReplace(TupleTableSlot * slot, ItemPointer tupleid,
- EState * estate, Query * parseTree);
+ExecReplace(TupleTableSlot *slot, ItemPointer tupleid,
+ EState *estate, Query *parseTree);
/* end of local decls */
@@ -110,7 +110,7 @@ ExecutorLimit(int limit)
* ----------------------------------------------------------------
*/
TupleDesc
-ExecutorStart(QueryDesc * queryDesc, EState * estate)
+ExecutorStart(QueryDesc *queryDesc, EState *estate)
{
TupleDesc result;
@@ -155,7 +155,7 @@ ExecutorStart(QueryDesc * queryDesc, EState * estate)
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecutorRun(QueryDesc * queryDesc, EState * estate, int feature, int count)
+ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count)
{
CmdType operation;
Query *parseTree;
@@ -279,7 +279,7 @@ ExecutorRun(QueryDesc * queryDesc, EState * estate, int feature, int count)
* ----------------------------------------------------------------
*/
void
-ExecutorEnd(QueryDesc * queryDesc, EState * estate)
+ExecutorEnd(QueryDesc *queryDesc, EState *estate)
{
/* sanity checks */
Assert(queryDesc != NULL);
@@ -300,8 +300,8 @@ ExecutorEnd(QueryDesc * queryDesc, EState * estate)
static void
ExecCheckPerms(CmdType operation,
int resultRelation,
- List * rangeTable,
- Query * parseTree)
+ List *rangeTable,
+ Query *parseTree)
{
int i = 1;
Oid relid;
@@ -390,7 +390,7 @@ ExecCheckPerms(CmdType operation,
* ----------------------------------------------------------------
*/
static TupleDesc
-InitPlan(CmdType operation, Query * parseTree, Plan * plan, EState * estate)
+InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
{
List *rangeTable;
int resultRelation;
@@ -625,7 +625,7 @@ InitPlan(CmdType operation, Query * parseTree, Plan * plan, EState * estate)
* ----------------------------------------------------------------
*/
static void
-EndPlan(Plan * plan, EState * estate)
+EndPlan(Plan *plan, EState *estate)
{
RelationInfo *resultRelationInfo;
Relation intoRelationDesc;
@@ -699,9 +699,9 @@ EndPlan(Plan * plan, EState * estate)
user can see it*/
static TupleTableSlot *
-ExecutePlan(EState * estate,
- Plan * plan,
- Query * parseTree,
+ExecutePlan(EState *estate,
+ Plan *plan,
+ Query *parseTree,
CmdType operation,
int numberTuples,
ScanDirection direction,
@@ -898,9 +898,9 @@ ExecutePlan(EState * estate,
* ----------------------------------------------------------------
*/
static void
-ExecRetrieve(TupleTableSlot * slot,
+ExecRetrieve(TupleTableSlot *slot,
void (*printfunc) (),
- EState * estate)
+ EState *estate)
{
HeapTuple tuple;
TupleDesc attrtype;
@@ -941,9 +941,9 @@ ExecRetrieve(TupleTableSlot * slot,
*/
static void
-ExecAppend(TupleTableSlot * slot,
+ExecAppend(TupleTableSlot *slot,
ItemPointer tupleid,
- EState * estate)
+ EState *estate)
{
HeapTuple tuple;
RelationInfo *resultRelationInfo;
@@ -1046,9 +1046,9 @@ ExecAppend(TupleTableSlot * slot,
* ----------------------------------------------------------------
*/
static void
-ExecDelete(TupleTableSlot * slot,
+ExecDelete(TupleTableSlot *slot,
ItemPointer tupleid,
- EState * estate)
+ EState *estate)
{
RelationInfo *resultRelationInfo;
Relation resultRelationDesc;
@@ -1114,10 +1114,10 @@ ExecDelete(TupleTableSlot * slot,
* ----------------------------------------------------------------
*/
static void
-ExecReplace(TupleTableSlot * slot,
+ExecReplace(TupleTableSlot *slot,
ItemPointer tupleid,
- EState * estate,
- Query * parseTree)
+ EState *estate,
+ Query *parseTree)
{
HeapTuple tuple;
RelationInfo *resultRelationInfo;
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 7e8cce52c7016333727648e5af35cec006042b74..8671e8e1b073e7b47214b21d910b4c3f2e076454 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.4 1997/09/08 02:22:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.5 1997/09/08 21:42:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -103,7 +103,7 @@
* ------------------------------------------------------------------------
*/
bool
-ExecInitNode(Plan * node, EState * estate, Plan * parent)
+ExecInitNode(Plan *node, EState *estate, Plan *parent)
{
bool result;
@@ -207,7 +207,7 @@ ExecInitNode(Plan * node, EState * estate, Plan * parent)
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecProcNode(Plan * node, Plan * parent)
+ExecProcNode(Plan *node, Plan *parent)
{
TupleTableSlot *result;
@@ -302,7 +302,7 @@ ExecProcNode(Plan * node, Plan * parent)
}
int
-ExecCountSlotsNode(Plan * node)
+ExecCountSlotsNode(Plan *node)
{
if (node == (Plan *) NULL)
return 0;
@@ -387,7 +387,7 @@ ExecCountSlotsNode(Plan * node)
* ----------------------------------------------------------------
*/
void
-ExecEndNode(Plan * node, Plan * parent)
+ExecEndNode(Plan *node, Plan *parent)
{
/* ----------------
* do nothing when we get to the end
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 8248c8f5c36c3fa16e4ebf715e4663204ea4133d..05d0721e31ccaf9c3e8a40457d60a7cc43ec9069 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.15 1997/09/08 20:55:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.16 1997/09/08 21:43:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,27 +69,27 @@ bool execConstByVal;
int execConstLen;
/* static functions decls */
-static Datum ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull);
+static Datum ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull);
static Datum
-ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext * econtext,
- bool * isNull, bool * isDone);
-static Datum ExecEvalAnd(Expr * andExpr, ExprContext * econtext, bool * isNull);
+ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
+ bool *isNull, bool *isDone);
+static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
static Datum
-ExecEvalFunc(Expr * funcClause, ExprContext * econtext,
- bool * isNull, bool * isDone);
+ExecEvalFunc(Expr *funcClause, ExprContext *econtext,
+ bool *isNull, bool *isDone);
static void
-ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext * econtext,
- List * argList, Datum argV[], bool * argIsDone);
-static Datum ExecEvalNot(Expr * notclause, ExprContext * econtext, bool * isNull);
+ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext,
+ List *argList, Datum argV[], bool *argIsDone);
+static Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull);
static Datum
-ExecEvalOper(Expr * opClause, ExprContext * econtext,
- bool * isNull);
-static Datum ExecEvalOr(Expr * orExpr, ExprContext * econtext, bool * isNull);
-static Datum ExecEvalVar(Var * variable, ExprContext * econtext, bool * isNull);
+ExecEvalOper(Expr *opClause, ExprContext *econtext,
+ bool *isNull);
+static Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull);
+static Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull);
static Datum
-ExecMakeFunctionResult(Node * node, List * arguments,
- ExprContext * econtext, bool * isNull, bool * isDone);
-static bool ExecQualClause(Node * clause, ExprContext * econtext);
+ExecMakeFunctionResult(Node *node, List *arguments,
+ ExprContext *econtext, bool *isNull, bool *isDone);
+static bool ExecQualClause(Node *clause, ExprContext *econtext);
/* --------------------------------
* ExecEvalArrayRef
@@ -102,9 +102,9 @@ static bool ExecQualClause(Node * clause, ExprContext * econtext);
*/
static Datum
ExecEvalArrayRef(ArrayRef *arrayRef,
- ExprContext * econtext,
- bool * isNull,
- bool * isDone)
+ ExprContext *econtext,
+ bool *isNull,
+ bool *isDone)
{
bool dummy;
int i = 0,
@@ -200,7 +200,7 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull)
+ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull)
{
*isNull = econtext->ecxt_nulls[agg->aggno];
@@ -231,7 +231,7 @@ ExecEvalAggreg(Aggreg *agg, ExprContext * econtext, bool * isNull)
*
* ---------------------------------------------------------------- */
static Datum
-ExecEvalVar(Var * variable, ExprContext * econtext, bool * isNull)
+ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull)
{
Datum result;
TupleTableSlot *slot;
@@ -377,7 +377,7 @@ ExecEvalVar(Var * variable, ExprContext * econtext, bool * isNull)
* ----------------------------------------------------------------
*/
Datum
-ExecEvalParam(Param * expression, ExprContext * econtext, bool * isNull)
+ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
{
char *thisParameterName;
@@ -509,9 +509,9 @@ ExecEvalParam(Param * expression, ExprContext * econtext, bool * isNull)
*/
#ifdef NOT_USED
static char *
-GetAttributeByNum(TupleTableSlot * slot,
+GetAttributeByNum(TupleTableSlot *slot,
AttrNumber attrno,
- bool * isNull)
+ bool *isNull)
{
Datum retval;
@@ -546,9 +546,9 @@ GetAttributeByNum(TupleTableSlot * slot,
/* XXX char16 name for catalogs */
#ifdef NOT_USED
char *
-att_by_num(TupleTableSlot * slot,
+att_by_num(TupleTableSlot *slot,
AttrNumber attrno,
- bool * isNull)
+ bool *isNull)
{
return (GetAttributeByNum(slot, attrno, isNull));
}
@@ -556,7 +556,7 @@ att_by_num(TupleTableSlot * slot,
#endif
char *
-GetAttributeByName(TupleTableSlot * slot, char *attname, bool * isNull)
+GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull)
{
AttrNumber attrno;
TupleDesc tupdesc;
@@ -609,7 +609,7 @@ GetAttributeByName(TupleTableSlot * slot, char *attname, bool * isNull)
/* XXX char16 name for catalogs */
#ifdef NOT_USED
char *
-att_by_name(TupleTableSlot * slot, char *attname, bool * isNull)
+att_by_name(TupleTableSlot *slot, char *attname, bool *isNull)
{
return (GetAttributeByName(slot, attname, isNull));
}
@@ -618,10 +618,10 @@ att_by_name(TupleTableSlot * slot, char *attname, bool * isNull)
static void
ExecEvalFuncArgs(FunctionCachePtr fcache,
- ExprContext * econtext,
- List * argList,
+ ExprContext *econtext,
+ List *argList,
Datum argV[],
- bool * argIsDone)
+ bool *argIsDone)
{
int i;
bool argIsNull,
@@ -664,11 +664,11 @@ ExecEvalFuncArgs(FunctionCachePtr fcache,
* ----------------
*/
static Datum
-ExecMakeFunctionResult(Node * node,
- List * arguments,
- ExprContext * econtext,
- bool * isNull,
- bool * isDone)
+ExecMakeFunctionResult(Node *node,
+ List *arguments,
+ ExprContext *econtext,
+ bool *isNull,
+ bool *isDone)
{
Datum argv[MAXFMGRARGS];
FunctionCachePtr fcache;
@@ -864,7 +864,7 @@ ExecMakeFunctionResult(Node * node,
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalOper(Expr * opClause, ExprContext * econtext, bool * isNull)
+ExecEvalOper(Expr *opClause, ExprContext *econtext, bool *isNull)
{
Oper *op;
List *argList;
@@ -909,10 +909,10 @@ ExecEvalOper(Expr * opClause, ExprContext * econtext, bool * isNull)
*/
static Datum
-ExecEvalFunc(Expr * funcClause,
- ExprContext * econtext,
- bool * isNull,
- bool * isDone)
+ExecEvalFunc(Expr *funcClause,
+ ExprContext *econtext,
+ bool *isNull,
+ bool *isDone)
{
Func *func;
List *argList;
@@ -964,7 +964,7 @@ ExecEvalFunc(Expr * funcClause,
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalNot(Expr * notclause, ExprContext * econtext, bool * isNull)
+ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull)
{
Datum expr_value;
Node *clause;
@@ -1003,7 +1003,7 @@ ExecEvalNot(Expr * notclause, ExprContext * econtext, bool * isNull)
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalOr(Expr * orExpr, ExprContext * econtext, bool * isNull)
+ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull)
{
List *clauses;
List *clause;
@@ -1067,7 +1067,7 @@ ExecEvalOr(Expr * orExpr, ExprContext * econtext, bool * isNull)
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalAnd(Expr * andExpr, ExprContext * econtext, bool * isNull)
+ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull)
{
List *clauses;
List *clause;
@@ -1144,10 +1144,10 @@ ExecEvalAnd(Expr * andExpr, ExprContext * econtext, bool * isNull)
* ----------------------------------------------------------------
*/
Datum
-ExecEvalExpr(Node * expression,
- ExprContext * econtext,
- bool * isNull,
- bool * isDone)
+ExecEvalExpr(Node *expression,
+ ExprContext *econtext,
+ bool *isNull,
+ bool *isDone)
{
Datum retDatum = 0;
@@ -1257,7 +1257,7 @@ ExecEvalExpr(Node * expression,
* ----------------------------------------------------------------
*/
static bool
-ExecQualClause(Node * clause, ExprContext * econtext)
+ExecQualClause(Node *clause, ExprContext *econtext)
{
Datum expr_value;
bool isNull;
@@ -1302,7 +1302,7 @@ ExecQualClause(Node * clause, ExprContext * econtext)
* ----------------------------------------------------------------
*/
bool
-ExecQual(List * qual, ExprContext * econtext)
+ExecQual(List *qual, ExprContext *econtext)
{
List *clause;
bool result;
@@ -1354,7 +1354,7 @@ ExecQual(List * qual, ExprContext * econtext)
}
int
-ExecTargetListLength(List * targetlist)
+ExecTargetListLength(List *targetlist)
{
int len;
List *tl;
@@ -1381,12 +1381,12 @@ ExecTargetListLength(List * targetlist)
* ----------------------------------------------------------------
*/
static HeapTuple
-ExecTargetList(List * targetlist,
+ExecTargetList(List *targetlist,
int nodomains,
TupleDesc targettype,
- Datum * values,
- ExprContext * econtext,
- bool * isDone)
+ Datum *values,
+ ExprContext *econtext,
+ bool *isDone)
{
char nulls_array[64];
bool fjNullArray[64];
@@ -1579,7 +1579,7 @@ ExecTargetList(List * targetlist,
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecProject(ProjectionInfo * projInfo, bool * isDone)
+ExecProject(ProjectionInfo *projInfo, bool *isDone)
{
TupleTableSlot *slot;
List *targetlist;
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 84dac56a2371f7bad9f2504d93e506d0e6e9b3e6..6c9a16a12b47211bfcd5b8ae838d2da9b3b27e8b 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.5 1997/09/08 02:22:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.6 1997/09/08 21:43:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,8 +43,8 @@
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecScan(Scan * node,
- TupleTableSlot * (*accessMtd) ()) /* function returning a
+ExecScan(Scan *node,
+ TupleTableSlot *(*accessMtd) ()) /* function returning a
* tuple */
{
CommonScanState *scanstate;
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 373e94ae1a77cdb8a463ef6aca3dd9936eca2ccc..7e13b95b7a31a002b790b5a2a85afbbf3cea36be 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.8 1997/09/08 02:22:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.9 1997/09/08 21:43:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -131,7 +131,7 @@
#include "parser/catalog_utils.h"
#include "catalog/pg_type.h"
-static TupleTableSlot *NodeGetResultTupleSlot(Plan * node);
+static TupleTableSlot *NodeGetResultTupleSlot(Plan *node);
/* ----------------------------------------------------------------
@@ -150,8 +150,8 @@ static TupleTableSlot *NodeGetResultTupleSlot(Plan * node);
* --------------------------------
*/
TupleTable /* return: address of table */
-ExecCreateTupleTable(int initialSize) /* initial number of slots
- * in table */
+ExecCreateTupleTable(int initialSize) /* initial number of slots in
+ * table */
{
TupleTable newtable; /* newly allocated table */
TupleTableSlot *array; /* newly allocated slot array */
@@ -349,7 +349,7 @@ ExecAllocTableSlot(TupleTable table)
*/
TupleTableSlot * /* return: slot passed */
ExecStoreTuple(HeapTuple tuple, /* tuple to store */
- TupleTableSlot * slot, /* slot in which to store tuple */
+ TupleTableSlot *slot, /* slot in which to store tuple */
Buffer buffer, /* buffer associated with tuple */
bool shouldFree) /* true if we call pfree() when we gc. */
{
@@ -381,7 +381,7 @@ ExecStoreTuple(HeapTuple tuple, /* tuple to store */
* --------------------------------
*/
TupleTableSlot * /* return: slot passed */
-ExecClearTuple(TupleTableSlot * slot) /* slot in which to store tuple */
+ExecClearTuple(TupleTableSlot *slot) /* slot in which to store tuple */
{
HeapTuple oldtuple; /* prior contents of slot */
@@ -441,7 +441,7 @@ ExecClearTuple(TupleTableSlot * slot) /* slot in which to store tuple */
*/
#ifdef NOT_USED
bool /* return: slot policy */
-ExecSlotPolicy(TupleTableSlot * slot) /* slot to inspect */
+ExecSlotPolicy(TupleTableSlot *slot) /* slot to inspect */
{
return slot->ttc_shouldFree;
}
@@ -458,7 +458,7 @@ ExecSlotPolicy(TupleTableSlot * slot) /* slot to inspect */
* --------------------------------
*/
bool /* return: old slot policy */
-ExecSetSlotPolicy(TupleTableSlot * slot, /* slot to change */
+ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */
bool shouldFree) /* true if we call pfree() when we
* gc. */
{
@@ -487,7 +487,7 @@ ExecSetSlotPolicy(TupleTableSlot * slot, /* slot to change */
* --------------------------------
*/
TupleDesc /* return: old slot tuple descriptor */
-ExecSetSlotDescriptor(TupleTableSlot * slot, /* slot to change */
+ExecSetSlotDescriptor(TupleTableSlot *slot, /* slot to change */
TupleDesc tupdesc) /* tuple descriptor */
{
TupleDesc old_tupdesc = slot->ttc_tupleDescriptor;
@@ -503,7 +503,7 @@ ExecSetSlotDescriptor(TupleTableSlot * slot, /* slot to change */
* --------------------------------
*/
void
-ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, /* slot to change */
+ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, /* slot to change */
bool isNew) /* "isNew" setting */
{
slot->ttc_descIsNew = isNew;
@@ -518,7 +518,7 @@ ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, /* slot to change */
*/
#ifdef NOT_USED
TupleDesc /* return: old slot tuple descriptor */
-ExecSetNewSlotDescriptor(TupleTableSlot * slot, /* slot to change */
+ExecSetNewSlotDescriptor(TupleTableSlot *slot, /* slot to change */
TupleDesc tupdesc) /* tuple descriptor */
{
TupleDesc old_tupdesc = slot->ttc_tupleDescriptor;
@@ -554,7 +554,7 @@ ExecSetNewSlotDescriptor(TupleTableSlot * slot, /* slot to change */
*/
#ifdef NOT_USED
Buffer /* return: old slot buffer */
-ExecSetSlotBuffer(TupleTableSlot * slot, /* slot to change */
+ExecSetSlotBuffer(TupleTableSlot *slot, /* slot to change */
Buffer b) /* tuple descriptor */
{
Buffer oldb = slot->ttc_buffer;
@@ -575,7 +575,7 @@ ExecSetSlotBuffer(TupleTableSlot * slot, /* slot to change */
* --------------------------------
*/
void
-ExecIncrSlotBufferRefcnt(TupleTableSlot * slot) /* slot to bump refcnt */
+ExecIncrSlotBufferRefcnt(TupleTableSlot *slot) /* slot to bump refcnt */
{
/* Buffer b = SlotBuffer((TupleTableSlot*) slot); */
Buffer b = slot->ttc_buffer;
@@ -597,7 +597,7 @@ ExecIncrSlotBufferRefcnt(TupleTableSlot * slot) /* slot to bump refcnt */
* ----------------
*/
bool /* return: true if tuple in slot is NULL */
-TupIsNull(TupleTableSlot * slot) /* slot to check */
+TupIsNull(TupleTableSlot *slot) /* slot to check */
{
HeapTuple tuple; /* contents of slot (returned) */
@@ -629,7 +629,7 @@ TupIsNull(TupleTableSlot * slot) /* slot to check */
*/
#ifdef NOT_USED
bool /* return: descriptor "is new" */
-ExecSlotDescriptorIsNew(TupleTableSlot * slot) /* slot to inspect */
+ExecSlotDescriptorIsNew(TupleTableSlot *slot) /* slot to inspect */
{
/* bool isNew = SlotTupleDescriptorIsNew((TupleTableSlot*) slot);
return isNew; */
@@ -667,7 +667,7 @@ ExecSlotDescriptorIsNew(TupleTableSlot * slot) /* slot to inspect */
* ----------------
*/
void
-ExecInitResultTupleSlot(EState * estate, CommonState * commonstate)
+ExecInitResultTupleSlot(EState *estate, CommonState *commonstate)
{
INIT_SLOT_DEFS;
INIT_SLOT_ALLOC;
@@ -679,7 +679,7 @@ ExecInitResultTupleSlot(EState * estate, CommonState * commonstate)
* ----------------
*/
void
-ExecInitScanTupleSlot(EState * estate, CommonScanState * commonscanstate)
+ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate)
{
INIT_SLOT_DEFS;
INIT_SLOT_ALLOC;
@@ -691,7 +691,7 @@ ExecInitScanTupleSlot(EState * estate, CommonScanState * commonscanstate)
* ----------------
*/
void
-ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate)
+ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate)
{
INIT_SLOT_DEFS;
INIT_SLOT_ALLOC;
@@ -703,7 +703,7 @@ ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate)
* ----------------
*/
void
-ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate)
+ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate)
{
INIT_SLOT_DEFS;
INIT_SLOT_ALLOC;
@@ -716,7 +716,7 @@ ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate)
*/
#ifdef NOT_USED
void
-ExecInitHashTupleSlot(EState * estate, HashJoinState * hashstate)
+ExecInitHashTupleSlot(EState *estate, HashJoinState *hashstate)
{
INIT_SLOT_DEFS;
INIT_SLOT_ALLOC;
@@ -726,7 +726,7 @@ ExecInitHashTupleSlot(EState * estate, HashJoinState * hashstate)
#endif
static TupleTableSlot *
-NodeGetResultTupleSlot(Plan * node)
+NodeGetResultTupleSlot(Plan *node)
{
TupleTableSlot *slot;
@@ -894,7 +894,7 @@ NodeGetResultTupleSlot(Plan * node)
*/
TupleDesc
-ExecGetTupType(Plan * node)
+ExecGetTupType(Plan *node)
{
TupleTableSlot *slot;
TupleDesc tupType;
@@ -946,7 +946,7 @@ ExecCopyTupType(TupleDesc td, int natts)
* ----------------------------------------------------------------
*/
TupleDesc
-ExecTypeFromTL(List * targetList)
+ExecTypeFromTL(List *targetList)
{
List *tlcdr;
TupleDesc typeInfo;
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 8d87e8591a9e45113d40ba308580178680879e13..ad478e06e122f38a5c6f9a25d18f23fbdc9ab568 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.17 1997/09/08 20:55:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.18 1997/09/08 21:43:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -106,7 +106,7 @@ ResetTupleCount(void)
*/
#ifdef NOT_USED
void
-DisplayTupleCount(FILE * statfp)
+DisplayTupleCount(FILE *statfp)
{
if (NTupleProcessed > 0)
fprintf(statfp, "!\t%d tuple%s processed, ", NTupleProcessed,
@@ -157,7 +157,7 @@ DisplayTupleCount(FILE * statfp)
* ----------------
*/
void
-ExecAssignNodeBaseInfo(EState * estate, CommonState * cstate, Plan * parent)
+ExecAssignNodeBaseInfo(EState *estate, CommonState *cstate, Plan *parent)
{
int baseId;
@@ -176,7 +176,7 @@ ExecAssignNodeBaseInfo(EState * estate, CommonState * cstate, Plan * parent)
* ----------------
*/
void
-ExecAssignExprContext(EState * estate, CommonState * commonstate)
+ExecAssignExprContext(EState *estate, CommonState *commonstate)
{
ExprContext *econtext;
ParamListInfo paraminfo;
@@ -207,7 +207,7 @@ ExecAssignExprContext(EState * estate, CommonState * commonstate)
* ----------------
*/
void
-ExecAssignResultType(CommonState * commonstate,
+ExecAssignResultType(CommonState *commonstate,
TupleDesc tupDesc)
{
TupleTableSlot *slot;
@@ -221,7 +221,7 @@ ExecAssignResultType(CommonState * commonstate,
* ----------------
*/
void
-ExecAssignResultTypeFromOuterPlan(Plan * node, CommonState * commonstate)
+ExecAssignResultTypeFromOuterPlan(Plan *node, CommonState *commonstate)
{
Plan *outerPlan;
TupleDesc tupDesc;
@@ -237,7 +237,7 @@ ExecAssignResultTypeFromOuterPlan(Plan * node, CommonState * commonstate)
* ----------------
*/
void
-ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate)
+ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate)
{
List *targetList;
int i;
@@ -293,7 +293,7 @@ ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate)
* ----------------
*/
TupleDesc
-ExecGetResultType(CommonState * commonstate)
+ExecGetResultType(CommonState *commonstate)
{
TupleTableSlot *slot = commonstate->cs_ResultTupleSlot;
@@ -306,7 +306,7 @@ ExecGetResultType(CommonState * commonstate)
*/
#ifdef NOT_USED
void
-ExecFreeResultType(CommonState * commonstate)
+ExecFreeResultType(CommonState *commonstate)
{
TupleTableSlot *slot;
TupleDesc tupType;
@@ -326,7 +326,7 @@ ExecFreeResultType(CommonState * commonstate)
* ----------------
*/
void
-ExecAssignProjectionInfo(Plan * node, CommonState * commonstate)
+ExecAssignProjectionInfo(Plan *node, CommonState *commonstate)
{
ProjectionInfo *projInfo;
List *targetList;
@@ -352,7 +352,7 @@ ExecAssignProjectionInfo(Plan * node, CommonState * commonstate)
* ----------------
*/
void
-ExecFreeProjectionInfo(CommonState * commonstate)
+ExecFreeProjectionInfo(CommonState *commonstate)
{
ProjectionInfo *projInfo;
@@ -391,7 +391,7 @@ ExecFreeProjectionInfo(CommonState * commonstate)
* ----------------
*/
TupleDesc
-ExecGetScanType(CommonScanState * csstate)
+ExecGetScanType(CommonScanState *csstate)
{
TupleTableSlot *slot = csstate->css_ScanTupleSlot;
@@ -404,7 +404,7 @@ ExecGetScanType(CommonScanState * csstate)
*/
#ifdef NOT_USED
void
-ExecFreeScanType(CommonScanState * csstate)
+ExecFreeScanType(CommonScanState *csstate)
{
TupleTableSlot *slot;
TupleDesc tupType;
@@ -423,7 +423,7 @@ ExecFreeScanType(CommonScanState * csstate)
* ----------------
*/
void
-ExecAssignScanType(CommonScanState * csstate,
+ExecAssignScanType(CommonScanState *csstate,
TupleDesc tupDesc)
{
TupleTableSlot *slot;
@@ -437,7 +437,7 @@ ExecAssignScanType(CommonScanState * csstate,
* ----------------
*/
void
-ExecAssignScanTypeFromOuterPlan(Plan * node, CommonScanState * csstate)
+ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate)
{
Plan *outerPlan;
TupleDesc tupDesc;
@@ -569,7 +569,7 @@ ExecFreeTypeInfo(TupleDesc typeInfo)
* ----------------------------------------------------------------
*/
TupleDesc
-QueryDescGetTypeInfo(QueryDesc * queryDesc)
+QueryDescGetTypeInfo(QueryDesc *queryDesc)
{
Plan *plan;
TupleDesc tupleType;
@@ -706,7 +706,7 @@ ExecGetIndexKeyInfo(IndexTupleForm indexTuple,
*/
void
ExecOpenIndices(Oid resultRelationOid,
- RelationInfo * resultRelationInfo)
+ RelationInfo *resultRelationInfo)
{
Relation indexRd;
HeapScanDesc indexSd;
@@ -952,7 +952,7 @@ ExecOpenIndices(Oid resultRelationOid,
* ----------------------------------------------------------------
*/
void
-ExecCloseIndices(RelationInfo * resultRelationInfo)
+ExecCloseIndices(RelationInfo *resultRelationInfo)
{
int i;
int numIndices;
@@ -984,7 +984,7 @@ IndexTuple
ExecFormIndexTuple(HeapTuple heapTuple,
Relation heapRelation,
Relation indexRelation,
- IndexInfo * indexInfo)
+ IndexInfo *indexInfo)
{
IndexTuple indexTuple;
TupleDesc heapDescriptor;
@@ -1070,9 +1070,9 @@ ExecFormIndexTuple(HeapTuple heapTuple,
* ----------------------------------------------------------------
*/
void
-ExecInsertIndexTuples(TupleTableSlot * slot,
+ExecInsertIndexTuples(TupleTableSlot *slot,
ItemPointer tupleid,
- EState * estate,
+ EState *estate,
bool is_update)
{
HeapTuple heapTuple;
@@ -1186,8 +1186,8 @@ ExecInsertIndexTuples(TupleTableSlot * slot,
* ----------------------------------------------------------------
*/
void
-setVarAttrLenForCreateTable(TupleDesc tupType, List * targetList,
- List * rangeTable)
+setVarAttrLenForCreateTable(TupleDesc tupType, List *targetList,
+ List *rangeTable)
{
List *tl;
TargetEntry *tle;
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 6b10ead651673d4bc013ba139c5131adb1c459ae..500a6eaa99aee0396c6000d6c05ed9db6eea6a47 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.9 1997/09/08 02:22:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.10 1997/09/08 21:43:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,7 +44,7 @@
typedef enum
{
F_EXEC_START, F_EXEC_RUN, F_EXEC_DONE
-} ExecStatus;
+} ExecStatus;
typedef struct local_es
{
@@ -52,30 +52,30 @@ typedef struct local_es
EState *estate;
struct local_es *next;
ExecStatus status;
-} execution_state;
+} execution_state;
#define LAST_POSTQUEL_COMMAND(es) ((es)->next == (execution_state *)NULL)
/* non-export function prototypes */
-static TupleDesc postquel_start(execution_state * es);
+static TupleDesc postquel_start(execution_state *es);
static execution_state *
init_execution_state(FunctionCachePtr fcache,
char *args[]);
-static TupleTableSlot *postquel_getnext(execution_state * es);
-static void postquel_end(execution_state * es);
+static TupleTableSlot *postquel_getnext(execution_state *es);
+static void postquel_end(execution_state *es);
static void
-postquel_sub_params(execution_state * es, int nargs,
- char *args[], bool * nullV);
+postquel_sub_params(execution_state *es, int nargs,
+ char *args[], bool *nullV);
static Datum
-postquel_execute(execution_state * es, FunctionCachePtr fcache,
- List * fTlist, char **args, bool * isNull);
+postquel_execute(execution_state *es, FunctionCachePtr fcache,
+ List *fTlist, char **args, bool *isNull);
Datum
ProjectAttribute(TupleDesc TD,
- TargetEntry * tlist,
+ TargetEntry *tlist,
HeapTuple tup,
- bool * isnullP)
+ bool *isnullP)
{
Datum val,
valueP;
@@ -172,7 +172,7 @@ init_execution_state(FunctionCachePtr fcache,
}
static TupleDesc
-postquel_start(execution_state * es)
+postquel_start(execution_state *es)
{
#ifdef FUNC_UTIL_PATCH
@@ -189,7 +189,7 @@ postquel_start(execution_state * es)
}
static TupleTableSlot *
-postquel_getnext(execution_state * es)
+postquel_getnext(execution_state *es)
{
int feature;
@@ -214,7 +214,7 @@ postquel_getnext(execution_state * es)
}
static void
-postquel_end(execution_state * es)
+postquel_end(execution_state *es)
{
#ifdef FUNC_UTIL_PATCH
@@ -231,10 +231,10 @@ postquel_end(execution_state * es)
}
static void
-postquel_sub_params(execution_state * es,
+postquel_sub_params(execution_state *es,
int nargs,
char *args[],
- bool * nullV)
+ bool *nullV)
{
ParamListInfo paramLI;
EState *estate;
@@ -256,7 +256,7 @@ postquel_sub_params(execution_state * es,
static TupleTableSlot *
copy_function_result(FunctionCachePtr fcache,
- TupleTableSlot * resultSlot)
+ TupleTableSlot *resultSlot)
{
TupleTableSlot *funcSlot;
TupleDesc resultTd;
@@ -299,11 +299,11 @@ copy_function_result(FunctionCachePtr fcache,
}
static Datum
-postquel_execute(execution_state * es,
+postquel_execute(execution_state *es,
FunctionCachePtr fcache,
- List * fTlist,
+ List *fTlist,
char **args,
- bool * isNull)
+ bool *isNull)
{
TupleTableSlot *slot;
Datum value;
@@ -398,7 +398,7 @@ postquel_execute(execution_state * es,
}
Datum
-postquel_function(Func * funcNode, char **args, bool * isNull, bool * isDone)
+postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone)
{
execution_state *es;
Datum result = 0;
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 71646b67e0098b493723d6216f8bf3bd7d2f38f2..7d7550ab433e2ee1489209cdf6febbf8ce76ab24 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -47,7 +47,7 @@ typedef struct AggFuncInfo
int finalfn_nargs;
} AggFuncInfo;
-static Datum aggGetAttr(TupleTableSlot * tuple, Aggreg *agg, bool * isNull);
+static Datum aggGetAttr(TupleTableSlot *tuple, Aggreg *agg, bool *isNull);
/* ---------------------------------------
@@ -376,7 +376,7 @@ ExecAgg(Agg *node)
value2[i] =
(Datum) fmgr_c(aggfns->xfn2, aggfns->xfn2_oid,
aggfns->xfn2_nargs,
- (FmgrValues *) & xfn2_val, &isNull2);
+ (FmgrValues *) &xfn2_val, &isNull2);
Assert(!isNull2);
}
}
@@ -488,7 +488,7 @@ ExecAgg(Agg *node)
* -----------------
*/
bool
-ExecInitAgg(Agg *node, EState * estate, Plan * parent)
+ExecInitAgg(Agg *node, EState *estate, Plan *parent)
{
AggState *aggstate;
Plan *outerPlan;
@@ -591,9 +591,9 @@ ExecEndAgg(Agg *node)
* over from the tuple
*/
static Datum
-aggGetAttr(TupleTableSlot * slot,
+aggGetAttr(TupleTableSlot *slot,
Aggreg *agg,
- bool * isNull)
+ bool *isNull)
{
Datum result;
AttrNumber attnum;
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 786c93c7191953cec08797732c9fb609ef3e5b66..3c073101275edd573767bb3c77d0ed3882aa02a3 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.8 1997/09/08 20:55:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.9 1997/09/08 21:43:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -182,7 +182,7 @@ exec_append_initialize_next(Append *node)
* ----------------------------------------------------------------
*/
bool
-ExecInitAppend(Append *node, EState * estate, Plan * parent)
+ExecInitAppend(Append *node, EState *estate, Plan *parent)
{
AppendState *unionstate;
int nplans;
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 4e9ab4cfc8109f22edae6a12062101732eb0f95b..3a86ef089dc60e730f83a625a805d22f312db08f 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,7 +13,7 @@
* columns. (ie. tuples from the same group are consecutive)
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.8 1997/09/08 20:55:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.9 1997/09/08 21:43:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,10 +28,10 @@
#include "executor/executor.h"
#include "executor/nodeGroup.h"
-static TupleTableSlot *ExecGroupEveryTuple(Group * node);
-static TupleTableSlot *ExecGroupOneTuple(Group * node);
+static TupleTableSlot *ExecGroupEveryTuple(Group *node);
+static TupleTableSlot *ExecGroupOneTuple(Group *node);
static bool
-sameGroup(TupleTableSlot * oldslot, TupleTableSlot * newslot,
+sameGroup(TupleTableSlot *oldslot, TupleTableSlot *newslot,
int numCols, AttrNumber *grpColIdx, TupleDesc tupdesc);
/* ---------------------------------------
@@ -51,7 +51,7 @@ sameGroup(TupleTableSlot * oldslot, TupleTableSlot * newslot,
* ------------------------------------------
*/
TupleTableSlot *
-ExecGroup(Group * node)
+ExecGroup(Group *node)
{
if (node->tuplePerGroup)
return ExecGroupEveryTuple(node);
@@ -64,7 +64,7 @@ ExecGroup(Group * node)
* return every tuple with a NULL between each group
*/
static TupleTableSlot *
-ExecGroupEveryTuple(Group * node)
+ExecGroupEveryTuple(Group *node)
{
GroupState *grpstate;
EState *estate;
@@ -165,7 +165,7 @@ ExecGroupEveryTuple(Group * node)
* tuples.
*/
static TupleTableSlot *
-ExecGroupOneTuple(Group * node)
+ExecGroupOneTuple(Group *node)
{
GroupState *grpstate;
EState *estate;
@@ -289,7 +289,7 @@ ExecGroupOneTuple(Group * node)
* -----------------
*/
bool
-ExecInitGroup(Group * node, EState * estate, Plan * parent)
+ExecInitGroup(Group *node, EState *estate, Plan *parent)
{
GroupState *grpstate;
Plan *outerPlan;
@@ -345,7 +345,7 @@ ExecInitGroup(Group * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsGroup(Group * node)
+ExecCountSlotsGroup(Group *node)
{
return ExecCountSlotsNode(outerPlan(node)) + GROUP_NSLOTS;
}
@@ -356,7 +356,7 @@ ExecCountSlotsGroup(Group * node)
* -----------------------
*/
void
-ExecEndGroup(Group * node)
+ExecEndGroup(Group *node)
{
GroupState *grpstate;
Plan *outerPlan;
@@ -380,8 +380,8 @@ ExecEndGroup(Group * node)
* code swiped from nodeUnique.c
*/
static bool
-sameGroup(TupleTableSlot * oldslot,
- TupleTableSlot * newslot,
+sameGroup(TupleTableSlot *oldslot,
+ TupleTableSlot *newslot,
int numCols,
AttrNumber *grpColIdx,
TupleDesc tupdesc)
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index b0e7ca4dd53ee09f8870e7fd4c8a315dec054c8a..fbc7340700dd7543f1289f593920ec5490254261 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.12 1997/09/08 02:22:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.13 1997/09/08 21:43:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,7 @@ static int HashTBSize;
static void mk_hj_temp(char *tempname);
static int hashFunc(char *key, int len);
-static int ExecHashPartition(Hash * node);
+static int ExecHashPartition(Hash *node);
static RelativeAddr hashTableAlloc(int size, HashJoinTable hashtable);
static void
ExecHashOverflowInsert(HashJoinTable hashtable,
@@ -62,7 +62,7 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecHash(Hash * node)
+ExecHash(Hash *node)
{
EState *estate;
HashState *hashstate;
@@ -165,7 +165,7 @@ ExecHash(Hash * node)
* ----------------------------------------------------------------
*/
bool
-ExecInitHash(Hash * node, EState * estate, Plan * parent)
+ExecInitHash(Hash *node, EState *estate, Plan *parent)
{
HashState *hashstate;
Plan *outerPlan;
@@ -224,7 +224,7 @@ ExecInitHash(Hash * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsHash(Hash * node)
+ExecCountSlotsHash(Hash *node)
{
return ExecCountSlotsNode(outerPlan(node)) +
ExecCountSlotsNode(innerPlan(node)) +
@@ -238,7 +238,7 @@ ExecCountSlotsHash(Hash * node)
* ----------------------------------------------------------------
*/
void
-ExecEndHash(Hash * node)
+ExecEndHash(Hash *node)
{
HashState *hashstate;
Plan *outerPlan;
@@ -288,7 +288,7 @@ hashTableAlloc(int size, HashJoinTable hashtable)
#define FUDGE_FAC 1.5
HashJoinTable
-ExecHashTableCreate(Hash * node)
+ExecHashTableCreate(Hash *node)
{
Plan *outerNode;
int nbatch;
@@ -456,9 +456,9 @@ ExecHashTableCreate(Hash * node)
*/
void
ExecHashTableInsert(HashJoinTable hashtable,
- ExprContext * econtext,
- Var * hashkey,
- File * batches)
+ ExprContext *econtext,
+ Var *hashkey,
+ File *batches)
{
TupleTableSlot *slot;
HeapTuple heapTuple;
@@ -548,8 +548,8 @@ ExecHashTableDestroy(HashJoinTable hashtable)
*/
int
ExecHashGetBucket(HashJoinTable hashtable,
- ExprContext * econtext,
- Var * hashkey)
+ ExprContext *econtext,
+ Var *hashkey)
{
int bucketno;
Datum keyval;
@@ -681,11 +681,11 @@ ExecHashOverflowInsert(HashJoinTable hashtable,
* ----------------------------------------------------------------
*/
HeapTuple
-ExecScanHashBucket(HashJoinState * hjstate,
+ExecScanHashBucket(HashJoinState *hjstate,
HashBucket bucket,
HeapTuple curtuple,
- List * hjclauses,
- ExprContext * econtext)
+ List *hjclauses,
+ ExprContext *econtext)
{
HeapTuple heapTuple;
bool qualResult;
@@ -826,7 +826,7 @@ hashFunc(char *key, int len)
* ----------------------------------------------------------------
*/
static int
-ExecHashPartition(Hash * node)
+ExecHashPartition(Hash *node)
{
Plan *outerNode;
int b;
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index b0c6eec3c02b3bc798a5eb3590d605df76241f3b..0ef0c28ee1446e48f7ebb04b6c105a4f7a1b8f08 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.7 1997/09/08 02:22:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.8 1997/09/08 21:43:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,17 +33,17 @@
#include "utils/palloc.h"
static TupleTableSlot *
- ExecHashJoinOuterGetTuple(Plan * node, Plan * parent, HashJoinState * hjstate);
+ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate);
static TupleTableSlot *
-ExecHashJoinGetSavedTuple(HashJoinState * hjstate, char *buffer,
- File file, TupleTableSlot * tupleSlot, int *block, char **position);
+ExecHashJoinGetSavedTuple(HashJoinState *hjstate, char *buffer,
+ File file, TupleTableSlot *tupleSlot, int *block, char **position);
static int
ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable,
int nbatch);
-static int ExecHashJoinNewBatch(HashJoinState * hjstate);
+static int ExecHashJoinNewBatch(HashJoinState *hjstate);
@@ -57,7 +57,7 @@ static int ExecHashJoinNewBatch(HashJoinState * hjstate);
* ----------------------------------------------------------------
*/
TupleTableSlot * /* return: a tuple or NULL */
-ExecHashJoin(HashJoin * node)
+ExecHashJoin(HashJoin *node)
{
HashJoinState *hjstate;
EState *estate;
@@ -392,7 +392,7 @@ ExecHashJoin(HashJoin * node)
* ----------------------------------------------------------------
*/
bool /* return: initialization status */
-ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent)
+ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent)
{
HashJoinState *hjstate;
Plan *outerNode;
@@ -497,7 +497,7 @@ ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsHashJoin(HashJoin * node)
+ExecCountSlotsHashJoin(HashJoin *node)
{
return ExecCountSlotsNode(outerPlan(node)) +
ExecCountSlotsNode(innerPlan(node)) +
@@ -511,7 +511,7 @@ ExecCountSlotsHashJoin(HashJoin * node)
* ----------------------------------------------------------------
*/
void
-ExecEndHashJoin(HashJoin * node)
+ExecEndHashJoin(HashJoin *node)
{
HashJoinState *hjstate;
@@ -569,7 +569,7 @@ ExecEndHashJoin(HashJoin * node)
*/
static TupleTableSlot *
-ExecHashJoinOuterGetTuple(Plan * node, Plan * parent, HashJoinState * hjstate)
+ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate)
{
TupleTableSlot *slot;
HashJoinTable hashtable;
@@ -619,10 +619,10 @@ ExecHashJoinOuterGetTuple(Plan * node, Plan * parent, HashJoinState * hjstate)
*/
static TupleTableSlot *
-ExecHashJoinGetSavedTuple(HashJoinState * hjstate,
+ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
char *buffer,
File file,
- TupleTableSlot * tupleSlot,
+ TupleTableSlot *tupleSlot,
int *block, /* return parameter */
char **position) /* return parameter */
{
@@ -664,7 +664,7 @@ ExecHashJoinGetSavedTuple(HashJoinState * hjstate,
* ----------------------------------------------------------------
*/
static int
-ExecHashJoinNewBatch(HashJoinState * hjstate)
+ExecHashJoinNewBatch(HashJoinState *hjstate)
{
File *innerBatches;
File *outerBatches;
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 61fca80a0cf35ed9d5d38f44f6841a36986abffb..2ad35f822ee9186ffc5e7e64f19fbb6b20e494c9 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.9 1997/09/08 02:22:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.10 1997/09/08 21:43:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,7 +55,7 @@
#define LEFT_OP 1
#define RIGHT_OP 2
-static TupleTableSlot *IndexNext(IndexScan * node);
+static TupleTableSlot *IndexNext(IndexScan *node);
/* ----------------------------------------------------------------
* IndexNext
@@ -80,7 +80,7 @@ static TupleTableSlot *IndexNext(IndexScan * node);
* ----------------------------------------------------------------
*/
static TupleTableSlot *
-IndexNext(IndexScan * node)
+IndexNext(IndexScan *node)
{
EState *estate;
CommonScanState *scanstate;
@@ -192,7 +192,7 @@ IndexNext(IndexScan * node)
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecIndexScan(IndexScan * node)
+ExecIndexScan(IndexScan *node)
{
TupleTableSlot *returnTuple;
@@ -217,7 +217,7 @@ ExecIndexScan(IndexScan * node)
* ----------------------------------------------------------------
*/
void
-ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent)
+ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent)
{
EState *estate;
IndexScanState *indexstate;
@@ -331,7 +331,7 @@ ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent)
* ----------------------------------------------------------------
*/
void
-ExecEndIndexScan(IndexScan * node)
+ExecEndIndexScan(IndexScan *node)
{
CommonScanState *scanstate;
IndexScanState *indexstate;
@@ -395,7 +395,7 @@ ExecEndIndexScan(IndexScan * node)
* ----------------------------------------------------------------
*/
void
-ExecIndexMarkPos(IndexScan * node)
+ExecIndexMarkPos(IndexScan *node)
{
IndexScanState *indexstate;
IndexScanDescPtr indexScanDescs;
@@ -426,7 +426,7 @@ ExecIndexMarkPos(IndexScan * node)
* ----------------------------------------------------------------
*/
void
-ExecIndexRestrPos(IndexScan * node)
+ExecIndexRestrPos(IndexScan *node)
{
IndexScanState *indexstate;
IndexScanDescPtr indexScanDescs;
@@ -461,7 +461,7 @@ ExecIndexRestrPos(IndexScan * node)
* ----------------------------------------------------------------
*/
bool
-ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
+ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
{
IndexScanState *indexstate;
CommonScanState *scanstate;
@@ -677,7 +677,7 @@ ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
*/
leftop = (Node *) get_leftop(clause);
- if (IsA(leftop, Var) && var_is_rel((Var *) leftop))
+ if (IsA(leftop, Var) &&var_is_rel((Var *) leftop))
{
/* ----------------
* if the leftop is a "rel-var", then it means
@@ -750,7 +750,7 @@ ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
*/
rightop = (Node *) get_rightop(clause);
- if (IsA(rightop, Var) && var_is_rel((Var *) rightop))
+ if (IsA(rightop, Var) &&var_is_rel((Var *) rightop))
{
/* ----------------
* here we make sure only one op identifies the
@@ -920,7 +920,7 @@ ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
direction, /* scan direction */
timeQual, /* time qual */
¤tRelation, /* return: rel desc */
- (Pointer *) & currentScanDesc); /* return: scan desc */
+ (Pointer *) ¤tScanDesc); /* return: scan desc */
scanstate->css_currentRelation = currentRelation;
scanstate->css_currentScanDesc = currentScanDesc;
@@ -959,7 +959,7 @@ ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
direction, /* scan direction */
timeQual, /* time qual */
&(relationDescs[i]), /* return: rel desc */
- (Pointer *) & (scanDescs[i]));
+ (Pointer *) &(scanDescs[i]));
/* return: scan desc */
}
}
@@ -977,7 +977,7 @@ ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsIndexScan(IndexScan * node)
+ExecCountSlotsIndexScan(IndexScan *node)
{
return ExecCountSlotsNode(outerPlan((Plan *) node)) +
ExecCountSlotsNode(innerPlan((Plan *) node)) +
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 6ff8598901e5efca03751142c310e88a84d9d3b1..ecb7c0ee28360951bd6a74135dbbff4fa131da32 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.8 1997/09/08 02:22:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.9 1997/09/08 21:43:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@
* ----------------------------------------------------------------
*/
TupleTableSlot * /* result tuple from subplan */
-ExecMaterial(Material * node)
+ExecMaterial(Material *node)
{
EState *estate;
MaterialState *matstate;
@@ -188,7 +188,7 @@ ExecMaterial(Material * node)
* ----------------------------------------------------------------
*/
bool /* initialization status */
-ExecInitMaterial(Material * node, EState * estate, Plan * parent)
+ExecInitMaterial(Material *node, EState *estate, Plan *parent)
{
MaterialState *matstate;
Plan *outerPlan;
@@ -291,7 +291,7 @@ ExecInitMaterial(Material * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsMaterial(Material * node)
+ExecCountSlotsMaterial(Material *node)
{
return ExecCountSlotsNode(outerPlan((Plan *) node)) +
ExecCountSlotsNode(innerPlan((Plan *) node)) +
@@ -306,7 +306,7 @@ ExecCountSlotsMaterial(Material * node)
* ----------------------------------------------------------------
*/
void
-ExecEndMaterial(Material * node)
+ExecEndMaterial(Material *node)
{
MaterialState *matstate;
Relation tempRelation;
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 54c085b1d618724fa7218ce0fb9b6215fecf194f..e592bb31642499baf50d4cf75c6f0b4dc6685353 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.11 1997/09/08 20:55:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.12 1997/09/08 21:43:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -84,7 +84,7 @@
#include "utils/lsyscache.h"
#include "utils/psort.h"
-static bool MergeCompare(List * eqQual, List * compareQual, ExprContext * econtext);
+static bool MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext);
/* ----------------------------------------------------------------
* MarkInnerTuple and RestoreInnerTuple macros
@@ -143,7 +143,7 @@ static bool MergeCompare(List * eqQual, List * compareQual, ExprContext * econte
* ----------------------------------------------------------------
*/
static List *
-MJFormOSortopI(List * qualList, Oid sortOp)
+MJFormOSortopI(List *qualList, Oid sortOp)
{
List *qualCopy;
List *qualcdr;
@@ -207,7 +207,7 @@ MJFormOSortopI(List * qualList, Oid sortOp)
* ----------------------------------------------------------------
*/
static List *
-MJFormISortopO(List * qualList, Oid sortOp)
+MJFormISortopO(List *qualList, Oid sortOp)
{
List *ISortopO;
List *qualcdr;
@@ -258,7 +258,7 @@ MJFormISortopO(List * qualList, Oid sortOp)
* ----------------------------------------------------------------
*/
static bool
-MergeCompare(List * eqQual, List * compareQual, ExprContext * econtext)
+MergeCompare(List *eqQual, List *compareQual, ExprContext *econtext)
{
List *clause;
List *eqclause;
@@ -328,7 +328,7 @@ MergeCompare(List * eqQual, List * compareQual, ExprContext * econtext)
*/
#ifdef EXEC_MERGEJOINDEBUG
void
-ExecMergeTupleDumpInner(ExprContext * econtext)
+ExecMergeTupleDumpInner(ExprContext *econtext)
{
TupleTableSlot *innerSlot;
@@ -342,7 +342,7 @@ ExecMergeTupleDumpInner(ExprContext * econtext)
}
void
-ExecMergeTupleDumpOuter(ExprContext * econtext)
+ExecMergeTupleDumpOuter(ExprContext *econtext)
{
TupleTableSlot *outerSlot;
@@ -356,8 +356,8 @@ ExecMergeTupleDumpOuter(ExprContext * econtext)
}
void
-ExecMergeTupleDumpMarked(ExprContext * econtext,
- MergeJoinState * mergestate)
+ExecMergeTupleDumpMarked(ExprContext *econtext,
+ MergeJoinState *mergestate)
{
TupleTableSlot *markedSlot;
@@ -372,7 +372,7 @@ ExecMergeTupleDumpMarked(ExprContext * econtext,
}
void
-ExecMergeTupleDump(ExprContext * econtext, MergeJoinState * mergestate)
+ExecMergeTupleDump(ExprContext *econtext, MergeJoinState *mergestate)
{
printf("******** ExecMergeTupleDump ********\n");
@@ -386,7 +386,7 @@ ExecMergeTupleDump(ExprContext * econtext, MergeJoinState * mergestate)
#endif
static void
-CleanUpSort(Plan * plan)
+CleanUpSort(Plan *plan)
{
if (plan == NULL)
@@ -449,7 +449,7 @@ CleanUpSort(Plan * plan)
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecMergeJoin(MergeJoin * node)
+ExecMergeJoin(MergeJoin *node)
{
EState *estate;
MergeJoinState *mergestate;
@@ -749,7 +749,8 @@ ExecMergeJoin(MergeJoin * node)
*
* new outer tuple > marked tuple
*
- ******************************
+ *****************************
+ *
*
*
*
@@ -830,7 +831,8 @@ ExecMergeJoin(MergeJoin * node)
* we have to advance the outer scan until we find the outer
* 8.
*
- ******************************
+ *****************************
+ *
*
*
*
@@ -933,7 +935,8 @@ ExecMergeJoin(MergeJoin * node)
* we have to advance the inner scan until we find the inner
* 12.
*
- ******************************
+ *****************************
+ *
*
*
*
@@ -1065,7 +1068,7 @@ ExecMergeJoin(MergeJoin * node)
* ----------------------------------------------------------------
*/
bool
-ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent)
+ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent)
{
MergeJoinState *mergestate;
List *joinclauses;
@@ -1185,7 +1188,7 @@ ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsMergeJoin(MergeJoin * node)
+ExecCountSlotsMergeJoin(MergeJoin *node)
{
return ExecCountSlotsNode(outerPlan((Plan *) node)) +
ExecCountSlotsNode(innerPlan((Plan *) node)) +
@@ -1200,7 +1203,7 @@ ExecCountSlotsMergeJoin(MergeJoin * node)
* ----------------------------------------------------------------
*/
void
-ExecEndMergeJoin(MergeJoin * node)
+ExecEndMergeJoin(MergeJoin *node)
{
MergeJoinState *mergestate;
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index fe6123a0aab209afb86ad049a27c2cb33b29e1bb..ff9327ee994eb23c3d78d692d80e0dda31f3eb91 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.6 1997/09/08 20:55:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.7 1997/09/08 21:43:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,7 +55,7 @@
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecNestLoop(NestLoop * node, Plan * parent)
+ExecNestLoop(NestLoop *node, Plan *parent)
{
NestLoopState *nlstate;
Plan *innerPlan;
@@ -86,7 +86,7 @@ ExecNestLoop(NestLoop * node, Plan * parent)
*/
econtext = nlstate->jstate.cs_ExprContext;
- /* ---------------- * get the current outer tuple
+ /* ---------------- * get the current outer tuple
* ----------------
*/
outerTupleSlot = nlstate->jstate.cs_OuterTupleSlot;
@@ -265,7 +265,7 @@ ExecNestLoop(NestLoop * node, Plan * parent)
* ----------------------------------------------------------------
*/
bool
-ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent)
+ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent)
{
NestLoopState *nlstate;
@@ -331,7 +331,7 @@ ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsNestLoop(NestLoop * node)
+ExecCountSlotsNestLoop(NestLoop *node)
{
return ExecCountSlotsNode(outerPlan(node)) +
ExecCountSlotsNode(innerPlan(node)) +
@@ -345,7 +345,7 @@ ExecCountSlotsNestLoop(NestLoop * node)
* ----------------------------------------------------------------
*/
void
-ExecEndNestLoop(NestLoop * node)
+ExecEndNestLoop(NestLoop *node)
{
NestLoopState *nlstate;
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
index 4e0e62ddfe2102dd234bdc5130fd82646182f350..78f8c762619009d95746554aab922975b467d230 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -27,7 +27,7 @@
* SeqScan (emp.all)
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.4 1997/09/08 02:22:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.5 1997/09/08 21:43:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecResult(Result * node)
+ExecResult(Result *node)
{
ResultState *resstate;
TupleTableSlot *outerTupleSlot;
@@ -189,7 +189,7 @@ ExecResult(Result * node)
* ----------------------------------------------------------------
*/
bool
-ExecInitResult(Result * node, EState * estate, Plan * parent)
+ExecInitResult(Result *node, EState *estate, Plan *parent)
{
ResultState *resstate;
@@ -253,7 +253,7 @@ ExecInitResult(Result * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsResult(Result * node)
+ExecCountSlotsResult(Result *node)
{
return ExecCountSlotsNode(outerPlan(node)) + RESULT_NSLOTS;
}
@@ -265,7 +265,7 @@ ExecCountSlotsResult(Result * node)
* ----------------------------------------------------------------
*/
void
-ExecEndResult(Result * node)
+ExecEndResult(Result *node)
{
ResultState *resstate;
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 1d04360c9d2a6243ff262287438f9955acf5d5cc..5bcde93479fbb305a8fd9600341187455d6774ec 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.6 1997/09/08 02:22:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.7 1997/09/08 21:43:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,10 +31,10 @@
#include "parser/parsetree.h"
static Oid
-InitScanRelation(SeqScan * node, EState * estate,
- CommonScanState * scanstate, Plan * outerPlan);
+InitScanRelation(SeqScan *node, EState *estate,
+ CommonScanState *scanstate, Plan *outerPlan);
-static TupleTableSlot *SeqNext(SeqScan * node);
+static TupleTableSlot *SeqNext(SeqScan *node);
/* ----------------------------------------------------------------
* Scan Support
@@ -47,7 +47,7 @@ static TupleTableSlot *SeqNext(SeqScan * node);
* ----------------------------------------------------------------
*/
static TupleTableSlot *
-SeqNext(SeqScan * node)
+SeqNext(SeqScan *node)
{
HeapTuple tuple;
HeapScanDesc scandesc;
@@ -115,7 +115,7 @@ SeqNext(SeqScan * node)
*/
TupleTableSlot *
-ExecSeqScan(SeqScan * node)
+ExecSeqScan(SeqScan *node)
{
TupleTableSlot *slot;
Plan *outerPlan;
@@ -151,8 +151,8 @@ ExecSeqScan(SeqScan * node)
* ----------------------------------------------------------------
*/
static Oid
-InitScanRelation(SeqScan * node, EState * estate,
- CommonScanState * scanstate, Plan * outerPlan)
+InitScanRelation(SeqScan *node, EState *estate,
+ CommonScanState *scanstate, Plan *outerPlan)
{
Index relid;
List *rangeTable;
@@ -190,7 +190,7 @@ InitScanRelation(SeqScan * node, EState * estate,
direction,/* scan direction */
timeQual, /* time qual */
¤tRelation, /* return: rel desc */
- (Pointer *) & currentScanDesc); /* return: scan desc */
+ (Pointer *) ¤tScanDesc); /* return: scan desc */
scanstate->css_currentRelation = currentRelation;
scanstate->css_currentScanDesc = currentScanDesc;
@@ -236,7 +236,7 @@ InitScanRelation(SeqScan * node, EState * estate,
* ----------------------------------------------------------------
*/
bool
-ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent)
+ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent)
{
CommonScanState *scanstate;
Plan *outerPlan;
@@ -296,7 +296,7 @@ ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsSeqScan(SeqScan * node)
+ExecCountSlotsSeqScan(SeqScan *node)
{
return ExecCountSlotsNode(outerPlan(node)) +
ExecCountSlotsNode(innerPlan(node)) +
@@ -312,7 +312,7 @@ ExecCountSlotsSeqScan(SeqScan * node)
* ----------------------------------------------------------------
*/
void
-ExecEndSeqScan(SeqScan * node)
+ExecEndSeqScan(SeqScan *node)
{
CommonScanState *scanstate;
Plan *outerPlan;
@@ -366,7 +366,7 @@ ExecEndSeqScan(SeqScan * node)
* ----------------------------------------------------------------
*/
void
-ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent)
+ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent)
{
CommonScanState *scanstate;
EState *estate;
@@ -403,7 +403,7 @@ ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent)
* ----------------------------------------------------------------
*/
void
-ExecSeqMarkPos(SeqScan * node)
+ExecSeqMarkPos(SeqScan *node)
{
CommonScanState *scanstate;
Plan *outerPlan;
@@ -442,7 +442,7 @@ ExecSeqMarkPos(SeqScan * node)
* ----------------------------------------------------------------
*/
void
-ExecSeqRestrPos(SeqScan * node)
+ExecSeqRestrPos(SeqScan *node)
{
CommonScanState *scanstate;
Plan *outerPlan;
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 64f56bc99a7fa703d0d900142e1aae373708eabe..9a61300efd15edab5a18210b29715439b26e3208 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.8 1997/09/08 02:22:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.9 1997/09/08 21:43:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@
* ----------------------------------------------------------------
*/
static ScanKey
-FormSortKeys(Sort * sortnode)
+FormSortKeys(Sort *sortnode)
{
ScanKey sortkeys;
List *targetList;
@@ -102,7 +102,7 @@ FormSortKeys(Sort * sortnode)
* ----------------------------------------------------------------
*/
TupleTableSlot *
-ExecSort(Sort * node)
+ExecSort(Sort *node)
{
EState *estate;
SortState *sortstate;
@@ -229,7 +229,7 @@ ExecSort(Sort * node)
* ----------------------------------------------------------------
*/
bool
-ExecInitSort(Sort * node, EState * estate, Plan * parent)
+ExecInitSort(Sort *node, EState *estate, Plan *parent)
{
SortState *sortstate;
Plan *outerPlan;
@@ -314,7 +314,7 @@ ExecInitSort(Sort * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsSort(Sort * node)
+ExecCountSlotsSort(Sort *node)
{
return ExecCountSlotsNode(outerPlan((Plan *) node)) +
ExecCountSlotsNode(innerPlan((Plan *) node)) +
@@ -328,7 +328,7 @@ ExecCountSlotsSort(Sort * node)
* ----------------------------------------------------------------
*/
void
-ExecEndSort(Sort * node)
+ExecEndSort(Sort *node)
{
SortState *sortstate;
Plan *outerPlan;
@@ -369,7 +369,7 @@ ExecEndSort(Sort * node)
* ----------------------------------------------------------------
*/
void
-ExecSortMarkPos(Sort * node)
+ExecSortMarkPos(Sort *node)
{
SortState *sortstate;
@@ -393,7 +393,7 @@ ExecSortMarkPos(Sort * node)
* ----------------------------------------------------------------
*/
void
-ExecSortRestrPos(Sort * node)
+ExecSortRestrPos(Sort *node)
{
SortState *sortstate;
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index e3ddfe39d66f4615e1c838cb2f2cd1df3d1315b7..d7c0c19d2eed8f0a106c9bb099d30e5cc3a876e0 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
* ExecEndTee
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.8 1997/09/08 02:22:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.9 1997/09/08 21:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@
* ------------------------------------------------------------------
*/
bool
-ExecInitTee(Tee * node, EState * currentEstate, Plan * parent)
+ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
{
TeeState *teeState;
Plan *outerPlan;
@@ -214,7 +214,7 @@ ExecInitTee(Tee * node, EState * currentEstate, Plan * parent)
}
int
-ExecCountSlotsTee(Tee * node)
+ExecCountSlotsTee(Tee *node)
{
/* Tee nodes can't have innerPlans */
return ExecCountSlotsNode(outerPlan(node)) + TEE_NSLOTS;
@@ -230,7 +230,7 @@ ExecCountSlotsTee(Tee * node)
* ----------------------------------------------------------------
*/
static void
-initTeeScanDescs(Tee * node)
+initTeeScanDescs(Tee *node)
{
TeeState *teeState;
Relation bufferRel;
@@ -290,7 +290,7 @@ initTeeScanDescs(Tee * node)
*/
TupleTableSlot *
-ExecTee(Tee * node, Plan * parent)
+ExecTee(Tee *node, Plan *parent)
{
EState *estate;
TeeState *teeState;
@@ -443,7 +443,7 @@ ExecTee(Tee * node, Plan * parent)
* ----------------------------------------------------------------
*/
void
-ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent)
+ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent)
{
EState *estate;
@@ -490,7 +490,7 @@ ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent)
*/
void
-ExecEndTee(Tee * node, Plan * parent)
+ExecEndTee(Tee *node, Plan *parent)
{
EState *estate;
TeeState *teeState;
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 5a340b8cf55edc1df12164ce65149385502f9667..84879aa09143aeeebd41cec0fa86f48d284c096a 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.9 1997/09/08 02:22:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.10 1997/09/08 21:43:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,9 +47,9 @@
* same ADT value. -cim
* ----------------------------------------------------------------
*/
-static bool /* true if tuples are identical, false
+static bool /* true if tuples are identical, false
* otherwise */
-ExecIdenticalTuples(TupleTableSlot * t1, TupleTableSlot * t2)
+ExecIdenticalTuples(TupleTableSlot *t1, TupleTableSlot *t2)
{
HeapTuple h1;
HeapTuple h2;
@@ -108,7 +108,7 @@ ExecIdenticalTuples(TupleTableSlot * t1, TupleTableSlot * t2)
* ----------------------------------------------------------------
*/
TupleTableSlot * /* return: a tuple or NULL */
-ExecUnique(Unique * node)
+ExecUnique(Unique *node)
{
UniqueState *uniquestate;
TupleTableSlot *resultTupleSlot;
@@ -243,7 +243,7 @@ ExecUnique(Unique * node)
* ----------------------------------------------------------------
*/
bool /* return: initialization status */
-ExecInitUnique(Unique * node, EState * estate, Plan * parent)
+ExecInitUnique(Unique *node, EState *estate, Plan *parent)
{
UniqueState *uniquestate;
Plan *outerPlan;
@@ -323,7 +323,7 @@ ExecInitUnique(Unique * node, EState * estate, Plan * parent)
}
int
-ExecCountSlotsUnique(Unique * node)
+ExecCountSlotsUnique(Unique *node)
{
return ExecCountSlotsNode(outerPlan(node)) +
ExecCountSlotsNode(innerPlan(node)) +
@@ -338,7 +338,7 @@ ExecCountSlotsUnique(Unique * node)
* ----------------------------------------------------------------
*/
void
-ExecEndUnique(Unique * node)
+ExecEndUnique(Unique *node)
{
UniqueState *uniquestate;
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index de4915785dcb95c7e371d2686bf28dada890a314..7904351c967bb7d8b806f5230b1459908f470fed 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -17,7 +17,7 @@ typedef struct
Portal portal; /* portal per procedure */
MemoryContext savedcxt;
CommandId savedId;
-} _SPI_connection;
+} _SPI_connection;
static Portal _SPI_portal = (Portal) NULL;
static _SPI_connection *_SPI_stack = NULL;
@@ -37,20 +37,20 @@ typedef struct
List *ptlist;
int nargs;
Oid *argtypes;
-} _SPI_plan;
+} _SPI_plan;
-static int _SPI_execute(char *src, int tcount, _SPI_plan * plan);
-static int _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount);
+static int _SPI_execute(char *src, int tcount, _SPI_plan *plan);
+static int _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount);
#if 0
-static void _SPI_fetch(FetchStmt * stmt);
+static void _SPI_fetch(FetchStmt *stmt);
#endif
static int
-_SPI_execute_plan(_SPI_plan * plan,
+_SPI_execute_plan(_SPI_plan *plan,
char **Values, char *Nulls, int tcount);
-static _SPI_plan *_SPI_copy_plan(_SPI_plan * plan, bool local);
+static _SPI_plan *_SPI_copy_plan(_SPI_plan *plan, bool local);
static int _SPI_begin_call(bool execmem);
static int _SPI_end_call(bool procmem);
@@ -217,7 +217,7 @@ SPI_execp(void *plan, char **Values, char *Nulls, int tcount)
}
void *
-SPI_prepare(char *src, int nargs, Oid * argtypes)
+SPI_prepare(char *src, int nargs, Oid *argtypes)
{
_SPI_plan *plan;
@@ -320,7 +320,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
}
char *
-SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull)
+SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull)
{
char *val;
@@ -457,7 +457,7 @@ spi_printtup(HeapTuple tuple, TupleDesc tupdesc)
*/
static int
-_SPI_execute(char *src, int tcount, _SPI_plan * plan)
+_SPI_execute(char *src, int tcount, _SPI_plan *plan)
{
QueryTreeList *queryTree_list;
List *planTree_list;
@@ -554,7 +554,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan * plan)
}
static int
-_SPI_execute_plan(_SPI_plan * plan, char **Values, char *Nulls, int tcount)
+_SPI_execute_plan(_SPI_plan *plan, char **Values, char *Nulls, int tcount)
{
QueryTreeList *queryTree_list = plan->qtlist;
List *planTree_list = plan->ptlist;
@@ -625,7 +625,7 @@ _SPI_execute_plan(_SPI_plan * plan, char **Values, char *Nulls, int tcount)
}
static int
-_SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
+_SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount)
{
Query *parseTree;
Plan *plan;
@@ -723,7 +723,7 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
#if 0
static void
-_SPI_fetch(FetchStmt * stmt)
+_SPI_fetch(FetchStmt *stmt)
{
char *name = stmt->portalname;
int feature = (stmt->direction == FORWARD) ? EXEC_FOR : EXEC_BACK;
@@ -864,7 +864,7 @@ _SPI_checktuples(bool isRetrieveIntoRelation)
}
static _SPI_plan *
-_SPI_copy_plan(_SPI_plan * plan, bool local)
+_SPI_copy_plan(_SPI_plan *plan, bool local)
{
_SPI_plan *newplan;
MemoryContext oldcxt;
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 8790a84440931f9d549554224626d2a105dc7505..85d1d7c5cd37c9f6682d43befee99cdc7b2acc68 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.7 1997/09/08 02:22:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.8 1997/09/08 21:43:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ DLNewList(void)
/* free up a list and all the nodes in it */
void
-DLFreeList(Dllist * l)
+DLFreeList(Dllist *l)
{
Dlelem *curr;
@@ -56,13 +56,13 @@ DLNewElem(void *val)
}
void
-DLFreeElem(Dlelem * e)
+DLFreeElem(Dlelem *e)
{
free(e);
}
Dlelem *
-DLGetHead(Dllist * l)
+DLGetHead(Dllist *l)
{
return (l ? l->dll_head : 0);
}
@@ -70,7 +70,7 @@ DLGetHead(Dllist * l)
/* get the value stored in the first element */
#ifdef NOT_USED
void *
-DLGetHeadVal(Dllist * l)
+DLGetHeadVal(Dllist *l)
{
Dlelem *e = DLGetHead(l);
@@ -80,7 +80,7 @@ DLGetHeadVal(Dllist * l)
#endif
Dlelem *
-DLGetTail(Dllist * l)
+DLGetTail(Dllist *l)
{
return (l ? l->dll_tail : 0);
}
@@ -88,7 +88,7 @@ DLGetTail(Dllist * l)
/* get the value stored in the first element */
#ifdef NOT_USED
void *
-DLGetTailVal(Dllist * l)
+DLGetTailVal(Dllist *l)
{
Dlelem *e = DLGetTail(l);
@@ -98,19 +98,19 @@ DLGetTailVal(Dllist * l)
#endif
Dlelem *
-DLGetPred(Dlelem * e) /* get predecessor */
+DLGetPred(Dlelem *e) /* get predecessor */
{
return (e ? e->dle_prev : 0);
}
Dlelem *
-DLGetSucc(Dlelem * e) /* get successor */
+DLGetSucc(Dlelem *e) /* get successor */
{
return (e ? e->dle_next : 0);
}
void
-DLRemove(Dlelem * e)
+DLRemove(Dlelem *e)
{
Dllist *l;
@@ -129,7 +129,7 @@ DLRemove(Dlelem * e)
}
void
-DLAddHead(Dllist * l, Dlelem * e)
+DLAddHead(Dllist *l, Dlelem *e)
{
e->dle_list = l;
@@ -146,7 +146,7 @@ DLAddHead(Dllist * l, Dlelem * e)
}
void
-DLAddTail(Dllist * l, Dlelem * e)
+DLAddTail(Dllist *l, Dlelem *e)
{
e->dle_list = l;
@@ -163,7 +163,7 @@ DLAddTail(Dllist * l, Dlelem * e)
}
Dlelem *
-DLRemHead(Dllist * l)
+DLRemHead(Dllist *l)
{
/* remove and return the head */
Dlelem *result;
@@ -189,7 +189,7 @@ DLRemHead(Dllist * l)
}
Dlelem *
-DLRemTail(Dllist * l)
+DLRemTail(Dllist *l)
{
/* remove and return the tail */
Dlelem *result;
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index 3ad58e4e0eb6909e01c348a3fda362840b930b23..0dd84b4b535f97b4d7d8070f2ff0f24d417ef455 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.6 1997/09/08 02:22:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.7 1997/09/08 21:43:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
* -----------------------------------
*/
void
-HashTableWalk(HTAB * hashtable, HashtFunc function, int arg)
+HashTableWalk(HTAB *hashtable, HashtFunc function, int arg)
{
long *hashent;
long *data;
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index 41c0e934e782bcc6e0adca46cf47b6f58c7548be..6ddae8fb7bbf11004378229d51bdebad0a9566d3 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.6 1997/09/08 02:23:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.7 1997/09/08 21:43:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@
** the nodes sorted. The old list is *not* freed or modified (?)
*/
List *
-lisp_qsort(List * the_list, /* the list to be sorted */
+lisp_qsort(List *the_list, /* the list to be sorted */
int (*compare) ()) /* function to compare two nodes */
{
int i;
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index f3af7c52ccc302a5a98c7a7ab301784d12f5b6cf..eeb26b9587deda0411644f22d290ff8bb1dedf0d 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.16 1997/09/08 02:23:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.17 1997/09/08 21:43:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -424,7 +424,7 @@ pg_krb5_recvauth(int sock,
#endif /* KRB5 */
static int
-pg_password_recvauth(Port * port, char *database, char *DataDir)
+pg_password_recvauth(Port *port, char *database, char *DataDir)
{
PacketBuf buf;
char *user,
@@ -449,7 +449,7 @@ pg_password_recvauth(Port * port, char *database, char *DataDir)
* be_recvauth -- server demux routine for incoming authentication information
*/
int
-be_recvauth(MsgType msgtype_arg, Port * port, char *username, StartupInfo * sp)
+be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo *sp)
{
MsgType msgtype;
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index f2a0a71889a3d188befeef015143d32f081f80dc..97413e82f482d365545e9c960983510e2335d6d7 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.7 1997/09/08 02:23:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.8 1997/09/08 21:43:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -73,7 +73,7 @@ be_portalinit(void)
* ----------------
*/
void
-be_portalpush(PortalEntry * entry)
+be_portalpush(PortalEntry *entry)
{
DLAddTail(be_portalstack, DLNewElem(entry));
}
@@ -166,7 +166,7 @@ be_newportal(void)
* ----------------
*/
void
-be_typeinit(PortalEntry * entry,
+be_typeinit(PortalEntry *entry,
TupleDesc tupDesc,
int natts)
{
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index da166ae54a0e7271f99e527bad997b6abe5bdfa0..19a5275737042a2abfba507d3d3b05135fddf53a 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.14 1997/09/08 02:23:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.15 1997/09/08 21:43:41 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -49,7 +49,7 @@ static LargeObjectDesc *cookies[MAX_LOBJ_FDS];
static GlobalMemory fscxt = NULL;
-static int newLOfd(LargeObjectDesc * lobjCookie);
+static int newLOfd(LargeObjectDesc *lobjCookie);
static void deleteLOfd(int fd);
@@ -254,7 +254,7 @@ lowrite(int fd, struct varlena * wbuf)
* imports a file as an (inversion) large object.
*/
Oid
-lo_import(text * filename)
+lo_import(text *filename)
{
int fd;
int nbytes,
@@ -317,7 +317,7 @@ lo_import(text * filename)
* exports an (inversion) large object.
*/
int4
-lo_export(Oid lobjId, text * filename)
+lo_export(Oid lobjId, text *filename)
{
int fd;
int nbytes,
@@ -377,7 +377,7 @@ lo_export(Oid lobjId, text * filename)
*****************************************************************************/
static int
-newLOfd(LargeObjectDesc * lobjCookie)
+newLOfd(LargeObjectDesc *lobjCookie)
{
int i;
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 24f2240d10d575517a95fddbea6470a8db9845bb..31be26425f91eec6d09f06379af460da352983bf 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.6 1997/09/08 02:23:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.7 1997/09/08 21:43:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,7 @@ PQfn(int fnid,
int *result_buf, /* can't use void, dec compiler barfs */
int result_len,
int result_is_int,
- PQArgBlock * args,
+ PQArgBlock *args,
int nargs)
{
char *retval; /* XXX - should be datum, maybe ? */
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 8e1a0753b22287666525a20232e0eaab03aa664a..d0734d3ea5cb3f22d8076c82298c08a40041211f 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.21 1997/09/08 02:23:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.22 1997/09/08 21:43:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,7 @@ isblank(const char c)
static void
-next_token(FILE * fp, char *buf, const int bufsz)
+next_token(FILE *fp, char *buf, const int bufsz)
{
/*--------------------------------------------------------------------------
Grab one token out of fp. Tokens are strings of non-blank
@@ -85,7 +85,7 @@ next_token(FILE * fp, char *buf, const int bufsz)
static void
-read_through_eol(FILE * file)
+read_through_eol(FILE *file)
{
int c;
@@ -97,8 +97,8 @@ read_through_eol(FILE * file)
static void
-read_hba_entry2(FILE * file, enum Userauth * userauth_p, char usermap_name[],
- bool * error_p, bool * matches_p, bool find_password_entries)
+read_hba_entry2(FILE *file, enum Userauth * userauth_p, char usermap_name[],
+ bool *error_p, bool *matches_p, bool find_password_entries)
{
/*--------------------------------------------------------------------------
Read from file FILE the rest of a host record, after the mask field,
@@ -182,9 +182,9 @@ read_hba_entry2(FILE * file, enum Userauth * userauth_p, char usermap_name[],
static void
-process_hba_record(FILE * file,
+process_hba_record(FILE *file,
const struct in_addr ip_addr, const char database[],
- bool * matches_p, bool * error_p,
+ bool *matches_p, bool *error_p,
enum Userauth * userauth_p, char usermap_name[],
bool find_password_entries)
{
@@ -311,9 +311,9 @@ process_hba_record(FILE * file,
static void
-process_open_config_file(FILE * file,
+process_open_config_file(FILE *file,
const struct in_addr ip_addr, const char database[],
- bool * host_ok_p, enum Userauth * userauth_p,
+ bool *host_ok_p, enum Userauth * userauth_p,
char usermap_name[], bool find_password_entries)
{
/*---------------------------------------------------------------------------
@@ -370,7 +370,7 @@ process_open_config_file(FILE * file,
void
find_hba_entry(const char DataDir[], const struct in_addr ip_addr,
const char database[],
- bool * host_ok_p, enum Userauth * userauth_p,
+ bool *host_ok_p, enum Userauth * userauth_p,
char usermap_name[], bool find_password_entries)
{
/*--------------------------------------------------------------------------
@@ -461,7 +461,7 @@ find_hba_entry(const char DataDir[], const struct in_addr ip_addr,
static void
interpret_ident_response(char ident_response[],
- bool * error_p, char ident_username[])
+ bool *error_p, char ident_username[])
{
/*----------------------------------------------------------------------------
Parse the string "ident_response[]" as a response from a query to an Ident
@@ -549,7 +549,7 @@ interpret_ident_response(char ident_response[],
static void
ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
const ushort remote_port, const ushort local_port,
- bool * ident_failed, char ident_username[])
+ bool *ident_failed, char ident_username[])
{
/*--------------------------------------------------------------------------
Talk to the ident server on host "remote_ip_addr" and find out who
@@ -661,7 +661,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
static void
-parse_map_record(FILE * file,
+parse_map_record(FILE *file,
char file_map[], char file_pguser[], char file_iuser[])
{
/*---------------------------------------------------------------------------
@@ -702,11 +702,11 @@ parse_map_record(FILE * file,
static void
-verify_against_open_usermap(FILE * file,
+verify_against_open_usermap(FILE *file,
const char pguser[],
const char ident_username[],
const char usermap_name[],
- bool * checks_out_p)
+ bool *checks_out_p)
{
/*--------------------------------------------------------------------------
This function does the same thing as verify_against_usermap,
@@ -758,7 +758,7 @@ verify_against_usermap(const char DataDir[],
const char pguser[],
const char ident_username[],
const char usermap_name[],
- bool * checks_out_p)
+ bool *checks_out_p)
{
/*--------------------------------------------------------------------------
See if the user with ident username "ident_username" is allowed to act
@@ -838,7 +838,7 @@ static void
authident(const char DataDir[],
const Port port, const char postgres_username[],
const char usermap_name[],
- bool * authentic_p)
+ bool *authentic_p)
{
/*---------------------------------------------------------------------------
Talk to the ident server on the remote host and find out who owns the
@@ -878,7 +878,7 @@ authident(const char DataDir[],
extern int
-hba_recvauth(const Port * port, const char database[], const char user[],
+hba_recvauth(const Port *port, const char database[], const char user[],
const char DataDir[])
{
/*---------------------------------------------------------------------------
@@ -923,7 +923,7 @@ hba_recvauth(const Port * port, const char database[], const char user[],
case Trust:
retvalue = STATUS_OK;
break;
- case Ident:
+ case Ident:
{
/*
@@ -934,14 +934,15 @@ hba_recvauth(const Port * port, const char database[], const char user[],
bool authentic; /* He is who he says he
* is. */
- authident(DataDir, *port, user, usermap_name, &authentic);
+ authident(DataDir, *port, user, usermap_name, &authentic);
- if (authentic)
- retvalue = STATUS_OK;
+ if (authentic)
+ retvalue = STATUS_OK;
else
- retvalue = STATUS_ERROR;
+ retvalue = STATUS_ERROR;
}
- break;
+ break;
+
default:
retvalue = STATUS_ERROR;
Assert(false);
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 2553878fc5a2b9f0f679e48f7cc9491fc7193dac..bd2f6bee2019c2763a57766f3ede026abb5805f2 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -10,7 +10,7 @@
#endif
int
-verify_password(char *user, char *password, Port * port,
+verify_password(char *user, char *password, Port *port,
char *database, char *DataDir)
{
bool host_ok;
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 2d213a1f24ec07e49883387c408543667822024f..c85b3a763c2f916a948306f34e44609408d535c3 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.8 1997/09/08 02:23:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.9 1997/09/08 21:43:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -183,7 +183,7 @@ PQparray(char *pname)
* --------------------------------
*/
int
-PQrulep(PortalBuffer * portal)
+PQrulep(PortalBuffer *portal)
{
if (!valid_pointer("PQrulep: invalid portal pointer", portal))
return (-1);
@@ -196,7 +196,7 @@ PQrulep(PortalBuffer * portal)
* --------------------------------
*/
int
-PQntuples(PortalBuffer * portal)
+PQntuples(PortalBuffer *portal)
{
if (!valid_pointer("PQntuples: invalid portal pointer", portal))
return (-1);
@@ -205,7 +205,7 @@ PQntuples(PortalBuffer * portal)
}
int
-PQninstances(PortalBuffer * portal)
+PQninstances(PortalBuffer *portal)
{
return (PQntuples(portal));
}
@@ -215,7 +215,7 @@ PQninstances(PortalBuffer * portal)
* --------------------------------
*/
int
-PQngroups(PortalBuffer * portal)
+PQngroups(PortalBuffer *portal)
{
if (!valid_pointer("PQngroups: invalid portal pointer", portal))
return (-1);
@@ -228,7 +228,7 @@ PQngroups(PortalBuffer * portal)
* --------------------------------
*/
int
-PQntuplesGroup(PortalBuffer * portal, int group_index)
+PQntuplesGroup(PortalBuffer *portal, int group_index)
{
GroupBuffer *gbp;
@@ -244,7 +244,7 @@ PQntuplesGroup(PortalBuffer * portal, int group_index)
}
int
-PQninstancesGroup(PortalBuffer * portal, int group_index)
+PQninstancesGroup(PortalBuffer *portal, int group_index)
{
return (PQntuplesGroup(portal, group_index));
}
@@ -254,7 +254,7 @@ PQninstancesGroup(PortalBuffer * portal, int group_index)
* --------------------------------
*/
int
-PQnfieldsGroup(PortalBuffer * portal, int group_index)
+PQnfieldsGroup(PortalBuffer *portal, int group_index)
{
GroupBuffer *gbp;
@@ -274,7 +274,7 @@ PQnfieldsGroup(PortalBuffer * portal, int group_index)
* --------------------------------
*/
int
-PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name)
+PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name)
{
GroupBuffer *gbp;
@@ -296,7 +296,7 @@ PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name)
* --------------------------------
*/
char *
-PQfnameGroup(PortalBuffer * portal, int group_index, int field_number)
+PQfnameGroup(PortalBuffer *portal, int group_index, int field_number)
{
GroupBuffer *gbp;
@@ -318,7 +318,7 @@ PQfnameGroup(PortalBuffer * portal, int group_index, int field_number)
* --------------------------------
*/
int
-PQftypeGroup(PortalBuffer * portal, int group_index, int field_number)
+PQftypeGroup(PortalBuffer *portal, int group_index, int field_number)
{
GroupBuffer *gbp;
@@ -339,7 +339,7 @@ PQftypeGroup(PortalBuffer * portal, int group_index, int field_number)
* --------------------------------
*/
int
-PQfsizeGroup(PortalBuffer * portal, int group_index, int field_number)
+PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number)
{
GroupBuffer *gbp;
@@ -360,7 +360,7 @@ PQfsizeGroup(PortalBuffer * portal, int group_index, int field_number)
* --------------------------------
*/
GroupBuffer *
-PQgroup(PortalBuffer * portal, int tuple_index)
+PQgroup(PortalBuffer *portal, int tuple_index)
{
GroupBuffer *gbp;
int tuple_count = 0;
@@ -386,7 +386,7 @@ PQgroup(PortalBuffer * portal, int tuple_index)
* --------------------------------
*/
int
-PQgetgroup(PortalBuffer * portal, int tuple_index)
+PQgetgroup(PortalBuffer *portal, int tuple_index)
{
GroupBuffer *gbp;
int tuple_count = 0,
@@ -412,7 +412,7 @@ PQgetgroup(PortalBuffer * portal, int tuple_index)
* --------------------------------
*/
int
-PQnfields(PortalBuffer * portal, int tuple_index)
+PQnfields(PortalBuffer *portal, int tuple_index)
{
GroupBuffer *gbp;
@@ -432,7 +432,7 @@ PQnfields(PortalBuffer * portal, int tuple_index)
* --------------------------------
*/
int
-PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name)
+PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name)
{
GroupBuffer *gbp;
@@ -452,7 +452,7 @@ PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name)
* --------------------------------
*/
char *
-PQfname(PortalBuffer * portal, int tuple_index, int field_number)
+PQfname(PortalBuffer *portal, int tuple_index, int field_number)
{
GroupBuffer *gbp;
@@ -473,7 +473,7 @@ PQfname(PortalBuffer * portal, int tuple_index, int field_number)
* --------------------------------
*/
int
-PQftype(PortalBuffer * portal, int tuple_index, int field_number)
+PQftype(PortalBuffer *portal, int tuple_index, int field_number)
{
GroupBuffer *gbp;
@@ -493,7 +493,7 @@ PQftype(PortalBuffer * portal, int tuple_index, int field_number)
* --------------------------------
*/
int
-PQfsize(PortalBuffer * portal, int tuple_index, int field_number)
+PQfsize(PortalBuffer *portal, int tuple_index, int field_number)
{
GroupBuffer *gbp;
@@ -516,7 +516,7 @@ PQfsize(PortalBuffer * portal, int tuple_index, int field_number)
* --------------------------------
*/
int
-PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2)
+PQsametype(PortalBuffer *portal, int tuple_index1, int tuple_index2)
{
GroupBuffer *gbp1,
*gbp2;
@@ -536,7 +536,7 @@ PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2)
}
static TupleBlock *
-PQGetTupleBlock(PortalBuffer * portal,
+PQGetTupleBlock(PortalBuffer *portal,
int tuple_index,
int *tuple_offset)
{
@@ -579,7 +579,7 @@ PQGetTupleBlock(PortalBuffer * portal,
* --------------------------------
*/
char *
-PQgetvalue(PortalBuffer * portal,
+PQgetvalue(PortalBuffer *portal,
int tuple_index,
int field_number)
{
@@ -599,7 +599,7 @@ PQgetvalue(PortalBuffer * portal,
* --------------------------------
*/
char *
-PQgetAttr(PortalBuffer * portal,
+PQgetAttr(PortalBuffer *portal,
int tuple_index,
int field_number)
{
@@ -627,7 +627,7 @@ PQgetAttr(PortalBuffer * portal,
* --------------------------------
*/
int
-PQgetlength(PortalBuffer * portal,
+PQgetlength(PortalBuffer *portal,
int tuple_index,
int field_number)
{
@@ -716,7 +716,7 @@ PQnotifies()
}
void
-PQremoveNotify(PQNotifyList * nPtr)
+PQremoveNotify(PQNotifyList *nPtr)
{
nPtr->valid = 0; /* remove later */
}
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 71db1d1e761001734e0669771e44bae34bd9a5b1..bff6a449ead0074a1333c65f44b8a9074b156668 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.6 1997/09/08 02:23:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.7 1997/09/08 21:43:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -160,7 +160,7 @@ pbuf_addPortal()
* --------------------------------
*/
GroupBuffer *
-pbuf_addGroup(PortalBuffer * portal)
+pbuf_addGroup(PortalBuffer *portal)
{
GroupBuffer *group,
*group1;
@@ -285,7 +285,7 @@ pbuf_freeEntry(int i)
* --------------------------------
*/
void
-pbuf_freeTypes(TypeBlock * types)
+pbuf_freeTypes(TypeBlock *types)
{
pbuf_free((caddr_t) types);
}
@@ -295,7 +295,7 @@ pbuf_freeTypes(TypeBlock * types)
* --------------------------------
*/
void
-pbuf_freeTuples(TupleBlock * tuples,
+pbuf_freeTuples(TupleBlock *tuples,
int no_tuples,
int no_fields)
{
@@ -328,7 +328,7 @@ pbuf_freeTuples(TupleBlock * tuples,
* --------------------------------
*/
void
-pbuf_freeGroup(GroupBuffer * group)
+pbuf_freeGroup(GroupBuffer *group)
{
if (group->next != NULL)
pbuf_freeGroup(group->next);
@@ -347,7 +347,7 @@ pbuf_freeGroup(GroupBuffer * group)
* --------------------------------
*/
void
-pbuf_freePortal(PortalBuffer * portal)
+pbuf_freePortal(PortalBuffer *portal)
{
if (portal->groups != NULL)
pbuf_freeGroup(portal->groups);
@@ -381,7 +381,7 @@ pbuf_getIndex(char *pname)
* --------------------------------
*/
void
-pbuf_setportalinfo(PortalEntry * entry, char *pname)
+pbuf_setportalinfo(PortalEntry *entry, char *pname)
{
if (entry)
strNcpy(entry->name, pname, PortalNameLength - 1);
@@ -449,7 +449,7 @@ pbuf_close(char *pname)
* --------------------------------
*/
GroupBuffer *
-pbuf_findGroup(PortalBuffer * portal,
+pbuf_findGroup(PortalBuffer *portal,
int group_index)
{
GroupBuffer *group;
@@ -473,7 +473,7 @@ pbuf_findGroup(PortalBuffer * portal,
* --------------------------------
*/
int
-pbuf_findFnumber(GroupBuffer * group,
+pbuf_findFnumber(GroupBuffer *group,
char *field_name)
{
TypeBlock *types;
@@ -498,7 +498,7 @@ pbuf_findFnumber(GroupBuffer * group,
* --------------------------------
*/
void
-pbuf_checkFnumber(GroupBuffer * group,
+pbuf_checkFnumber(GroupBuffer *group,
int field_number)
{
if (field_number < 0 || field_number >= group->no_fields)
@@ -511,7 +511,7 @@ pbuf_checkFnumber(GroupBuffer * group,
* --------------------------------
*/
char *
-pbuf_findFname(GroupBuffer * group,
+pbuf_findFname(GroupBuffer *group,
int field_number)
{
pbuf_checkFnumber(group, field_number);
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 93e8fa81af241ca01812c31a525d1c36782754e9..550e797d272122a4455b107ff6fe35bfe25068f1 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.21 1997/09/08 02:23:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.22 1997/09/08 21:43:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -100,7 +100,7 @@ pq_init(int fd)
* used for debugging libpq
*/
static int
-pq_getc(FILE * fin)
+pq_getc(FILE *fin)
{
int c;
@@ -643,7 +643,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
* RETURNS: STATUS_OK or STATUS_ERROR
*/
int
-StreamConnection(int server_fd, Port * port)
+StreamConnection(int server_fd, Port *port)
{
int addrlen;
@@ -712,7 +712,7 @@ StreamClose(int sock)
* ---------------------------
*/
int
-StreamOpen(char *hostName, short portName, Port * port)
+StreamOpen(char *hostName, short portName, Port *port)
{
struct hostent *hp;
int laddrlen = sizeof(struct sockaddr_in);
diff --git a/src/backend/libpq/pqcomprim.c b/src/backend/libpq/pqcomprim.c
index d6bdf6f13bbcc4d7d0e2945cf0fb5716b77d7352..594bb2b98ade0c5afa8bc6e0535c8eb1992fff0d 100644
--- a/src/backend/libpq/pqcomprim.c
+++ b/src/backend/libpq/pqcomprim.c
@@ -46,7 +46,7 @@
/* --------------------------------------------------------------------- */
int
-pqPutShort(int integer, FILE * f)
+pqPutShort(int integer, FILE *f)
{
int retval = 0;
u_short n,
@@ -62,7 +62,7 @@ pqPutShort(int integer, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqPutLong(int integer, FILE * f)
+pqPutLong(int integer, FILE *f)
{
int retval = 0;
u_long n;
@@ -76,7 +76,7 @@ pqPutLong(int integer, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqGetShort(int *result, FILE * f)
+pqGetShort(int *result, FILE *f)
{
int retval = 0;
u_short n;
@@ -90,7 +90,7 @@ pqGetShort(int *result, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqGetLong(int *result, FILE * f)
+pqGetLong(int *result, FILE *f)
{
int retval = 0;
u_long n;
@@ -107,7 +107,7 @@ pqGetLong(int *result, FILE * f)
Return 0 if ok.
*/
int
-pqGetNBytes(char *s, size_t len, FILE * f)
+pqGetNBytes(char *s, size_t len, FILE *f)
{
int cnt;
@@ -123,7 +123,7 @@ pqGetNBytes(char *s, size_t len, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqPutNBytes(const char *s, size_t len, FILE * f)
+pqPutNBytes(const char *s, size_t len, FILE *f)
{
if (f == NULL)
return 0;
@@ -136,7 +136,7 @@ pqPutNBytes(const char *s, size_t len, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqGetString(char *s, size_t len, FILE * f)
+pqGetString(char *s, size_t len, FILE *f)
{
int c;
@@ -153,7 +153,7 @@ pqGetString(char *s, size_t len, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqPutString(const char *s, FILE * f)
+pqPutString(const char *s, FILE *f)
{
if (f == NULL)
return 0;
@@ -170,14 +170,14 @@ pqPutString(const char *s, FILE * f)
/* --------------------------------------------------------------------- */
int
-pqGetByte(FILE * f)
+pqGetByte(FILE *f)
{
return getc(f);
}
/* --------------------------------------------------------------------- */
int
-pqPutByte(int c, FILE * f)
+pqPutByte(int c, FILE *f)
{
if (!f)
return 0;
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index fb1f2fbb4818ce61871c043616aa180dc619b712..1e95794c8516b7b4b9a6d4badfc1517b4a52e995 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.7 1997/09/08 02:23:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.8 1997/09/08 21:43:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,8 +57,8 @@
*
*/
int
-PacketReceive(Port * port, /* receive port */
- PacketBuf * buf, /* MAX_PACKET_SIZE-worth of buffer space */
+PacketReceive(Port *port, /* receive port */
+ PacketBuf *buf, /* MAX_PACKET_SIZE-worth of buffer space */
bool nonBlocking) /* NON_BLOCKING or BLOCKING i/o */
{
PacketLen max_size = sizeof(PacketBuf);
@@ -219,8 +219,8 @@ PacketReceive(Port * port, /* receive port */
*
*/
int
-PacketSend(Port * port,
- PacketBuf * buf,
+PacketSend(Port *port,
+ PacketBuf *buf,
PacketLen len,
bool nonBlocking)
{
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 36ed7e86ebd68728eade46e71b7ff0e92d052c9e..ef6c1a1828b507de017b7294a268bf5ebbf4c454 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.9 1997/09/08 20:55:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.10 1997/09/08 21:43:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@
* its contents. (good for list of pointers as well as list of integers).
*/
List *
-listCopy(List * list)
+listCopy(List *list)
{
List *newlist = NIL;
List *l,
@@ -78,7 +78,7 @@ listCopy(List * list)
* ----------------
*/
static void
-CopyPlanFields(Plan * from, Plan * newnode)
+CopyPlanFields(Plan *from, Plan *newnode)
{
newnode->cost = from->cost;
newnode->plan_size = from->plan_size;
@@ -95,7 +95,7 @@ CopyPlanFields(Plan * from, Plan * newnode)
* ----------------
*/
static Plan *
-_copyPlan(Plan * from)
+_copyPlan(Plan *from)
{
Plan *newnode = makeNode(Plan);
@@ -114,7 +114,7 @@ _copyPlan(Plan * from)
* ----------------
*/
static Existential *
-_copyExistential(Existential * from)
+_copyExistential(Existential *from)
{
Existential *newnode = makeNode(Existential);
@@ -132,7 +132,7 @@ _copyExistential(Existential * from)
* ----------------
*/
static Result *
-_copyResult(Result * from)
+_copyResult(Result *from)
{
Result *newnode = makeNode(Result);
@@ -188,7 +188,7 @@ _copyAppend(Append *from)
* ----------------
*/
static void
-CopyScanFields(Scan * from, Scan * newnode)
+CopyScanFields(Scan *from, Scan *newnode)
{
newnode->scanrelid = from->scanrelid;
Node_Copy(from, newnode, scanstate);
@@ -200,7 +200,7 @@ CopyScanFields(Scan * from, Scan * newnode)
* ----------------
*/
static Scan *
-_copyScan(Scan * from)
+_copyScan(Scan *from)
{
Scan *newnode = makeNode(Scan);
@@ -219,7 +219,7 @@ _copyScan(Scan * from)
* ----------------
*/
static SeqScan *
-_copySeqScan(SeqScan * from)
+_copySeqScan(SeqScan *from)
{
SeqScan *newnode = makeNode(SeqScan);
@@ -238,7 +238,7 @@ _copySeqScan(SeqScan * from)
* ----------------
*/
static IndexScan *
-_copyIndexScan(IndexScan * from)
+_copyIndexScan(IndexScan *from)
{
IndexScan *newnode = makeNode(IndexScan);
@@ -268,7 +268,7 @@ _copyIndexScan(IndexScan * from)
* ----------------
*/
static void
-CopyJoinFields(Join * from, Join * newnode)
+CopyJoinFields(Join *from, Join *newnode)
{
/* nothing extra */
return;
@@ -280,7 +280,7 @@ CopyJoinFields(Join * from, Join * newnode)
* ----------------
*/
static Join *
-_copyJoin(Join * from)
+_copyJoin(Join *from)
{
Join *newnode = makeNode(Join);
@@ -300,7 +300,7 @@ _copyJoin(Join * from)
* ----------------
*/
static NestLoop *
-_copyNestLoop(NestLoop * from)
+_copyNestLoop(NestLoop *from)
{
NestLoop *newnode = makeNode(NestLoop);
@@ -326,7 +326,7 @@ _copyNestLoop(NestLoop * from)
* ----------------
*/
static MergeJoin *
-_copyMergeJoin(MergeJoin * from)
+_copyMergeJoin(MergeJoin *from)
{
MergeJoin *newnode = makeNode(MergeJoin);
List *newlist;
@@ -365,7 +365,7 @@ _copyMergeJoin(MergeJoin * from)
* ----------------
*/
static HashJoin *
-_copyHashJoin(HashJoin * from)
+_copyHashJoin(HashJoin *from)
{
HashJoin *newnode = makeNode(HashJoin);
@@ -403,7 +403,7 @@ _copyHashJoin(HashJoin * from)
* ----------------
*/
static void
-CopyTempFields(Temp * from, Temp * newnode)
+CopyTempFields(Temp *from, Temp *newnode)
{
newnode->tempid = from->tempid;
newnode->keycount = from->keycount;
@@ -416,7 +416,7 @@ CopyTempFields(Temp * from, Temp * newnode)
* ----------------
*/
static Temp *
-_copyTemp(Temp * from)
+_copyTemp(Temp *from)
{
Temp *newnode = makeNode(Temp);
@@ -435,7 +435,7 @@ _copyTemp(Temp * from)
* ----------------
*/
static Material *
-_copyMaterial(Material * from)
+_copyMaterial(Material *from)
{
Material *newnode = makeNode(Material);
@@ -461,7 +461,7 @@ _copyMaterial(Material * from)
* ----------------
*/
static Sort *
-_copySort(Sort * from)
+_copySort(Sort *from)
{
Sort *newnode = makeNode(Sort);
@@ -512,7 +512,7 @@ _copyAgg(Agg *from)
* ----------------
*/
static Unique *
-_copyUnique(Unique * from)
+_copyUnique(Unique *from)
{
Unique *newnode = makeNode(Unique);
@@ -538,7 +538,7 @@ _copyUnique(Unique * from)
* ----------------
*/
static Hash *
-_copyHash(Hash * from)
+_copyHash(Hash *from)
{
Hash *newnode = makeNode(Hash);
@@ -572,7 +572,7 @@ _copyHash(Hash * from)
* ----------------
*/
static Resdom *
-_copyResdom(Resdom * from)
+_copyResdom(Resdom *from)
{
Resdom *newnode = makeNode(Resdom);
@@ -596,7 +596,7 @@ _copyResdom(Resdom * from)
}
static Fjoin *
-_copyFjoin(Fjoin * from)
+_copyFjoin(Fjoin *from)
{
Fjoin *newnode = makeNode(Fjoin);
@@ -633,7 +633,7 @@ _copyFjoin(Fjoin * from)
* ----------------
*/
static Expr *
-_copyExpr(Expr * from)
+_copyExpr(Expr *from)
{
Expr *newnode = makeNode(Expr);
@@ -655,7 +655,7 @@ _copyExpr(Expr * from)
* ----------------
*/
static Var *
-_copyVar(Var * from)
+_copyVar(Var *from)
{
Var *newnode = makeNode(Var);
@@ -678,7 +678,7 @@ _copyVar(Var * from)
* ----------------
*/
static Oper *
-_copyOper(Oper * from)
+_copyOper(Oper *from)
{
Oper *newnode = makeNode(Oper);
@@ -706,7 +706,7 @@ _copyOper(Oper * from)
* ----------------
*/
static Const *
-_copyConst(Const * from)
+_copyConst(Const *from)
{
static Oid cached_type;
static bool cached_typbyval;
@@ -817,7 +817,7 @@ _copyConst(Const * from)
* ----------------
*/
static Param *
-_copyParam(Param * from)
+_copyParam(Param *from)
{
Param *newnode = makeNode(Param);
@@ -846,7 +846,7 @@ _copyParam(Param * from)
* ----------------
*/
static Func *
-_copyFunc(Func * from)
+_copyFunc(Func *from)
{
Func *newnode = makeNode(Func);
@@ -946,7 +946,7 @@ _copyArrayRef(ArrayRef *from)
** -- JMH, 8/2/93
*/
static Rel *
-_copyRel(Rel * from)
+_copyRel(Rel *from)
{
Rel *newnode = makeNode(Rel);
int i,
@@ -1024,7 +1024,7 @@ _copyRel(Rel * from)
* ----------------
*/
static void
-CopyPathFields(Path * from, Path * newnode)
+CopyPathFields(Path *from, Path *newnode)
{
newnode->pathtype = from->pathtype;
@@ -1079,7 +1079,7 @@ CopyPathFields(Path * from, Path * newnode)
* ----------------
*/
static Path *
-_copyPath(Path * from)
+_copyPath(Path *from)
{
Path *newnode = makeNode(Path);
@@ -1093,7 +1093,7 @@ _copyPath(Path * from)
* ----------------
*/
static IndexPath *
-_copyIndexPath(IndexPath * from)
+_copyIndexPath(IndexPath *from)
{
IndexPath *newnode = makeNode(IndexPath);
@@ -1136,7 +1136,7 @@ _copyIndexPath(IndexPath * from)
* ----------------
*/
static void
-CopyJoinPathFields(JoinPath * from, JoinPath * newnode)
+CopyJoinPathFields(JoinPath *from, JoinPath *newnode)
{
Node_Copy(from, newnode, pathclauseinfo);
Node_Copy(from, newnode, outerjoinpath);
@@ -1148,7 +1148,7 @@ CopyJoinPathFields(JoinPath * from, JoinPath * newnode)
* ----------------
*/
static JoinPath *
-_copyJoinPath(JoinPath * from)
+_copyJoinPath(JoinPath *from)
{
JoinPath *newnode = makeNode(JoinPath);
@@ -1167,7 +1167,7 @@ _copyJoinPath(JoinPath * from)
* ----------------
*/
static MergePath *
-_copyMergePath(MergePath * from)
+_copyMergePath(MergePath *from)
{
MergePath *newnode = makeNode(MergePath);
@@ -1194,7 +1194,7 @@ _copyMergePath(MergePath * from)
* ----------------
*/
static HashPath *
-_copyHashPath(HashPath * from)
+_copyHashPath(HashPath *from)
{
HashPath *newnode = makeNode(HashPath);
@@ -1221,7 +1221,7 @@ _copyHashPath(HashPath * from)
* ----------------
*/
static OrderKey *
-_copyOrderKey(OrderKey * from)
+_copyOrderKey(OrderKey *from)
{
OrderKey *newnode = makeNode(OrderKey);
@@ -1241,7 +1241,7 @@ _copyOrderKey(OrderKey * from)
* ----------------
*/
static JoinKey *
-_copyJoinKey(JoinKey * from)
+_copyJoinKey(JoinKey *from)
{
JoinKey *newnode = makeNode(JoinKey);
@@ -1260,7 +1260,7 @@ _copyJoinKey(JoinKey * from)
* ----------------
*/
static MergeOrder *
-_copyMergeOrder(MergeOrder * from)
+_copyMergeOrder(MergeOrder *from)
{
MergeOrder *newnode = makeNode(MergeOrder);
@@ -1282,7 +1282,7 @@ _copyMergeOrder(MergeOrder * from)
* ----------------
*/
static CInfo *
-_copyCInfo(CInfo * from)
+_copyCInfo(CInfo *from)
{
CInfo *newnode = makeNode(CInfo);
@@ -1311,7 +1311,7 @@ _copyCInfo(CInfo * from)
* ----------------
*/
static void
-CopyJoinMethodFields(JoinMethod * from, JoinMethod * newnode)
+CopyJoinMethodFields(JoinMethod *from, JoinMethod *newnode)
{
Node_Copy(from, newnode, jmkeys);
Node_Copy(from, newnode, clauses);
@@ -1323,7 +1323,7 @@ CopyJoinMethodFields(JoinMethod * from, JoinMethod * newnode)
* ----------------
*/
static JoinMethod *
-_copyJoinMethod(JoinMethod * from)
+_copyJoinMethod(JoinMethod *from)
{
JoinMethod *newnode = makeNode(JoinMethod);
@@ -1337,7 +1337,7 @@ _copyJoinMethod(JoinMethod * from)
* ----------------
*/
static HInfo *
-_copyHInfo(HInfo * from)
+_copyHInfo(HInfo *from)
{
HInfo *newnode = makeNode(HInfo);
@@ -1355,7 +1355,7 @@ _copyHInfo(HInfo * from)
* ----------------
*/
static MInfo *
-_copyMInfo(MInfo * from)
+_copyMInfo(MInfo *from)
{
MInfo *newnode = makeNode(MInfo);
@@ -1373,7 +1373,7 @@ _copyMInfo(MInfo * from)
* ----------------
*/
static JInfo *
-_copyJInfo(JInfo * from)
+_copyJInfo(JInfo *from)
{
JInfo *newnode = makeNode(JInfo);
@@ -1392,7 +1392,7 @@ _copyJInfo(JInfo * from)
}
static Iter *
-_copyIter(Iter * from)
+_copyIter(Iter *from)
{
Iter *newnode = makeNode(Iter);
@@ -1403,7 +1403,7 @@ _copyIter(Iter * from)
}
static Stream *
-_copyStream(Stream * from)
+_copyStream(Stream *from)
{
Stream *newnode = makeNode(Stream);
@@ -1428,7 +1428,7 @@ _copyStream(Stream * from)
*/
static TargetEntry *
-_copyTargetEntry(TargetEntry * from)
+_copyTargetEntry(TargetEntry *from)
{
TargetEntry *newnode = makeNode(TargetEntry);
@@ -1439,7 +1439,7 @@ _copyTargetEntry(TargetEntry * from)
}
static RangeTblEntry *
-_copyRangeTblEntry(RangeTblEntry * from)
+_copyRangeTblEntry(RangeTblEntry *from)
{
RangeTblEntry *newnode = makeNode(RangeTblEntry);
@@ -1468,7 +1468,7 @@ _copyRangeTblEntry(RangeTblEntry * from)
}
static SortClause *
-_copySortClause(SortClause * from)
+_copySortClause(SortClause *from)
{
SortClause *newnode = makeNode(SortClause);
@@ -1490,7 +1490,7 @@ _copyAConst(A_Const *from)
}
static TypeName *
-_copyTypeName(TypeName * from)
+_copyTypeName(TypeName *from)
{
TypeName *newnode = makeNode(TypeName);
@@ -1510,7 +1510,7 @@ _copyTypeName(TypeName * from)
}
static Query *
-_copyQuery(Query * from)
+_copyQuery(Query *from)
{
Query *newnode = makeNode(Query);
@@ -1564,7 +1564,7 @@ _copyQuery(Query * from)
*/
static Value *
-_copyValue(Value * from)
+_copyValue(Value *from)
{
Value *newnode = makeNode(Value);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 3500a638ce435fce634a6fc1e30918ee2d4fa4b1..c5728dddd1cc0fc734d44a7efcc34ab16316b30d 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.9 1997/09/08 20:55:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.10 1997/09/08 21:44:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
#include "utils/elog.h"
#include "storage/itemptr.h"
-static bool equali(List * a, List * b);
+static bool equali(List *a, List *b);
/*
* Stuff from primnodes.h
@@ -36,7 +36,7 @@ static bool equali(List * a, List * b);
* Resdom is a subclass of Node.
*/
static bool
-_equalResdom(Resdom * a, Resdom * b)
+_equalResdom(Resdom *a, Resdom *b)
{
if (a->resno != b->resno)
return (false);
@@ -55,7 +55,7 @@ _equalResdom(Resdom * a, Resdom * b)
}
static bool
-_equalFjoin(Fjoin * a, Fjoin * b)
+_equalFjoin(Fjoin *a, Fjoin *b)
{
int nNodes;
@@ -79,7 +79,7 @@ _equalFjoin(Fjoin * a, Fjoin * b)
* Expr is a subclass of Node.
*/
static bool
-_equalExpr(Expr * a, Expr * b)
+_equalExpr(Expr *a, Expr *b)
{
if (a->opType != b->opType)
return (false);
@@ -92,13 +92,13 @@ _equalExpr(Expr * a, Expr * b)
}
static bool
-_equalIter(Iter * a, Iter * b)
+_equalIter(Iter *a, Iter *b)
{
return (equal(a->iterexpr, b->iterexpr));
}
static bool
-_equalStream(Stream * a, Stream * b)
+_equalStream(Stream *a, Stream *b)
{
if (a->clausetype != b->clausetype)
return (false);
@@ -121,7 +121,7 @@ _equalStream(Stream * a, Stream * b)
* Var is a subclass of Expr.
*/
static bool
-_equalVar(Var * a, Var * b)
+_equalVar(Var *a, Var *b)
{
if (a->varno != b->varno)
return (false);
@@ -177,7 +177,7 @@ _equalArrayRef(ArrayRef *a, ArrayRef *b)
* Oper is a subclass of Expr.
*/
static bool
-_equalOper(Oper * a, Oper * b)
+_equalOper(Oper *a, Oper *b)
{
if (a->opno != b->opno)
return (false);
@@ -191,7 +191,7 @@ _equalOper(Oper * a, Oper * b)
* Const is a subclass of Expr.
*/
static bool
-_equalConst(Const * a, Const * b)
+_equalConst(Const *a, Const *b)
{
/*
@@ -214,7 +214,7 @@ _equalConst(Const * a, Const * b)
* Param is a subclass of Expr.
*/
static bool
-_equalParam(Param * a, Param * b)
+_equalParam(Param *a, Param *b)
{
if (a->paramkind != b->paramkind)
return (false);
@@ -254,7 +254,7 @@ _equalParam(Param * a, Param * b)
* Func is a subclass of Expr.
*/
static bool
-_equalFunc(Func * a, Func * b)
+_equalFunc(Func *a, Func *b)
{
if (a->funcid != b->funcid)
return (false);
@@ -276,7 +276,7 @@ _equalFunc(Func * a, Func * b)
* CInfo is a subclass of Node.
*/
static bool
-_equalCInfo(CInfo * a, CInfo * b)
+_equalCInfo(CInfo *a, CInfo *b)
{
Assert(IsA(a, CInfo));
Assert(IsA(b, CInfo));
@@ -298,7 +298,7 @@ _equalCInfo(CInfo * a, CInfo * b)
}
static bool
-_equalJoinMethod(JoinMethod * a, JoinMethod * b)
+_equalJoinMethod(JoinMethod *a, JoinMethod *b)
{
Assert(IsA(a, JoinMethod));
Assert(IsA(b, JoinMethod));
@@ -313,7 +313,7 @@ _equalJoinMethod(JoinMethod * a, JoinMethod * b)
}
static bool
-_equalPath(Path * a, Path * b)
+_equalPath(Path *a, Path *b)
{
if (a->pathtype != b->pathtype)
return (false);
@@ -368,7 +368,7 @@ _equalPath(Path * a, Path * b)
}
static bool
-_equalIndexPath(IndexPath * a, IndexPath * b)
+_equalIndexPath(IndexPath *a, IndexPath *b)
{
if (!_equalPath((Path *) a, (Path *) b))
return (false);
@@ -380,7 +380,7 @@ _equalIndexPath(IndexPath * a, IndexPath * b)
}
static bool
-_equalJoinPath(JoinPath * a, JoinPath * b)
+_equalJoinPath(JoinPath *a, JoinPath *b)
{
Assert(IsA_JoinPath(a));
Assert(IsA_JoinPath(b));
@@ -397,7 +397,7 @@ _equalJoinPath(JoinPath * a, JoinPath * b)
}
static bool
-_equalMergePath(MergePath * a, MergePath * b)
+_equalMergePath(MergePath *a, MergePath *b)
{
Assert(IsA(a, MergePath));
Assert(IsA(b, MergePath));
@@ -414,7 +414,7 @@ _equalMergePath(MergePath * a, MergePath * b)
}
static bool
-_equalHashPath(HashPath * a, HashPath * b)
+_equalHashPath(HashPath *a, HashPath *b)
{
Assert(IsA(a, HashPath));
Assert(IsA(b, HashPath));
@@ -431,7 +431,7 @@ _equalHashPath(HashPath * a, HashPath * b)
}
static bool
-_equalJoinKey(JoinKey * a, JoinKey * b)
+_equalJoinKey(JoinKey *a, JoinKey *b)
{
Assert(IsA(a, JoinKey));
Assert(IsA(b, JoinKey));
@@ -444,7 +444,7 @@ _equalJoinKey(JoinKey * a, JoinKey * b)
}
static bool
-_equalMergeOrder(MergeOrder * a, MergeOrder * b)
+_equalMergeOrder(MergeOrder *a, MergeOrder *b)
{
if (a == (MergeOrder *) NULL && b == (MergeOrder *) NULL)
return (true);
@@ -465,7 +465,7 @@ _equalMergeOrder(MergeOrder * a, MergeOrder * b)
}
static bool
-_equalHInfo(HInfo * a, HInfo * b)
+_equalHInfo(HInfo *a, HInfo *b)
{
Assert(IsA(a, HInfo));
Assert(IsA(b, HInfo));
@@ -479,7 +479,7 @@ _equalHInfo(HInfo * a, HInfo * b)
* fixed to compare all fields.
*/
static bool
-_equalIndexScan(IndexScan * a, IndexScan * b)
+_equalIndexScan(IndexScan *a, IndexScan *b)
{
Assert(IsA(a, IndexScan));
Assert(IsA(b, IndexScan));
@@ -500,7 +500,7 @@ _equalIndexScan(IndexScan * a, IndexScan * b)
}
static bool
-_equalJInfo(JInfo * a, JInfo * b)
+_equalJInfo(JInfo *a, JInfo *b)
{
Assert(IsA(a, JInfo));
Assert(IsA(b, JInfo));
@@ -523,7 +523,7 @@ _equalJInfo(JInfo * a, JInfo * b)
* EState is a subclass of Node.
*/
static bool
-_equalEState(EState * a, EState * b)
+_equalEState(EState *a, EState *b)
{
if (a->es_direction != b->es_direction)
return (false);
@@ -538,7 +538,7 @@ _equalEState(EState * a, EState * b)
}
static bool
-_equalTargetEntry(TargetEntry * a, TargetEntry * b)
+_equalTargetEntry(TargetEntry *a, TargetEntry *b)
{
if (!equal(a->resdom, b->resdom))
return (false);
@@ -558,7 +558,7 @@ _equalTargetEntry(TargetEntry * a, TargetEntry * b)
* to be recursive, but it should run faster if we iterate.
*/
static bool
-_equalValue(Value * a, Value * b)
+_equalValue(Value *a, Value *b)
{
if (a->type != b->type)
return (false);
@@ -722,7 +722,7 @@ equal(void *a, void *b)
* XXX temp hack. needs something like T_IntList
*/
static bool
-equali(List * a, List * b)
+equali(List *a, List *b)
{
List *la = (List *) a;
List *lb = (List *) b;
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index abba222b81ad2509cb3036b68396d8d6309ccf86..1f92b604e7175a3c9a78e97de7b112aa93eff7e7 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.6 1997/09/08 02:23:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.7 1997/09/08 21:44:04 momjian Exp $
*
* NOTES
* XXX a few of the following functions are duplicated to handle
@@ -58,7 +58,7 @@ makeList(void *elem,...)
}
List *
-lcons(void *obj, List * list)
+lcons(void *obj, List *list)
{
List *l = makeNode(List);
@@ -68,7 +68,7 @@ lcons(void *obj, List * list)
}
List *
-lconsi(int datum, List * list)
+lconsi(int datum, List *list)
{
List *l = makeNode(List);
@@ -78,13 +78,13 @@ lconsi(int datum, List * list)
}
List *
-lappend(List * list, void *obj)
+lappend(List *list, void *obj)
{
return nconc(list, lcons(obj, NIL));
}
List *
-lappendi(List * list, int datum)
+lappendi(List *list, int datum)
{
return nconc(list, lconsi(datum, NIL));
}
@@ -121,7 +121,7 @@ makeString(char *str)
/* n starts with 0 */
void *
-nth(int n, List * l)
+nth(int n, List *l)
{
/* XXX assume list is long enough */
while (n > 0)
@@ -133,7 +133,7 @@ nth(int n, List * l)
}
int
-nthi(int n, List * l)
+nthi(int n, List *l)
{
/* XXX assume list is long enough */
while (n > 0)
@@ -146,7 +146,7 @@ nthi(int n, List * l)
/* this is here solely for rt_store. Get rid of me some day! */
void
-set_nth(List * l, int n, void *elem)
+set_nth(List *l, int n, void *elem)
{
/* XXX assume list is long enough */
while (n > 0)
@@ -159,7 +159,7 @@ set_nth(List * l, int n, void *elem)
}
int
-length(List * l)
+length(List *l)
{
int i = 0;
@@ -172,7 +172,7 @@ length(List * l)
}
void
-freeList(List * list)
+freeList(List *list)
{
while (list != NIL)
{
@@ -187,7 +187,7 @@ freeList(List * list)
* below are for backwards compatibility
*/
List *
-append(List * l1, List * l2)
+append(List *l1, List *l2)
{
List *newlist,
*newlist2,
@@ -209,7 +209,7 @@ append(List * l1, List * l2)
* below are for backwards compatibility
*/
List *
-intAppend(List * l1, List * l2)
+intAppend(List *l1, List *l2)
{
List *newlist,
*newlist2,
@@ -228,7 +228,7 @@ intAppend(List * l1, List * l2)
}
List *
-nconc(List * l1, List * l2)
+nconc(List *l1, List *l2)
{
List *temp;
@@ -248,7 +248,7 @@ nconc(List * l1, List * l2)
List *
-nreverse(List * list)
+nreverse(List *list)
{
List *rlist = NIL;
List *p = NIL;
@@ -278,7 +278,7 @@ nreverse(List * list)
* XXX only good for IntList -ay
*/
bool
-same(List * foo, List * bar)
+same(List *foo, List *bar)
{
List *temp = NIL;
@@ -300,7 +300,7 @@ same(List * foo, List * bar)
}
List *
-LispUnion(List * foo, List * bar)
+LispUnion(List *foo, List *bar)
{
List *retval = NIL;
List *i = NIL;
@@ -332,7 +332,7 @@ LispUnion(List * foo, List * bar)
}
List *
-LispUnioni(List * foo, List * bar)
+LispUnioni(List *foo, List *bar)
{
List *retval = NIL;
List *i = NIL;
@@ -369,7 +369,7 @@ LispUnioni(List * foo, List * bar)
* bar
*/
bool
-member(void *foo, List * bar)
+member(void *foo, List *bar)
{
List *i;
@@ -380,7 +380,7 @@ member(void *foo, List * bar)
}
bool
-intMember(int foo, List * bar)
+intMember(int foo, List *bar)
{
List *i;
@@ -395,7 +395,7 @@ intMember(int foo, List * bar)
* only does pointer comparisons. Removes 'elem' from the the linked list.
*/
List *
-lremove(void *elem, List * list)
+lremove(void *elem, List *list)
{
List *l;
List *prev = NIL;
@@ -422,7 +422,7 @@ lremove(void *elem, List * list)
}
List *
-LispRemove(void *elem, List * list)
+LispRemove(void *elem, List *list)
{
List *temp = NIL;
List *prev = NIL;
@@ -447,7 +447,7 @@ LispRemove(void *elem, List * list)
#ifdef NOT_USED
List *
-intLispRemove(int elem, List * list)
+intLispRemove(int elem, List *list)
{
List *temp = NIL;
List *prev = NIL;
@@ -473,7 +473,7 @@ intLispRemove(int elem, List * list)
#endif
List *
-set_difference(List * list1, List * list2)
+set_difference(List *list1, List *list2)
{
List *temp1 = NIL;
List *result = NIL;
@@ -490,7 +490,7 @@ set_difference(List * list1, List * list2)
}
List *
-set_differencei(List * list1, List * list2)
+set_differencei(List *list1, List *list2)
{
List *temp1 = NIL;
List *result = NIL;
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 9f343ac6c03907a5c88c6c28e03b5c7772028eed..a7c5364ba1f4c5a1cbb0763ce2facffec50fc6e8 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.5 1997/09/08 02:23:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.6 1997/09/08 21:44:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,16 +23,16 @@
#include "nodes/nodeFuncs.h"
#include "utils/lsyscache.h"
-static bool var_is_inner(Var * var);
+static bool var_is_inner(Var *var);
/*
* single_node -
* Returns t if node corresponds to a single-noded expression
*/
bool
-single_node(Node * node)
+single_node(Node *node)
{
- if (IsA(node, Ident) || IsA(node, Const) || IsA(node, Var) || IsA(node, Param))
+ if (IsA(node, Ident) ||IsA(node, Const) ||IsA(node, Var) ||IsA(node, Param))
return (true);
else
return (false);
@@ -58,22 +58,22 @@ single_node(Node * node)
*
*/
bool
-var_is_outer(Var * var)
+var_is_outer(Var *var)
{
return ((bool) (var->varno == OUTER));
}
static bool
-var_is_inner(Var * var)
+var_is_inner(Var *var)
{
return ((bool) (var->varno == INNER));
}
bool
-var_is_rel(Var * var)
+var_is_rel(Var *var)
{
return (bool)
- ! (var_is_inner(var) || var_is_outer(var));
+ !(var_is_inner(var) || var_is_outer(var));
}
/*****************************************************************************
@@ -90,7 +90,7 @@ var_is_rel(Var * var)
*
*/
Oper *
-replace_opid(Oper * oper)
+replace_opid(Oper *oper)
{
oper->opid = get_opcode(oper->opno);
oper->op_fcache = NULL;
@@ -108,10 +108,10 @@ replace_opid(Oper * oper)
*
*/
bool
-non_null(Expr * c)
+non_null(Expr *c)
{
- if (IsA(c, Const) && !((Const *) c)->constisnull)
+ if (IsA(c, Const) &&!((Const *) c)->constisnull)
return (true);
else
return (false);
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 9b6840ecb6a11b56cc49ba44d7333553ea931b49..4d12af6af89662aa88fe40a3b503c99a6e710819 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.9 1997/09/08 20:55:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.10 1997/09/08 21:44:07 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -53,7 +53,7 @@ static void _outNode(StringInfo str, void *obj);
* converts a List of integers
*/
static void
-_outIntList(StringInfo str, List * list)
+_outIntList(StringInfo str, List *list)
{
List *l;
char buf[500];
@@ -68,7 +68,7 @@ _outIntList(StringInfo str, List * list)
}
static void
-_outQuery(StringInfo str, Query * node)
+_outQuery(StringInfo str, Query *node)
{
char buf[500];
@@ -110,7 +110,7 @@ _outQuery(StringInfo str, Query * node)
* print the basic stuff of all nodes that inherit from Plan
*/
static void
-_outPlanInfo(StringInfo str, Plan * node)
+_outPlanInfo(StringInfo str, Plan *node)
{
char buf[500];
@@ -142,7 +142,7 @@ _outPlanInfo(StringInfo str, Plan * node)
* Stuff from plannodes.h
*/
static void
-_outPlan(StringInfo str, Plan * node)
+_outPlan(StringInfo str, Plan *node)
{
char buf[500];
@@ -153,7 +153,7 @@ _outPlan(StringInfo str, Plan * node)
}
static void
-_outResult(StringInfo str, Result * node)
+_outResult(StringInfo str, Result *node)
{
char buf[500];
@@ -171,7 +171,7 @@ _outResult(StringInfo str, Result * node)
* Existential is a subclass of Plan.
*/
static void
-_outExistential(StringInfo str, Existential * node)
+_outExistential(StringInfo str, Existential *node)
{
char buf[500];
@@ -211,7 +211,7 @@ _outAppend(StringInfo str, Append *node)
* Join is a subclass of Plan
*/
static void
-_outJoin(StringInfo str, Join * node)
+_outJoin(StringInfo str, Join *node)
{
char buf[500];
@@ -225,7 +225,7 @@ _outJoin(StringInfo str, Join * node)
* NestLoop is a subclass of Join
*/
static void
-_outNestLoop(StringInfo str, NestLoop * node)
+_outNestLoop(StringInfo str, NestLoop *node)
{
char buf[500];
@@ -238,7 +238,7 @@ _outNestLoop(StringInfo str, NestLoop * node)
* MergeJoin is a subclass of Join
*/
static void
-_outMergeJoin(StringInfo str, MergeJoin * node)
+_outMergeJoin(StringInfo str, MergeJoin *node)
{
char buf[500];
@@ -264,7 +264,7 @@ _outMergeJoin(StringInfo str, MergeJoin * node)
* HashJoin is a subclass of Join.
*/
static void
-_outHashJoin(StringInfo str, HashJoin * node)
+_outHashJoin(StringInfo str, HashJoin *node)
{
char buf[500];
@@ -292,7 +292,7 @@ _outHashJoin(StringInfo str, HashJoin * node)
* Scan is a subclass of Node
*/
static void
-_outScan(StringInfo str, Scan * node)
+_outScan(StringInfo str, Scan *node)
{
char buf[500];
@@ -309,7 +309,7 @@ _outScan(StringInfo str, Scan * node)
* SeqScan is a subclass of Scan
*/
static void
-_outSeqScan(StringInfo str, SeqScan * node)
+_outSeqScan(StringInfo str, SeqScan *node)
{
char buf[500];
@@ -327,7 +327,7 @@ _outSeqScan(StringInfo str, SeqScan * node)
* IndexScan is a subclass of Scan
*/
static void
-_outIndexScan(StringInfo str, IndexScan * node)
+_outIndexScan(StringInfo str, IndexScan *node)
{
char buf[500];
@@ -352,7 +352,7 @@ _outIndexScan(StringInfo str, IndexScan * node)
* Temp is a subclass of Plan
*/
static void
-_outTemp(StringInfo str, Temp * node)
+_outTemp(StringInfo str, Temp *node)
{
char buf[500];
@@ -371,7 +371,7 @@ _outTemp(StringInfo str, Temp * node)
* Sort is a subclass of Temp
*/
static void
-_outSort(StringInfo str, Sort * node)
+_outSort(StringInfo str, Sort *node)
{
char buf[500];
@@ -401,7 +401,7 @@ _outAgg(StringInfo str, Agg *node)
}
static void
-_outGroup(StringInfo str, Group * node)
+_outGroup(StringInfo str, Group *node)
{
char buf[500];
@@ -422,7 +422,7 @@ _outGroup(StringInfo str, Group * node)
* For some reason, unique is a subclass of Temp.
*/
static void
-_outUnique(StringInfo str, Unique * node)
+_outUnique(StringInfo str, Unique *node)
{
char buf[500];
@@ -442,7 +442,7 @@ _outUnique(StringInfo str, Unique * node)
* Hash is a subclass of Temp
*/
static void
-_outHash(StringInfo str, Hash * node)
+_outHash(StringInfo str, Hash *node)
{
char buf[500];
@@ -463,7 +463,7 @@ _outHash(StringInfo str, Hash * node)
}
static void
-_outTee(StringInfo str, Tee * node)
+_outTee(StringInfo str, Tee *node)
{
char buf[500];
@@ -494,7 +494,7 @@ _outTee(StringInfo str, Tee * node)
* Resdom is a subclass of Node
*/
static void
-_outResdom(StringInfo str, Resdom * node)
+_outResdom(StringInfo str, Resdom *node)
{
char buf[500];
@@ -519,7 +519,7 @@ _outResdom(StringInfo str, Resdom * node)
}
static void
-_outFjoin(StringInfo str, Fjoin * node)
+_outFjoin(StringInfo str, Fjoin *node)
{
char buf[500];
int i;
@@ -550,7 +550,7 @@ _outFjoin(StringInfo str, Fjoin * node)
* Expr is a subclass of Node
*/
static void
-_outExpr(StringInfo str, Expr * node)
+_outExpr(StringInfo str, Expr *node)
{
char buf[500];
char *opstr = NULL;
@@ -592,7 +592,7 @@ _outExpr(StringInfo str, Expr * node)
* Var is a subclass of Expr
*/
static void
-_outVar(StringInfo str, Var * node)
+_outVar(StringInfo str, Var *node)
{
char buf[500];
@@ -614,7 +614,7 @@ _outVar(StringInfo str, Var * node)
* Const is a subclass of Expr
*/
static void
-_outConst(StringInfo str, Const * node)
+_outConst(StringInfo str, Const *node)
{
char buf[500];
@@ -743,7 +743,7 @@ _outArrayRef(StringInfo str, ArrayRef *node)
* Func is a subclass of Expr
*/
static void
-_outFunc(StringInfo str, Func * node)
+_outFunc(StringInfo str, Func *node)
{
char buf[500];
@@ -772,7 +772,7 @@ _outFunc(StringInfo str, Func * node)
* Oper is a subclass of Expr
*/
static void
-_outOper(StringInfo str, Oper * node)
+_outOper(StringInfo str, Oper *node)
{
char buf[500];
@@ -791,7 +791,7 @@ _outOper(StringInfo str, Oper * node)
* Param is a subclass of Expr
*/
static void
-_outParam(StringInfo str, Param * node)
+_outParam(StringInfo str, Param *node)
{
char buf[500];
@@ -818,7 +818,7 @@ _outParam(StringInfo str, Param * node)
* EState is a subclass of Node.
*/
static void
-_outEState(StringInfo str, EState * node)
+_outEState(StringInfo str, EState *node)
{
char buf[500];
@@ -841,7 +841,7 @@ _outEState(StringInfo str, EState * node)
* Stuff from relation.h
*/
static void
-_outRel(StringInfo str, Rel * node)
+_outRel(StringInfo str, Rel *node)
{
char buf[500];
@@ -917,7 +917,7 @@ _outRel(StringInfo str, Rel * node)
* TargetEntry is a subclass of Node.
*/
static void
-_outTargetEntry(StringInfo str, TargetEntry * node)
+_outTargetEntry(StringInfo str, TargetEntry *node)
{
char buf[500];
@@ -940,7 +940,7 @@ _outTargetEntry(StringInfo str, TargetEntry * node)
}
static void
-_outRangeTblEntry(StringInfo str, RangeTblEntry * node)
+_outRangeTblEntry(StringInfo str, RangeTblEntry *node)
{
char buf[500];
@@ -966,7 +966,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry * node)
* Path is a subclass of Node.
*/
static void
-_outPath(StringInfo str, Path * node)
+_outPath(StringInfo str, Path *node)
{
char buf[500];
@@ -989,7 +989,7 @@ _outPath(StringInfo str, Path * node)
* IndexPath is a subclass of Path.
*/
static void
-_outIndexPath(StringInfo str, IndexPath * node)
+_outIndexPath(StringInfo str, IndexPath *node)
{
char buf[500];
@@ -1030,7 +1030,7 @@ _outIndexPath(StringInfo str, IndexPath * node)
* JoinPath is a subclass of Path
*/
static void
-_outJoinPath(StringInfo str, JoinPath * node)
+_outJoinPath(StringInfo str, JoinPath *node)
{
char buf[500];
@@ -1084,7 +1084,7 @@ _outJoinPath(StringInfo str, JoinPath * node)
* MergePath is a subclass of JoinPath.
*/
static void
-_outMergePath(StringInfo str, MergePath * node)
+_outMergePath(StringInfo str, MergePath *node)
{
char buf[500];
@@ -1140,7 +1140,7 @@ _outMergePath(StringInfo str, MergePath * node)
* HashPath is a subclass of JoinPath.
*/
static void
-_outHashPath(StringInfo str, HashPath * node)
+_outHashPath(StringInfo str, HashPath *node)
{
char buf[500];
@@ -1196,7 +1196,7 @@ _outHashPath(StringInfo str, HashPath * node)
* OrderKey is a subclass of Node.
*/
static void
-_outOrderKey(StringInfo str, OrderKey * node)
+_outOrderKey(StringInfo str, OrderKey *node)
{
char buf[500];
@@ -1213,7 +1213,7 @@ _outOrderKey(StringInfo str, OrderKey * node)
* JoinKey is a subclass of Node.
*/
static void
-_outJoinKey(StringInfo str, JoinKey * node)
+_outJoinKey(StringInfo str, JoinKey *node)
{
char buf[500];
@@ -1234,7 +1234,7 @@ _outJoinKey(StringInfo str, JoinKey * node)
* MergeOrder is a subclass of Node.
*/
static void
-_outMergeOrder(StringInfo str, MergeOrder * node)
+_outMergeOrder(StringInfo str, MergeOrder *node)
{
char buf[500];
@@ -1258,7 +1258,7 @@ _outMergeOrder(StringInfo str, MergeOrder * node)
* CInfo is a subclass of Node.
*/
static void
-_outCInfo(StringInfo str, CInfo * node)
+_outCInfo(StringInfo str, CInfo *node)
{
char buf[500];
@@ -1291,7 +1291,7 @@ _outCInfo(StringInfo str, CInfo * node)
* JoinMethod is a subclass of Node.
*/
static void
-_outJoinMethod(StringInfo str, JoinMethod * node)
+_outJoinMethod(StringInfo str, JoinMethod *node)
{
char buf[500];
@@ -1313,7 +1313,7 @@ _outJoinMethod(StringInfo str, JoinMethod * node)
* HInfo is a subclass of JoinMethod.
*/
static void
-_outHInfo(StringInfo str, HInfo * node)
+_outHInfo(StringInfo str, HInfo *node)
{
char buf[500];
@@ -1339,7 +1339,7 @@ _outHInfo(StringInfo str, HInfo * node)
* JInfo is a subclass of Node.
*/
static void
-_outJInfo(StringInfo str, JInfo * node)
+_outJInfo(StringInfo str, JInfo *node)
{
char buf[500];
@@ -1431,7 +1431,7 @@ _outDatum(StringInfo str, Datum value, Oid type)
}
static void
-_outIter(StringInfo str, Iter * node)
+_outIter(StringInfo str, Iter *node)
{
appendStringInfo(str, "ITER");
@@ -1440,7 +1440,7 @@ _outIter(StringInfo str, Iter * node)
}
static void
-_outStream(StringInfo str, Stream * node)
+_outStream(StringInfo str, Stream *node)
{
char buf[500];
@@ -1472,7 +1472,7 @@ _outStream(StringInfo str, Stream * node)
}
static void
-_outValue(StringInfo str, Value * value)
+_outValue(StringInfo str, Value *value)
{
char buf[500];
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index dfe9d5634530c50db85c55e1baf85e1c3a8b5f0b..634870ab8ac2fa3547ce4dfa376ab6b213128082 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.8 1997/09/08 02:23:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.9 1997/09/08 21:44:10 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -33,7 +33,7 @@
#include "nodes/plannodes.h"
#include "optimizer/clauses.h"
-static char *plannode_type(Plan * p);
+static char *plannode_type(Plan *p);
/*
* print--
@@ -135,7 +135,7 @@ pprint(void *obj)
* print contents of range table
*/
void
-print_rt(List * rtable)
+print_rt(List *rtable)
{
List *l;
int i = 1;
@@ -160,7 +160,7 @@ print_rt(List * rtable)
* print an expression
*/
void
-print_expr(Node * expr, List * rtable)
+print_expr(Node *expr, List *rtable)
{
if (expr == NULL)
{
@@ -230,7 +230,7 @@ print_expr(Node * expr, List * rtable)
* temporary here. where is keys list of list??
*/
void
-print_keys(List * keys, List * rtable)
+print_keys(List *keys, List *rtable)
{
List *k;
@@ -251,7 +251,7 @@ print_keys(List * keys, List * rtable)
* print targetlist in a more legible way.
*/
void
-print_tl(List * tlist, List * rtable)
+print_tl(List *tlist, List *rtable)
{
List *tl;
@@ -280,7 +280,7 @@ print_tl(List * tlist, List * rtable)
* print out the tuple with the given TupleTableSlot
*/
void
-print_slot(TupleTableSlot * slot)
+print_slot(TupleTableSlot *slot)
{
if (!slot->val)
{
@@ -297,7 +297,7 @@ print_slot(TupleTableSlot * slot)
}
static char *
-plannode_type(Plan * p)
+plannode_type(Plan *p)
{
switch (nodeTag(p))
{
@@ -375,7 +375,7 @@ plannode_type(Plan * p)
*/
void
-print_plan_recursive(Plan * p, Query * parsetree, int indentLevel, char *label)
+print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label)
{
int i;
char extraInfo[100];
@@ -386,7 +386,7 @@ print_plan_recursive(Plan * p, Query * parsetree, int indentLevel, char *label)
printf(" ");
printf("%s%s :c=%.4f :s=%d :w=%d ", label, plannode_type(p),
p->cost, p->plan_size, p->plan_width);
- if (IsA(p, Scan) || IsA(p, SeqScan))
+ if (IsA(p, Scan) ||IsA(p, SeqScan))
{
RangeTblEntry *rte;
@@ -414,7 +414,7 @@ print_plan_recursive(Plan * p, Query * parsetree, int indentLevel, char *label)
prints just the plan node types */
void
-print_plan(Plan * p, Query * parsetree)
+print_plan(Plan *p, Query *parsetree)
{
print_plan_recursive(p, parsetree, 0, "");
}
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index eca6c480a22e2e1ff7b698182b70e14621bc483f..6caa2cc9a709598d2ddc2e13480cb44d947476b3 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.8 1997/09/08 02:23:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.9 1997/09/08 21:44:11 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -54,7 +54,7 @@
static Datum readDatum(Oid type);
static List *
-toIntList(List * list)
+toIntList(List *list)
{
List *l;
@@ -128,7 +128,7 @@ _readQuery()
* ----------------
*/
static void
-_getPlan(Plan * node)
+_getPlan(Plan *node)
{
char *token;
int length;
@@ -155,7 +155,7 @@ _getPlan(Plan * node)
else
{ /* Disgusting hack until I figure out what
* to do here */
- node->state = (EState *) ! NULL;
+ node->state = (EState *) !NULL;
}
token = lsptok(NULL, &length); /* eat :qptargetlist */
@@ -273,7 +273,7 @@ _readAppend()
* ----------------
*/
static void
-_getJoin(Join * node)
+_getJoin(Join *node)
{
_getPlan((Plan *) node);
}
@@ -396,7 +396,7 @@ _readHashJoin()
* ----------------
*/
static void
-_getScan(Scan * node)
+_getScan(Scan *node)
{
char *token;
int length;
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 3a61f5d315e6783205039821986913b50a2b1eed..5453b012a44c0028a8f66582ce8df2c7eb0b53ff 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_copy.c,v 1.3 1997/09/08 02:23:47 momjian Exp $
+ * $Id: geqo_copy.c,v 1.4 1997/09/08 21:44:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@
*
*/
void
-geqo_copy(Chromosome * chromo1, Chromosome * chromo2, int string_length)
+geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length)
{
int i;
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 37f49584caf8a5684e8fe57e84f9231d267d3717..4ade5143004def005e8816711ab8e1afc26099fc 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -6,7 +6,7 @@
* CX operator according to Oliver et al
* (Proc 2nd Int'l Conf on GA's)
*
-* $Id: geqo_cx.c,v 1.3 1997/09/08 02:23:49 momjian Exp $
+* $Id: geqo_cx.c,v 1.4 1997/09/08 21:44:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,7 @@
* cycle crossover
*/
int
-cx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table)
+cx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
{
int i,
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 05381cf4da07b40e88776e8d1038f6e70bf8f847..8dbc935c8724c188a6d989c6711adfc48c5fb9d4 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -3,7 +3,7 @@
* geqo_erx.c--
* edge recombination crossover [ER]
*
-* $Id: geqo_erx.c,v 1.4 1997/09/08 02:23:52 momjian Exp $
+* $Id: geqo_erx.c,v 1.5 1997/09/08 21:44:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,11 +52,11 @@
#include "optimizer/geqo_random.h"
-static int gimme_edge(Gene gene1, Gene gene2, Edge * edge_table);
-static void remove_gene(Gene gene, Edge edge, Edge * edge_table);
-static Gene gimme_gene(Edge edge, Edge * edge_table);
+static int gimme_edge(Gene gene1, Gene gene2, Edge *edge_table);
+static void remove_gene(Gene gene, Edge edge, Edge *edge_table);
+static Gene gimme_gene(Edge edge, Edge *edge_table);
-static Gene edge_failure(Gene * gene, int index, Edge * edge_table, int num_gene);
+static Gene edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene);
/* alloc_edge_table--
@@ -86,7 +86,7 @@ alloc_edge_table(int num_gene)
*
*/
void
-free_edge_table(Edge * edge_table)
+free_edge_table(Edge *edge_table)
{
pfree(edge_table);
}
@@ -105,7 +105,7 @@ free_edge_table(Edge * edge_table)
*
*/
float
-gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table)
+gimme_edge_table(Gene *tour1, Gene *tour2, int num_gene, Edge *edge_table)
{
int i,
index1,
@@ -165,7 +165,7 @@ gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table)
* 0 if edge was already registered and edge_table is unchanged
*/
static int
-gimme_edge(Gene gene1, Gene gene2, Edge * edge_table)
+gimme_edge(Gene gene1, Gene gene2, Edge *edge_table)
{
int i;
int edges;
@@ -207,7 +207,7 @@ gimme_edge(Gene gene1, Gene gene2, Edge * edge_table)
*
*/
int
-gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene)
+gimme_tour(Edge *edge_table, Gene *new_gene, int num_gene)
{
int i;
int edge_failures = 0;
@@ -256,7 +256,7 @@ gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene)
*
*/
static void
-remove_gene(Gene gene, Edge edge, Edge * edge_table)
+remove_gene(Gene gene, Edge edge, Edge *edge_table)
{
int i,
j;
@@ -298,7 +298,7 @@ remove_gene(Gene gene, Edge edge, Edge * edge_table)
*
*/
static Gene
-gimme_gene(Edge edge, Edge * edge_table)
+gimme_gene(Edge edge, Edge *edge_table)
{
int i;
Gene friend;
@@ -389,7 +389,7 @@ gimme_gene(Edge edge, Edge * edge_table)
*
*/
static Gene
-edge_failure(Gene * gene, int index, Edge * edge_table, int num_gene)
+edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
{
int i;
Gene fail_gene = gene[index];
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 731b1c4fcd0d075b97dd940a11d1cda3677f1835..7e721a34e89250a92762336ae5f909e6ba221dd3 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_eval.c,v 1.14 1997/09/08 02:23:53 momjian Exp $
+ * $Id: geqo_eval.c,v 1.15 1997/09/08 21:44:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,13 +50,13 @@
#include "optimizer/geqo_paths.h"
-static List *gimme_clause_joins(Query * root, Rel * outer_rel, Rel * inner_rel);
-static Rel *gimme_clauseless_join(Rel * outer_rel, Rel * inner_rel);
-static Rel *init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo);
-static List *new_join_tlist(List * tlist, List * other_relids, int first_resdomno);
-static List *new_joininfo_list(List * joininfo_list, List * join_relids);
-static void geqo_joinrel_size(Rel * joinrel, Rel * outer_rel, Rel * inner_rel);
-static Rel *geqo_nth(int stop, List * rels);
+static List *gimme_clause_joins(Query *root, Rel *outer_rel, Rel *inner_rel);
+static Rel *gimme_clauseless_join(Rel *outer_rel, Rel *inner_rel);
+static Rel *init_join_rel(Rel *outer_rel, Rel *inner_rel, JInfo *joininfo);
+static List *new_join_tlist(List *tlist, List *other_relids, int first_resdomno);
+static List *new_joininfo_list(List *joininfo_list, List *join_relids);
+static void geqo_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel);
+static Rel *geqo_nth(int stop, List *rels);
/*
* geqo_eval--
@@ -64,7 +64,7 @@ static Rel *geqo_nth(int stop, List * rels);
* Returns cost of a query tree as an individual of the population.
*/
Cost
-geqo_eval(Query * root, Gene * tour, int num_gene)
+geqo_eval(Query *root, Gene *tour, int num_gene)
{
Rel *joinrel;
Cost fitness;
@@ -99,7 +99,7 @@ geqo_eval(Query * root, Gene * tour, int num_gene)
* Returns a new join relation incorporating all joins in a left-sided tree.
*/
Rel *
-gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_rel)
+gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel)
{
Rel *inner_rel; /* current relation */
int base_rel_index;
@@ -191,7 +191,7 @@ gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_r
*/
static List *
-gimme_clause_joins(Query * root, Rel * outer_rel, Rel * inner_rel)
+gimme_clause_joins(Query *root, Rel *outer_rel, Rel *inner_rel)
{
List *join_list = NIL;
List *i = NIL;
@@ -244,7 +244,7 @@ gimme_clause_joins(Query * root, Rel * outer_rel, Rel * inner_rel)
*/
static Rel *
-gimme_clauseless_join(Rel * outer_rel, Rel * inner_rel)
+gimme_clauseless_join(Rel *outer_rel, Rel *inner_rel)
{
return (init_join_rel(outer_rel, inner_rel, (JInfo *) NULL));
}
@@ -261,7 +261,7 @@ gimme_clauseless_join(Rel * outer_rel, Rel * inner_rel)
* Returns the new join relation node.
*/
static Rel *
-init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo)
+init_join_rel(Rel *outer_rel, Rel *inner_rel, JInfo *joininfo)
{
Rel *joinrel = makeNode(Rel);
List *joinrel_joininfo_list = NIL;
@@ -339,8 +339,8 @@ init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo)
* Returns the new target list.
*/
static List *
-new_join_tlist(List * tlist,
- List * other_relids,
+new_join_tlist(List *tlist,
+ List *other_relids,
int first_resdomno)
{
int resdomno = first_resdomno - 1;
@@ -389,7 +389,7 @@ new_join_tlist(List * tlist,
* Returns a list of joininfo nodes, new and old.
*/
static List *
-new_joininfo_list(List * joininfo_list, List * join_relids)
+new_joininfo_list(List *joininfo_list, List *join_relids)
{
List *current_joininfo_list = NIL;
List *new_otherrels = NIL;
@@ -454,7 +454,7 @@ new_joininfo_list(List * joininfo_list, List * join_relids)
* Modifies the joininfo field of appropriate rel nodes.
*/
static void
-geqo_add_new_joininfos(Query * root, List * joinrels, List * outerrels)
+geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
{
List *xjoinrel = NIL;
List *xrelid = NIL;
@@ -603,7 +603,7 @@ geqo_add_new_joininfos(Query * root, List * joinrels, List * outerrels)
* Returns the list of final join relations.
*/
static List *
-geqo_final_join_rels(List * join_rel_list)
+geqo_final_join_rels(List *join_rel_list)
{
List *xrel = NIL;
List *temp = NIL;
@@ -649,7 +649,7 @@ geqo_final_join_rels(List * join_rel_list)
* Modifies the superrels field of rel
*/
static void
-add_superrels(Rel * rel, Rel * super_rel)
+add_superrels(Rel *rel, Rel *super_rel)
{
rel->superrels = lappend(rel->superrels, super_rel);
}
@@ -664,13 +664,13 @@ add_superrels(Rel * rel, Rel * super_rel)
* Returns non-nil if rel1 and rel2 do not overlap.
*/
static bool
-nonoverlap_rels(Rel * rel1, Rel * rel2)
+nonoverlap_rels(Rel *rel1, Rel *rel2)
{
return (nonoverlap_sets(rel1->relids, rel2->relids));
}
static bool
-nonoverlap_sets(List * s1, List * s2)
+nonoverlap_sets(List *s1, List *s2)
{
List *x = NIL;
@@ -692,7 +692,7 @@ nonoverlap_sets(List * s1, List * s2)
* long join queries; so get logarithm of size when MAXINT overflow;
*/
static void
-geqo_joinrel_size(Rel * joinrel, Rel * outer_rel, Rel * inner_rel)
+geqo_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel)
{
Cost temp;
int ntuples;
@@ -726,7 +726,7 @@ geqo_log(double x, double b)
}
static Rel *
-geqo_nth(int stop, List * rels)
+geqo_nth(int stop, List *rels)
{
List *r;
int i = 1;
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index cfaa3237705ffb954cee5c69fb37747db93a7bdd..027beb934fc45ecf3f6c9b3cfb652dfd40a65f11 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_main.c,v 1.5 1997/09/08 02:23:55 momjian Exp $
+ * $Id: geqo_main.c,v 1.6 1997/09/08 21:44:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@
*/
Rel *
-geqo(Query * root)
+geqo(Query *root)
{
int generation;
Chromosome *momma;
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 5e72f46ac34a72484e43b007cf6be0a46ad8b7dc..e26a8ec5e4083fc9f8bc835bfb21e6dab171e719 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.c,v 1.4 1997/09/08 02:23:57 momjian Exp $
+ * $Id: geqo_misc.c,v 1.5 1997/09/08 21:44:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,13 +41,13 @@
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_misc.h"
-static float avg_pool(Pool * pool);
+static float avg_pool(Pool *pool);
/* avg_pool--
*
*/
static float
-avg_pool(Pool * pool)
+avg_pool(Pool *pool)
{
int i;
double cumulative = 0.0;
@@ -64,7 +64,7 @@ avg_pool(Pool * pool)
/* print_pool--
*/
void
-print_pool(FILE * fp, Pool * pool, int start, int stop)
+print_pool(FILE *fp, Pool *pool, int start, int stop)
{
int i,
j;
@@ -97,7 +97,7 @@ print_pool(FILE * fp, Pool * pool, int start, int stop)
*
*/
void
-print_gen(FILE * fp, Pool * pool, int generation)
+print_gen(FILE *fp, Pool *pool, int generation)
{
int lowest;
@@ -116,7 +116,7 @@ print_gen(FILE * fp, Pool * pool, int generation)
void
-print_edge_table(FILE * fp, Edge * edge_table, int num_gene)
+print_edge_table(FILE *fp, Edge *edge_table, int num_gene)
{
int i,
j;
@@ -139,10 +139,10 @@ print_edge_table(FILE * fp, Edge * edge_table, int num_gene)
*************************************************************/
void
-geqo_print_joinclauses(Query * root, List * clauses)
+geqo_print_joinclauses(Query *root, List *clauses)
{
List *l;
- extern void print_expr(Node * expr, List * rtable); /* in print.c */
+ extern void print_expr(Node *expr, List *rtable); /* in print.c */
foreach(l, clauses)
{
@@ -155,7 +155,7 @@ geqo_print_joinclauses(Query * root, List * clauses)
}
void
-geqo_print_path(Query * root, Path * path, int indent)
+geqo_print_path(Query *root, Path *path, int indent)
{
char *ptype = NULL;
JoinPath *jp;
@@ -262,7 +262,7 @@ geqo_print_path(Query * root, Path * path, int indent)
}
void
-geqo_print_rel(Query * root, Rel * rel)
+geqo_print_rel(Query *root, Rel *rel)
{
List *l;
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index a6078c731a968155081036262a1782e00b210357..c56075d50c49588f291bbbe786a3c2e1da7899c9 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -4,7 +4,7 @@
*
* TSP mutation routines
*
-* $Id: geqo_mutation.c,v 1.3 1997/09/08 02:23:57 momjian Exp $
+* $Id: geqo_mutation.c,v 1.4 1997/09/08 21:44:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@
#include "optimizer/geqo_mutation.h"
void
-geqo_mutation(Gene * tour, int num_gene)
+geqo_mutation(Gene *tour, int num_gene)
{
int swap1;
int swap2;
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index bb3d04501088c9b1168a628e26a75a3ec6581894..40b2f536887ba49486ebb064e4c267f5298129ba 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -6,7 +6,7 @@
* OX1 operator according to Davis
* (Proc Int'l Joint Conf on AI)
*
-* $Id: geqo_ox1.c,v 1.3 1997/09/08 02:23:58 momjian Exp $
+* $Id: geqo_ox1.c,v 1.4 1997/09/08 21:44:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@
* position crossover
*/
void
-ox1(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table)
+ox1(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
{
int left,
right,
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index 2490fb3051d9694535592c4cd0816c0b0df9d840..69693a1d45963ad77e0907d3285461f330e6333a 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -6,7 +6,7 @@
* OX2 operator according to Syswerda
* (The Genetic Algorithms Handbook, ed L Davis)
*
-* $Id: geqo_ox2.c,v 1.3 1997/09/08 02:23:59 momjian Exp $
+* $Id: geqo_ox2.c,v 1.4 1997/09/08 21:44:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@
* position crossover
*/
void
-ox2(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table)
+ox2(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
{
int k,
j,
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 9ef969a22897fa58c9a7e02a266e1f60a230ccae..0deed36e16fb7579ac1b6508a1520fed041dcccb 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
-* $Id: geqo_params.c,v 1.7 1997/09/08 02:24:00 momjian Exp $
+* $Id: geqo_params.c,v 1.8 1997/09/08 21:44:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -270,7 +270,7 @@ geqo_params(int string_length)
* other cases return 0.
*/
static int
-next_token(FILE * fp, char *buf, int bufsz)
+next_token(FILE *fp, char *buf, int bufsz)
{
int c;
char *eb = buf + (bufsz - 1);
diff --git a/src/backend/optimizer/geqo/geqo_paths.c b/src/backend/optimizer/geqo/geqo_paths.c
index 931b38985bfc259540ee021f7dcd21ab57ea91da..16e67c8bfc9c409e6bf89f9ba0df8333b542628a 100644
--- a/src/backend/optimizer/geqo/geqo_paths.c
+++ b/src/backend/optimizer/geqo/geqo_paths.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_paths.c,v 1.6 1997/09/08 02:24:05 momjian Exp $
+ * $Id: geqo_paths.c,v 1.7 1997/09/08 21:44:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,8 +28,8 @@
#include "optimizer/geqo_paths.h"
-static List *geqo_prune_rel(Rel * rel, List * other_rels);
-static Path *set_paths(Rel * rel, Path * unorderedpath);
+static List *geqo_prune_rel(Rel *rel, List *other_rels);
+static Path *set_paths(Rel *rel, Path *unorderedpath);
/*
* geqo-prune-rels--
@@ -40,7 +40,7 @@ static Path *set_paths(Rel * rel, Path * unorderedpath);
*
*/
List *
-geqo_prune_rels(List * rel_list)
+geqo_prune_rels(List *rel_list)
{
List *temp_list = NIL;
@@ -65,7 +65,7 @@ geqo_prune_rels(List * rel_list)
*
*/
static List *
-geqo_prune_rel(Rel * rel, List * other_rels)
+geqo_prune_rel(Rel *rel, List *other_rels)
{
List *i = NIL;
List *t_list = NIL;
@@ -102,7 +102,7 @@ geqo_prune_rel(Rel * rel, List * other_rels)
*
*/
void
-geqo_rel_paths(Rel * rel)
+geqo_rel_paths(Rel *rel)
{
List *y = NIL;
Path *path = (Path *) NULL;
@@ -134,7 +134,7 @@ geqo_rel_paths(Rel * rel)
*
*/
static Path *
-set_paths(Rel * rel, Path * unorderedpath)
+set_paths(Rel *rel, Path *unorderedpath)
{
Path *cheapest = set_cheapest(rel, rel->pathlist);
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index af4234a56e266aa6212206530475aa1063ac13d9..428fa28a4db3b9ad7068450de9dd32b2d9069128 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -6,7 +6,7 @@
* PMX operator according to Goldberg & Lingle
* (Proc Int'l Conf on GA's)
*
-* $Id: geqo_pmx.c,v 1.3 1997/09/08 02:24:06 momjian Exp $
+* $Id: geqo_pmx.c,v 1.4 1997/09/08 21:44:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@
* partially matched crossover
*/
void
-pmx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene)
+pmx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
{
int *failed = (int *) palloc((num_gene + 1) * sizeof(int));
int *from = (int *) palloc((num_gene + 1) * sizeof(int));
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 5e8a32d42dc4b5a6fa77ac327b201e7e9fbeba46..f6f3d6372c36e12e22f02f4cf979a1740ea517fd 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_pool.c,v 1.3 1997/09/08 02:24:06 momjian Exp $
+ * $Id: geqo_pool.c,v 1.4 1997/09/08 21:44:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@ alloc_pool(int pool_size, int string_length)
* deallocates memory for GA pool
*/
void
-free_pool(Pool * pool)
+free_pool(Pool *pool)
{
Chromosome *chromo;
int i;
@@ -102,7 +102,7 @@ free_pool(Pool * pool)
* initialize genetic pool
*/
void
-random_init_pool(Query * root, Pool * pool, int strt, int stp)
+random_init_pool(Query *root, Pool *pool, int strt, int stp)
{
Chromosome *chromo = (Chromosome *) pool->data;
int i;
@@ -125,7 +125,7 @@ random_init_pool(Query * root, Pool * pool, int strt, int stp)
* maybe you have to change compare() for different ordering ...
*/
void
-sort_pool(Pool * pool)
+sort_pool(Pool *pool)
{
pg_qsort(pool->data, pool->size, sizeof(Chromosome), compare);
@@ -170,7 +170,7 @@ alloc_chromo(int string_length)
* deallocates a chromosome and string space
*/
void
-free_chromo(Chromosome * chromo)
+free_chromo(Chromosome *chromo)
{
pfree(chromo->string);
pfree(chromo);
@@ -181,7 +181,7 @@ free_chromo(Chromosome * chromo)
* assumes best->worst = smallest->largest
*/
void
-spread_chromo(Chromosome * chromo, Pool * pool)
+spread_chromo(Chromosome *chromo, Pool *pool)
{
int top,
mid,
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 4cd1ad3aec4c2b7da16f0d96867d804c67df30cd..6751d566b32f0ae5235a611ab14665c8e0307ac6 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -6,7 +6,7 @@
* PX operator according to Syswerda
* (The Genetic Algorithms Handbook, L Davis, ed)
*
-* $Id: geqo_px.c,v 1.3 1997/09/08 02:24:07 momjian Exp $
+* $Id: geqo_px.c,v 1.4 1997/09/08 21:44:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@
* position crossover
*/
void
-px(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table)
+px(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
{
int num_positions;
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index 400afc50d4fb44b8859a63b61e4aca02fb3f1bc8..14bf7131407ea7fb8d3b97610ac3b6038f3e090c 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -3,7 +3,7 @@
* geqo_recombination.c--
* misc recombination procedures
*
-* $Id: geqo_recombination.c,v 1.3 1997/09/08 02:24:08 momjian Exp $
+* $Id: geqo_recombination.c,v 1.4 1997/09/08 21:44:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@
*
*/
void
-init_tour(Gene * tour, int num_gene)
+init_tour(Gene *tour, int num_gene)
{
Gene *tmp;
int remainder;
@@ -105,7 +105,7 @@ alloc_city_table(int num_gene)
*
*/
void
-free_city_table(City * city_table)
+free_city_table(City *city_table)
{
pfree(city_table);
}
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index ed0727cbfb067a10e43f8da14ed35be5860eb903..f41630d40a4382e5cc59f9e875cd66d140b0c1e9 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_selection.c,v 1.3 1997/09/08 02:24:08 momjian Exp $
+ * $Id: geqo_selection.c,v 1.4 1997/09/08 21:44:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,7 @@ static int linear(int max, double bias);
* second genes are selected from the pool
*/
void
-geqo_selection(Chromosome * momma, Chromosome * daddy, Pool * pool, double bias)
+geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias)
{
int first,
second;
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index 716e1943950a3b244279defc7889cade612b270d..bb5863fec705dbcc47d8020d329335a35d93178c 100644
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
-* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.3 1997/09/08 02:24:09 momjian Exp $
+* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.4 1997/09/08 21:44:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,7 +41,7 @@
*/
void
-minspantree(Query * root, List * join_rels, Rel * garel)
+minspantree(Query *root, List *join_rels, Rel *garel)
{
int number_of_rels = length(root->base_relation_list_);
int number_of_joins = length(join_rels);
@@ -113,9 +113,9 @@ minspantree(Query * root, List * join_rels, Rel * garel)
else if (number_of_joins == 3)
{
- Rel *rel12 = (Rel *) & tmprel_array[1][2];
- Rel *rel13 = (Rel *) & tmprel_array[1][3];
- Rel *rel23 = (Rel *) & tmprel_array[2][3];
+ Rel *rel12 = (Rel *) &tmprel_array[1][2];
+ Rel *rel13 = (Rel *) &tmprel_array[1][3];
+ Rel *rel23 = (Rel *) &tmprel_array[2][3];
if (rel12->cheapestpath->path_cost > rel13->cheapestpath->path_cost)
{
@@ -170,11 +170,11 @@ minspantree(Query * root, List * join_rels, Rel * garel)
{
if (n > tempn)
{
- joinrel = (Rel *) & tmprel_array[tempn][n];
+ joinrel = (Rel *) &tmprel_array[tempn][n];
}
else
{
- joinrel = (Rel *) & tmprel_array[n][tempn];
+ joinrel = (Rel *) &tmprel_array[n][tempn];
}
dist = joinrel->cheapestpath->path_cost;
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index ca4485fbd1fd968710cc0eae35b7094872e93364..b58e386535f31cd53352ee7cc7549cc6d8b8d939 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.12 1997/09/08 02:24:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.13 1997/09/08 21:44:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,8 +43,8 @@ bool _use_geqo_ = false;
int32 _use_geqo_rels_ = GEQO_RELS;
-static void find_rel_paths(Query * root, List * rels);
-static List *find_join_paths(Query * root, List * outer_rels, int levels_left);
+static void find_rel_paths(Query *root, List *rels);
+static List *find_join_paths(Query *root, List *outer_rels, int levels_left);
/*
* find-paths--
@@ -54,7 +54,7 @@ static List *find_join_paths(Query * root, List * outer_rels, int levels_left);
* 'rels' is the list of single relation entries appearing in the query
*/
List *
-find_paths(Query * root, List * rels)
+find_paths(Query *root, List *rels)
{
int levels_left;
@@ -102,7 +102,7 @@ find_paths(Query * root, List * rels)
* MODIFIES: rels
*/
static void
-find_rel_paths(Query * root, List * rels)
+find_rel_paths(Query *root, List *rels)
{
List *temp;
Rel *rel;
@@ -172,7 +172,7 @@ find_rel_paths(Query * root, List * rels)
* the result of joining all the original relations togehter.
*/
static List *
-find_join_paths(Query * root, List * outer_rels, int levels_left)
+find_join_paths(Query *root, List *outer_rels, int levels_left)
{
List *x;
List *new_rels;
@@ -281,10 +281,10 @@ find_join_paths(Query * root, List * outer_rels, int levels_left)
#ifdef OPTIMIZER_DEBUG
static void
-print_joinclauses(Query * root, List * clauses)
+print_joinclauses(Query *root, List *clauses)
{
List *l;
- extern void print_expr(Node * expr, List * rtable); /* in print.c */
+ extern void print_expr(Node *expr, List *rtable); /* in print.c */
foreach(l, clauses)
{
@@ -297,7 +297,7 @@ print_joinclauses(Query * root, List * clauses)
}
static void
-print_path(Query * root, Path * path, int indent)
+print_path(Query *root, Path *path, int indent)
{
char *ptype = NULL;
JoinPath *jp;
@@ -404,7 +404,7 @@ print_path(Query * root, Path * path, int indent)
}
static void
-debug_print_rel(Query * root, Rel * rel)
+debug_print_rel(Query *root, Rel *rel)
{
List *l;
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 7ae190f7fd71a167ae87821bc43996327c4d911a..78b54eebbb7eaa695197b9ec0730916549bfa5db 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.3 1997/09/08 02:24:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.4 1997/09/08 21:44:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@
#include "utils/elog.h"
#include "utils/lsyscache.h"
-static Cost compute_selec(Query * root, List * clauses, List * or_selectivities);
+static Cost compute_selec(Query *root, List *clauses, List *or_selectivities);
/****************************************************************************
* ROUTINES TO SET CLAUSE SELECTIVITIES
@@ -47,7 +47,7 @@ static Cost compute_selec(Query * root, List * clauses, List * or_selectivities)
*
*/
void
-set_clause_selectivities(List * clauseinfo_list, Cost new_selectivity)
+set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity)
{
List *temp;
CInfo *clausenode;
@@ -71,7 +71,7 @@ set_clause_selectivities(List * clauseinfo_list, Cost new_selectivity)
* Returns a flonum corresponding to the selectivity of 'clauseinfo-list'.
*/
Cost
-product_selec(List * clauseinfo_list)
+product_selec(List *clauseinfo_list)
{
Cost result = 1.0;
@@ -99,7 +99,7 @@ product_selec(List * clauseinfo_list)
* slots.
*/
void
-set_rest_relselec(Query * root, List * rel_list)
+set_rest_relselec(Query *root, List *rel_list)
{
Rel *rel;
List *x;
@@ -120,7 +120,7 @@ set_rest_relselec(Query * root, List * rel_list)
*
*/
void
-set_rest_selec(Query * root, List * clauseinfo_list)
+set_rest_selec(Query *root, List *clauseinfo_list)
{
List *temp = NIL;
CInfo *clausenode = (CInfo *) NULL;
@@ -163,7 +163,7 @@ set_rest_selec(Query * root, List * clauseinfo_list)
*
*/
Cost
-compute_clause_selec(Query * root, Node * clause, List * or_selectivities)
+compute_clause_selec(Query *root, Node *clause, List *or_selectivities)
{
if (!is_opclause(clause))
{
@@ -223,7 +223,7 @@ compute_clause_selec(Query * root, Node * clause, List * or_selectivities)
*
*/
static Cost
-compute_selec(Query * root, List * clauses, List * or_selectivities)
+compute_selec(Query *root, List *clauses, List *or_selectivities)
{
Cost s1 = 0;
List *clause = lfirst(clauses);
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 6badd4780ef23b0630a333defe1b4bdc6b7c2234..adaca39a902f5a57a18f20a34e6e6513509941ff 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.18 1997/09/08 02:24:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.19 1997/09/08 21:44:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,9 +39,9 @@
extern int NBuffers;
-static int compute_attribute_width(TargetEntry * tlistentry);
+static int compute_attribute_width(TargetEntry *tlistentry);
static double base_log(double x, double b);
-static int compute_targetlist_width(List * targetlist);
+static int compute_targetlist_width(List *targetlist);
int _disable_cost_ = 30000000;
@@ -177,7 +177,7 @@ cost_index(Oid indexid,
*
*/
Cost
-cost_sort(List * keys, int tuples, int width, bool noread)
+cost_sort(List *keys, int tuples, int width, bool noread)
{
Cost temp = 0;
int npages = page_size(tuples, width);
@@ -278,8 +278,8 @@ cost_nestloop(Cost outercost,
Cost
cost_mergesort(Cost outercost,
Cost innercost,
- List * outersortkeys,
- List * innersortkeys,
+ List *outersortkeys,
+ List *innersortkeys,
int outersize,
int innersize,
int outerwidth,
@@ -316,8 +316,8 @@ cost_mergesort(Cost outercost,
Cost
cost_hashjoin(Cost outercost,
Cost innercost,
- List * outerkeys,
- List * innerkeys,
+ List *outerkeys,
+ List *innerkeys,
int outersize,
int innersize,
int outerwidth,
@@ -363,7 +363,7 @@ cost_hashjoin(Cost outercost,
* Returns the size.
*/
int
-compute_rel_size(Rel * rel)
+compute_rel_size(Rel *rel)
{
Cost temp;
int temp1;
@@ -390,7 +390,7 @@ compute_rel_size(Rel * rel)
* Returns the width of the tuple as a fixnum.
*/
int
-compute_rel_width(Rel * rel)
+compute_rel_width(Rel *rel)
{
return (compute_targetlist_width(get_actual_tlist(rel->targetlist)));
}
@@ -402,7 +402,7 @@ compute_rel_width(Rel * rel)
* Returns the width of the tuple as a fixnum.
*/
static int
-compute_targetlist_width(List * targetlist)
+compute_targetlist_width(List *targetlist)
{
List *temp_tl;
int tuple_width = 0;
@@ -425,7 +425,7 @@ compute_targetlist_width(List * targetlist)
* Returns the width of the attribute as a fixnum.
*/
static int
-compute_attribute_width(TargetEntry * tlistentry)
+compute_attribute_width(TargetEntry *tlistentry)
{
int width = get_typlen(tlistentry->resdom->restype);
@@ -442,7 +442,7 @@ compute_attribute_width(TargetEntry * tlistentry)
* Returns a fixnum.
*/
int
-compute_joinrel_size(JoinPath * joinpath)
+compute_joinrel_size(JoinPath *joinpath)
{
Cost temp = 1.0;
int temp1 = 0;
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index ea6089355a03aed9e7e0c0b78e50828b98c1870d..ffc332e8b26fc183bd92f015d6c6ddf6d4bc33c9 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.3 1997/09/08 02:24:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.4 1997/09/08 21:44:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,7 @@
#include "optimizer/clauses.h"
-static HInfo *match_hashop_hashinfo(Oid hashop, List * hashinfo_list);
+static HInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
/*
* group-clauses-by-hashop--
@@ -35,7 +35,7 @@ static HInfo *match_hashop_hashinfo(Oid hashop, List * hashinfo_list);
*
*/
List *
-group_clauses_by_hashop(List * clauseinfo_list,
+group_clauses_by_hashop(List *clauseinfo_list,
int inner_relid)
{
List *hashinfo_list = NIL;
@@ -109,7 +109,7 @@ group_clauses_by_hashop(List * clauseinfo_list,
*
*/
static HInfo *
-match_hashop_hashinfo(Oid hashop, List * hashinfo_list)
+match_hashop_hashinfo(Oid hashop, List *hashinfo_list)
{
Oid key = 0;
HInfo *xhashinfo = (HInfo *) NULL;
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 6018ad775dfdfedfc7ffbb67f2d566a0ff61d6ae..1527ca4fac228af5d149ceb86f4e5c25391bae29 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.10 1997/09/08 02:24:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.11 1997/09/08 21:44:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,42 +47,42 @@
static void
-match_index_orclauses(Rel * rel, Rel * index, int indexkey,
- int xclass, List * clauseinfo_list);
+match_index_orclauses(Rel *rel, Rel *index, int indexkey,
+ int xclass, List *clauseinfo_list);
static bool
-match_index_to_operand(int indexkey, Expr * operand,
- Rel * rel, Rel * index);
+match_index_to_operand(int indexkey, Expr *operand,
+ Rel *rel, Rel *index);
static List *
-match_index_orclause(Rel * rel, Rel * index, int indexkey,
- int xclass, List * or_clauses, List * other_matching_indices);
+match_index_orclause(Rel *rel, Rel *index, int indexkey,
+ int xclass, List *or_clauses, List *other_matching_indices);
static List *
-group_clauses_by_indexkey(Rel * rel, Rel * index,
- int *indexkeys, Oid * classes, List * clauseinfo_list);
+group_clauses_by_indexkey(Rel *rel, Rel *index,
+ int *indexkeys, Oid *classes, List *clauseinfo_list);
static List *
-group_clauses_by_ikey_for_joins(Rel * rel, Rel * index,
- int *indexkeys, Oid * classes, List * join_cinfo_list, List * restr_cinfo_list);
+group_clauses_by_ikey_for_joins(Rel *rel, Rel *index,
+ int *indexkeys, Oid *classes, List *join_cinfo_list, List *restr_cinfo_list);
static CInfo *
-match_clause_to_indexkey(Rel * rel, Rel * index, int indexkey,
- int xclass, CInfo * clauseInfo, bool join);
+match_clause_to_indexkey(Rel *rel, Rel *index, int indexkey,
+ int xclass, CInfo *clauseInfo, bool join);
static bool
-pred_test(List * predicate_list, List * clauseinfo_list,
- List * joininfo_list);
-static bool one_pred_test(Expr * predicate, List * clauseinfo_list);
-static bool one_pred_clause_expr_test(Expr * predicate, Node * clause);
-static bool one_pred_clause_test(Expr * predicate, Node * clause);
-static bool clause_pred_clause_test(Expr * predicate, Node * clause);
+pred_test(List *predicate_list, List *clauseinfo_list,
+ List *joininfo_list);
+static bool one_pred_test(Expr *predicate, List *clauseinfo_list);
+static bool one_pred_clause_expr_test(Expr *predicate, Node *clause);
+static bool one_pred_clause_test(Expr *predicate, Node *clause);
+static bool clause_pred_clause_test(Expr *predicate, Node *clause);
static List *
-indexable_joinclauses(Rel * rel, Rel * index,
- List * joininfo_list, List * clauseinfo_list);
+indexable_joinclauses(Rel *rel, Rel *index,
+ List *joininfo_list, List *clauseinfo_list);
static List *
-index_innerjoin(Query * root, Rel * rel,
- List * clausegroup_list, Rel * index);
+index_innerjoin(Query *root, Rel *rel,
+ List *clausegroup_list, Rel *index);
static List *
-create_index_paths(Query * root, Rel * rel, Rel * index,
- List * clausegroup_list, bool join);
-static List *add_index_paths(List * indexpaths, List * new_indexpaths);
-static bool function_index_operand(Expr * funcOpnd, Rel * rel, Rel * index);
-static bool SingleAttributeIndex(Rel * index);
+create_index_paths(Query *root, Rel *rel, Rel *index,
+ List *clausegroup_list, bool join);
+static List *add_index_paths(List *indexpaths, List *new_indexpaths);
+static bool function_index_operand(Expr *funcOpnd, Rel *rel, Rel *index);
+static bool SingleAttributeIndex(Rel *index);
/* If Spyros can use a constant PRS2_BOOL_TYPEID, I can use this */
#define BOOL_TYPEID ((Oid) 16)
@@ -114,11 +114,11 @@ static bool SingleAttributeIndex(Rel * index);
*
*/
List *
-find_index_paths(Query * root,
- Rel * rel,
- List * indices,
- List * clauseinfo_list,
- List * joininfo_list)
+find_index_paths(Query *root,
+ Rel *rel,
+ List *indices,
+ List *clauseinfo_list,
+ List *joininfo_list)
{
List *scanclausegroups = NIL;
List *scanpaths = NIL;
@@ -240,11 +240,11 @@ find_index_paths(Query * root,
*
*/
static void
-match_index_orclauses(Rel * rel,
- Rel * index,
+match_index_orclauses(Rel *rel,
+ Rel *index,
int indexkey,
int xclass,
- List * clauseinfo_list)
+ List *clauseinfo_list)
{
CInfo *clauseinfo = (CInfo *) NULL;
List *i = NIL;
@@ -277,9 +277,9 @@ match_index_orclauses(Rel * rel,
*/
static bool
match_index_to_operand(int indexkey,
- Expr * operand,
- Rel * rel,
- Rel * index)
+ Expr *operand,
+ Rel *rel,
+ Rel *index)
{
/*
@@ -316,12 +316,12 @@ match_index_to_operand(int indexkey,
* match the third, g,h match the fourth, etc.
*/
static List *
-match_index_orclause(Rel * rel,
- Rel * index,
+match_index_orclause(Rel *rel,
+ Rel *index,
int indexkey,
int xclass,
- List * or_clauses,
- List * other_matching_indices)
+ List *or_clauses,
+ List *other_matching_indices)
{
Node *clause = NULL;
List *matched_indices = other_matching_indices;
@@ -398,11 +398,11 @@ match_index_orclause(Rel * rel,
*
*/
static List *
-group_clauses_by_indexkey(Rel * rel,
- Rel * index,
+group_clauses_by_indexkey(Rel *rel,
+ Rel *index,
int *indexkeys,
- Oid * classes,
- List * clauseinfo_list)
+ Oid *classes,
+ List *clauseinfo_list)
{
List *curCinfo = NIL;
CInfo *matched_clause = (CInfo *) NULL;
@@ -460,12 +460,12 @@ group_clauses_by_indexkey(Rel * rel,
*
*/
static List *
-group_clauses_by_ikey_for_joins(Rel * rel,
- Rel * index,
+group_clauses_by_ikey_for_joins(Rel *rel,
+ Rel *index,
int *indexkeys,
- Oid * classes,
- List * join_cinfo_list,
- List * restr_cinfo_list)
+ Oid *classes,
+ List *join_cinfo_list,
+ List *restr_cinfo_list)
{
List *curCinfo = NIL;
CInfo *matched_clause = (CInfo *) NULL;
@@ -583,11 +583,11 @@ group_clauses_by_ikey_for_joins(Rel * rel,
*
*/
static CInfo *
-match_clause_to_indexkey(Rel * rel,
- Rel * index,
+match_clause_to_indexkey(Rel *rel,
+ Rel *index,
int indexkey,
int xclass,
- CInfo * clauseInfo,
+ CInfo *clauseInfo,
bool join)
{
Expr *clause = clauseInfo->clause;
@@ -720,7 +720,7 @@ match_clause_to_indexkey(Rel * rel,
* successfully cnfify()-ed). --Nels, Jan '93
*/
static bool
-pred_test(List * predicate_list, List * clauseinfo_list, List * joininfo_list)
+pred_test(List *predicate_list, List *clauseinfo_list, List *joininfo_list)
{
List *pred,
*items,
@@ -771,7 +771,7 @@ pred_test(List * predicate_list, List * clauseinfo_list, List * joininfo_list)
* expression.
*/
static bool
-one_pred_test(Expr * predicate, List * clauseinfo_list)
+one_pred_test(Expr *predicate, List *clauseinfo_list)
{
CInfo *clauseinfo;
List *item;
@@ -794,7 +794,7 @@ one_pred_test(Expr * predicate, List * clauseinfo_list)
* expression.
*/
static bool
-one_pred_clause_expr_test(Expr * predicate, Node * clause)
+one_pred_clause_expr_test(Expr *predicate, Node *clause)
{
List *items,
*item;
@@ -841,7 +841,7 @@ one_pred_clause_expr_test(Expr * predicate, Node * clause)
* expression for a simple restriction clause.
*/
static bool
-one_pred_clause_test(Expr * predicate, Node * clause)
+one_pred_clause_test(Expr *predicate, Node *clause)
{
List *items,
*item;
@@ -923,7 +923,7 @@ StrategyNumber BT_implic_table[BTMaxStrategyNumber][BTMaxStrategyNumber] = {
* appropriate "RT_implic_table" array.
*/
static bool
-clause_pred_clause_test(Expr * predicate, Node * clause)
+clause_pred_clause_test(Expr *predicate, Node *clause)
{
Var *pred_var,
*clause_var;
@@ -1121,8 +1121,8 @@ clause_pred_clause_test(Expr * predicate, Node * clause)
*
*/
static List *
-indexable_joinclauses(Rel * rel, Rel * index,
- List * joininfo_list, List * clauseinfo_list)
+indexable_joinclauses(Rel *rel, Rel *index,
+ List *joininfo_list, List *clauseinfo_list)
{
JInfo *joininfo = (JInfo *) NULL;
List *cg_list = NIL;
@@ -1166,7 +1166,7 @@ indexable_joinclauses(Rel * rel, Rel * index,
*/
#ifdef NOT_USED
static List *
-extract_restrict_clauses(List * clausegroup)
+extract_restrict_clauses(List *clausegroup)
{
List *restrict_cls = NIL;
List *l;
@@ -1197,7 +1197,7 @@ extract_restrict_clauses(List * clausegroup)
*
*/
static List *
-index_innerjoin(Query * root, Rel * rel, List * clausegroup_list, Rel * index)
+index_innerjoin(Query *root, Rel *rel, List *clausegroup_list, Rel *index)
{
List *clausegroup = NIL;
List *cg_list = NIL;
@@ -1282,10 +1282,10 @@ index_innerjoin(Query * root, Rel * rel, List * clausegroup_list, Rel * index)
*
*/
static List *
-create_index_paths(Query * root,
- Rel * rel,
- Rel * index,
- List * clausegroup_list,
+create_index_paths(Query *root,
+ Rel *rel,
+ Rel *index,
+ List *clausegroup_list,
bool join)
{
List *clausegroup = NIL;
@@ -1325,13 +1325,13 @@ create_index_paths(Query * root,
}
static List *
-add_index_paths(List * indexpaths, List * new_indexpaths)
+add_index_paths(List *indexpaths, List *new_indexpaths)
{
return append(indexpaths, new_indexpaths);
}
static bool
-function_index_operand(Expr * funcOpnd, Rel * rel, Rel * index)
+function_index_operand(Expr *funcOpnd, Rel *rel, Rel *index)
{
Oid heapRelid = (Oid) lfirsti(rel->relids);
Func *function;
@@ -1391,7 +1391,7 @@ function_index_operand(Expr * funcOpnd, Rel * rel, Rel * index)
}
static bool
-SingleAttributeIndex(Rel * index)
+SingleAttributeIndex(Rel *index)
{
/*
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index fe685aaaf173724217699baf70ed9e239bcb5ed2..fd584d6a1d4760286205a926c8117c22e65831b5 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.4 1997/09/08 02:24:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.5 1997/09/08 21:44:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,21 +29,21 @@
#include "optimizer/cost.h" /* for _enable_{hashjoin,
* _enable_mergesort} */
-static Path *best_innerjoin(List * join_paths, List * outer_relid);
+static Path *best_innerjoin(List *join_paths, List *outer_relid);
static List *
-sort_inner_and_outer(Rel * joinrel, Rel * outerrel, Rel * innerrel,
- List * mergeinfo_list);
+sort_inner_and_outer(Rel *joinrel, Rel *outerrel, Rel *innerrel,
+ List *mergeinfo_list);
static List *
-match_unsorted_outer(Rel * joinrel, Rel * outerrel, Rel * innerrel,
- List * outerpath_list, Path * cheapest_inner, Path * best_innerjoin,
- List * mergeinfo_list);
+match_unsorted_outer(Rel *joinrel, Rel *outerrel, Rel *innerrel,
+ List *outerpath_list, Path *cheapest_inner, Path *best_innerjoin,
+ List *mergeinfo_list);
static List *
-match_unsorted_inner(Rel * joinrel, Rel * outerrel, Rel * innerrel,
- List * innerpath_list, List * mergeinfo_list);
-static bool EnoughMemoryForHashjoin(Rel * hashrel);
+match_unsorted_inner(Rel *joinrel, Rel *outerrel, Rel *innerrel,
+ List *innerpath_list, List *mergeinfo_list);
+static bool EnoughMemoryForHashjoin(Rel *hashrel);
static List *
-hash_inner_and_outer(Rel * joinrel, Rel * outerrel, Rel * innerrel,
- List * hashinfo_list);
+hash_inner_and_outer(Rel *joinrel, Rel *outerrel, Rel *innerrel,
+ List *hashinfo_list);
/*
* find-all-join-paths--
@@ -67,7 +67,7 @@ hash_inner_and_outer(Rel * joinrel, Rel * outerrel, Rel * innerrel,
* It does a destructive modification.
*/
void
-find_all_join_paths(Query * root, List * joinrels)
+find_all_join_paths(Query *root, List *joinrels)
{
List *mergeinfo_list = NIL;
List *hashinfo_list = NIL;
@@ -206,7 +206,7 @@ find_all_join_paths(Query * root, List * joinrels)
* Returns the pathnode of the selected path.
*/
static Path *
-best_innerjoin(List * join_paths, List * outer_relids)
+best_innerjoin(List *join_paths, List *outer_relids)
{
Path *cheapest = (Path *) NULL;
List *join_path;
@@ -240,10 +240,10 @@ best_innerjoin(List * join_paths, List * outer_relids)
* Returns a list of mergesort paths.
*/
static List *
-sort_inner_and_outer(Rel * joinrel,
- Rel * outerrel,
- Rel * innerrel,
- List * mergeinfo_list)
+sort_inner_and_outer(Rel *joinrel,
+ Rel *outerrel,
+ Rel *innerrel,
+ List *mergeinfo_list)
{
List *ms_list = NIL;
MInfo *xmergeinfo = (MInfo *) NULL;
@@ -318,13 +318,13 @@ sort_inner_and_outer(Rel * joinrel,
* Returns a list of possible join path nodes.
*/
static List *
-match_unsorted_outer(Rel * joinrel,
- Rel * outerrel,
- Rel * innerrel,
- List * outerpath_list,
- Path * cheapest_inner,
- Path * best_innerjoin,
- List * mergeinfo_list)
+match_unsorted_outer(Rel *joinrel,
+ Rel *outerrel,
+ Rel *innerrel,
+ List *outerpath_list,
+ Path *cheapest_inner,
+ Path *best_innerjoin,
+ List *mergeinfo_list)
{
Path *outerpath = (Path *) NULL;
List *jp_list = NIL;
@@ -485,11 +485,11 @@ match_unsorted_outer(Rel * joinrel,
* Returns a list of possible merge paths.
*/
static List *
-match_unsorted_inner(Rel * joinrel,
- Rel * outerrel,
- Rel * innerrel,
- List * innerpath_list,
- List * mergeinfo_list)
+match_unsorted_inner(Rel *joinrel,
+ Rel *outerrel,
+ Rel *innerrel,
+ List *innerpath_list,
+ List *mergeinfo_list)
{
Path *innerpath = (Path *) NULL;
List *mp_list = NIL;
@@ -583,7 +583,7 @@ match_unsorted_inner(Rel * joinrel,
}
static bool
-EnoughMemoryForHashjoin(Rel * hashrel)
+EnoughMemoryForHashjoin(Rel *hashrel)
{
int ntuples;
int tupsize;
@@ -617,10 +617,10 @@ EnoughMemoryForHashjoin(Rel * hashrel)
* Returns a list of hashjoin paths.
*/
static List *
-hash_inner_and_outer(Rel * joinrel,
- Rel * outerrel,
- Rel * innerrel,
- List * hashinfo_list)
+hash_inner_and_outer(Rel *joinrel,
+ Rel *outerrel,
+ Rel *innerrel,
+ List *hashinfo_list)
{
HInfo *xhashinfo = (HInfo *) NULL;
List *hjoin_list = NIL;
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index b1c1f0cb0918e563feb0c670679b13249200ef92..7e28ee5cc67f69618430d37d3d0d55bcd5292417 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.6 1997/09/08 02:24:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.7 1997/09/08 21:45:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,19 +31,19 @@ bool _use_right_sided_plans_ = false;
#endif
-static List *find_clause_joins(Query * root, Rel * outer_rel, List * joininfo_list);
-static List *find_clauseless_joins(Rel * outer_rel, List * inner_rels);
-static Rel *init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo);
+static List *find_clause_joins(Query *root, Rel *outer_rel, List *joininfo_list);
+static List *find_clauseless_joins(Rel *outer_rel, List *inner_rels);
+static Rel *init_join_rel(Rel *outer_rel, Rel *inner_rel, JInfo *joininfo);
static List *
-new_join_tlist(List * tlist, List * other_relids,
+new_join_tlist(List *tlist, List *other_relids,
int first_resdomno);
-static List *new_joininfo_list(List * joininfo_list, List * join_relids);
-static void add_superrels(Rel * rel, Rel * super_rel);
-static bool nonoverlap_rels(Rel * rel1, Rel * rel2);
-static bool nonoverlap_sets(List * s1, List * s2);
+static List *new_joininfo_list(List *joininfo_list, List *join_relids);
+static void add_superrels(Rel *rel, Rel *super_rel);
+static bool nonoverlap_rels(Rel *rel1, Rel *rel2);
+static bool nonoverlap_sets(List *s1, List *s2);
static void
-set_joinrel_size(Rel * joinrel, Rel * outer_rel, Rel * inner_rel,
- JInfo * jinfo);
+set_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel,
+ JInfo *jinfo);
/*
* find-join-rels--
@@ -59,7 +59,7 @@ set_joinrel_size(Rel * joinrel, Rel * outer_rel, Rel * inner_rel,
* Returns a list of rel nodes corresponding to the new join relations.
*/
List *
-find_join_rels(Query * root, List * outer_rels)
+find_join_rels(Query *root, List *outer_rels)
{
List *joins = NIL;
List *join_list = NIL;
@@ -97,7 +97,7 @@ find_join_rels(Query * root, List * outer_rels)
* Returns a list of new join relations.
*/
static List *
-find_clause_joins(Query * root, Rel * outer_rel, List * joininfo_list)
+find_clause_joins(Query *root, Rel *outer_rel, List *joininfo_list)
{
List *join_list = NIL;
List *i = NIL;
@@ -158,7 +158,7 @@ find_clause_joins(Query * root, Rel * outer_rel, List * joininfo_list)
* Returns a list of new join relations.
*/
static List *
-find_clauseless_joins(Rel * outer_rel, List * inner_rels)
+find_clauseless_joins(Rel *outer_rel, List *inner_rels)
{
Rel *inner_rel;
List *t_list = NIL;
@@ -193,7 +193,7 @@ find_clauseless_joins(Rel * outer_rel, List * inner_rels)
* Returns the new join relation node.
*/
static Rel *
-init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo)
+init_join_rel(Rel *outer_rel, Rel *inner_rel, JInfo *joininfo)
{
Rel *joinrel = makeNode(Rel);
List *joinrel_joininfo_list = NIL;
@@ -273,8 +273,8 @@ init_join_rel(Rel * outer_rel, Rel * inner_rel, JInfo * joininfo)
* Returns the new target list.
*/
static List *
-new_join_tlist(List * tlist,
- List * other_relids,
+new_join_tlist(List *tlist,
+ List *other_relids,
int first_resdomno)
{
int resdomno = first_resdomno - 1;
@@ -323,7 +323,7 @@ new_join_tlist(List * tlist,
* Returns a list of joininfo nodes, new and old.
*/
static List *
-new_joininfo_list(List * joininfo_list, List * join_relids)
+new_joininfo_list(List *joininfo_list, List *join_relids)
{
List *current_joininfo_list = NIL;
List *new_otherrels = NIL;
@@ -387,7 +387,7 @@ new_joininfo_list(List * joininfo_list, List * join_relids)
* Modifies the joininfo field of appropriate rel nodes.
*/
void
-add_new_joininfos(Query * root, List * joinrels, List * outerrels)
+add_new_joininfos(Query *root, List *joinrels, List *outerrels)
{
List *xjoinrel = NIL;
List *xrelid = NIL;
@@ -487,7 +487,7 @@ add_new_joininfos(Query * root, List * joinrels, List * outerrels)
* Returns the list of final join relations.
*/
List *
-final_join_rels(List * join_rel_list)
+final_join_rels(List *join_rel_list)
{
List *xrel = NIL;
List *temp = NIL;
@@ -533,7 +533,7 @@ final_join_rels(List * join_rel_list)
* Modifies the superrels field of rel
*/
static void
-add_superrels(Rel * rel, Rel * super_rel)
+add_superrels(Rel *rel, Rel *super_rel)
{
rel->superrels = lappend(rel->superrels, super_rel);
}
@@ -548,13 +548,13 @@ add_superrels(Rel * rel, Rel * super_rel)
* Returns non-nil if rel1 and rel2 do not overlap.
*/
static bool
-nonoverlap_rels(Rel * rel1, Rel * rel2)
+nonoverlap_rels(Rel *rel1, Rel *rel2)
{
return (nonoverlap_sets(rel1->relids, rel2->relids));
}
static bool
-nonoverlap_sets(List * s1, List * s2)
+nonoverlap_sets(List *s1, List *s2)
{
List *x = NIL;
@@ -569,7 +569,7 @@ nonoverlap_sets(List * s1, List * s2)
}
static void
-set_joinrel_size(Rel * joinrel, Rel * outer_rel, Rel * inner_rel, JInfo * jinfo)
+set_joinrel_size(Rel *joinrel, Rel *outer_rel, Rel *inner_rel, JInfo *jinfo)
{
int ntuples;
float selec;
diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/joinutils.c
index 1e297eee07718e83265cdffe7f26c1f168bcf6c8..2c08c77b09135b5d8dc4cd9cef05c13e42c54a53 100644
--- a/src/backend/optimizer/path/joinutils.c
+++ b/src/backend/optimizer/path/joinutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.3 1997/09/08 02:24:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.4 1997/09/08 21:45:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,18 +27,18 @@
static int
-match_pathkey_joinkeys(List * pathkey, List * joinkeys,
+match_pathkey_joinkeys(List *pathkey, List *joinkeys,
int which_subkey);
static bool
-every_func(List * joinkeys, List * pathkey,
+every_func(List *joinkeys, List *pathkey,
int which_subkey);
static List *
-new_join_pathkey(List * subkeys,
- List * considered_subkeys, List * join_rel_tlist,
- List * joinclauses);
+new_join_pathkey(List *subkeys,
+ List *considered_subkeys, List *join_rel_tlist,
+ List *joinclauses);
static List *
-new_matching_subkeys(Var * subkey, List * considered_subkeys,
- List * join_rel_tlist, List * joinclauses);
+new_matching_subkeys(Var *subkey, List *considered_subkeys,
+ List *join_rel_tlist, List *joinclauses);
/****************************************************************************
* KEY COMPARISONS
@@ -74,11 +74,11 @@ new_matching_subkeys(Var * subkey, List * considered_subkeys,
* in matchedJoinClausesPtr. - ay 11/94
*/
List *
-match_pathkeys_joinkeys(List * pathkeys,
- List * joinkeys,
- List * joinclauses,
+match_pathkeys_joinkeys(List *pathkeys,
+ List *joinkeys,
+ List *joinclauses,
int which_subkey,
- List ** matchedJoinClausesPtr)
+ List **matchedJoinClausesPtr)
{
List *matched_joinkeys = NIL;
List *matched_joinclauses = NIL;
@@ -127,8 +127,8 @@ match_pathkeys_joinkeys(List * pathkeys,
* outer or inner subkey matches any subkey of 'pathkey'.
*/
static int
-match_pathkey_joinkeys(List * pathkey,
- List * joinkeys,
+match_pathkey_joinkeys(List *pathkey,
+ List *joinkeys,
int which_subkey)
{
Var *path_subkey;
@@ -175,7 +175,7 @@ match_pathkey_joinkeys(List * pathkey,
* Returns the matching path node if one exists, nil otherwise.
*/
static bool
-every_func(List * joinkeys, List * pathkey, int which_subkey)
+every_func(List *joinkeys, List *pathkey, int which_subkey)
{
JoinKey *xjoinkey;
Var *temp;
@@ -212,9 +212,9 @@ every_func(List * joinkeys, List * pathkey, int which_subkey)
* find the cheapest path that matches the join keys
*/
Path *
-match_paths_joinkeys(List * joinkeys,
- PathOrder * ordering,
- List * paths,
+match_paths_joinkeys(List *joinkeys,
+ PathOrder *ordering,
+ List *paths,
int which_subkey)
{
Path *matched_path = NULL;
@@ -264,8 +264,8 @@ match_paths_joinkeys(List * joinkeys,
* [I've no idea why they have to be list of lists. Should be fixed. -ay 12/94]
*/
List *
-extract_path_keys(List * joinkeys,
- List * tlist,
+extract_path_keys(List *joinkeys,
+ List *tlist,
int which_subkey)
{
List *pathkeys = NIL;
@@ -326,9 +326,9 @@ extract_path_keys(List * joinkeys,
*
*/
List *
-new_join_pathkeys(List * outer_pathkeys,
- List * join_rel_tlist,
- List * joinclauses)
+new_join_pathkeys(List *outer_pathkeys,
+ List *join_rel_tlist,
+ List *joinclauses)
{
List *outer_pathkey = NIL;
List *t_list = NIL;
@@ -366,10 +366,10 @@ new_join_pathkeys(List * outer_pathkeys,
*
*/
static List *
-new_join_pathkey(List * subkeys,
- List * considered_subkeys,
- List * join_rel_tlist,
- List * joinclauses)
+new_join_pathkey(List *subkeys,
+ List *considered_subkeys,
+ List *join_rel_tlist,
+ List *joinclauses)
{
List *t_list = NIL;
Var *subkey;
@@ -426,10 +426,10 @@ new_join_pathkey(List * subkeys,
*
*/
static List *
-new_matching_subkeys(Var * subkey,
- List * considered_subkeys,
- List * join_rel_tlist,
- List * joinclauses)
+new_matching_subkeys(Var *subkey,
+ List *considered_subkeys,
+ List *join_rel_tlist,
+ List *joinclauses)
{
Expr *joinclause = NULL;
List *t_list = NIL;
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index be5cc79d8dc18a8cd96eba2aa28aa68f39f6f2eb..92103268772b8204fe752887822553076fb6f976 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.3 1997/09/08 02:24:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.4 1997/09/08 21:45:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@
*
*/
List *
-group_clauses_by_order(List * clauseinfo_list,
+group_clauses_by_order(List *clauseinfo_list,
int inner_relid)
{
List *mergeinfo_list = NIL;
@@ -106,7 +106,7 @@ group_clauses_by_order(List * clauseinfo_list,
*
*/
MInfo *
-match_order_mergeinfo(PathOrder * ordering, List * mergeinfo_list)
+match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list)
{
MergeOrder *xmergeorder;
List *xmergeinfo = NIL;
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 7b2da6c182e3f4987a4026db998ec8aa984b56e1..60d36ae34902c91ac86941be43485a5995602d5c 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.3 1997/09/08 02:24:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.4 1997/09/08 21:45:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,12 +32,12 @@
static void
-best_or_subclause_indices(Query * root, Rel * rel, List * subclauses,
- List * indices, List * examined_indexids, Cost subcost, List * selectivities,
- List ** indexids, Cost * cost, List ** selecs);
+best_or_subclause_indices(Query *root, Rel *rel, List *subclauses,
+List *indices, List *examined_indexids, Cost subcost, List *selectivities,
+ List **indexids, Cost *cost, List **selecs);
static void
-best_or_subclause_index(Query * root, Rel * rel, Expr * subclause,
- List * indices, int *indexid, Cost * cost, Cost * selec);
+best_or_subclause_index(Query *root, Rel *rel, Expr *subclause,
+ List *indices, int *indexid, Cost *cost, Cost *selec);
/*
@@ -51,8 +51,8 @@ best_or_subclause_index(Query * root, Rel * rel, Expr * subclause,
*
*/
List *
-create_or_index_paths(Query * root,
- Rel * rel, List * clauses)
+create_or_index_paths(Query *root,
+ Rel *rel, List *clauses)
{
List *t_list = NIL;
@@ -158,16 +158,16 @@ create_or_index_paths(Query * root,
* 'cost' is a flonum, and 's' is a flonum.
*/
static void
-best_or_subclause_indices(Query * root,
- Rel * rel,
- List * subclauses,
- List * indices,
- List * examined_indexids,
+best_or_subclause_indices(Query *root,
+ Rel *rel,
+ List *subclauses,
+ List *indices,
+ List *examined_indexids,
Cost subcost,
- List * selectivities,
- List ** indexids, /* return value */
- Cost * cost, /* return value */
- List ** selecs) /* return value */
+ List *selectivities,
+ List **indexids, /* return value */
+ Cost *cost, /* return value */
+ List **selecs) /* return value */
{
if (subclauses == NIL)
{
@@ -213,13 +213,13 @@ best_or_subclause_indices(Query * root,
*
*/
static void
-best_or_subclause_index(Query * root,
- Rel * rel,
- Expr * subclause,
- List * indices,
+best_or_subclause_index(Query *root,
+ Rel *rel,
+ Expr *subclause,
+ List *indices,
int *retIndexid, /* return value */
- Cost * retCost, /* return value */
- Cost * retSelec) /* return value */
+ Cost *retCost, /* return value */
+ Cost *retSelec) /* return value */
{
if (indices != NIL)
{
diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/predmig.c
index 75c131a2442955fed22807ece1224fe45fdf10dc..3ee98d0b14ed51654aa55f1a939f21910b115412 100644
--- a/src/backend/optimizer/path/predmig.c
+++ b/src/backend/optimizer/path/predmig.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.5 1997/09/08 20:56:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.6 1997/09/08 21:45:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@
static void
xfunc_predmig(JoinPath pathnode, Stream streamroot,
- Stream laststream, bool * progressp);
+ Stream laststream, bool *progressp);
static bool xfunc_series_llel(Stream stream);
static bool xfunc_llel_chains(Stream root, Stream bottom);
static Stream xfunc_complete_stream(Stream stream);
@@ -78,7 +78,7 @@ static int xfunc_stream_compare(void *arg1, void *arg2);
static bool xfunc_check_stream(Stream node);
static bool xfunc_in_stream(Stream node, Stream stream);
-/* ----------------- MAIN FUNCTIONS ------------------------ */
+/* ----------------- MAIN FUNCTIONS ------------------------ */
/*
** xfunc_do_predmig
** wrapper for Predicate Migration. It calls xfunc_predmig until no
@@ -120,7 +120,7 @@ xfunc_predmig(JoinPath pathnode,/* root of the join tree */
Stream laststream,/* for recursive calls -- these are the
* root of the stream under construction,
* and the lowest node created so far */
- bool * progressp)
+ bool *progressp)
{
Stream newstream;
@@ -410,7 +410,7 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, JoinPath joinpath)
** the same groupcost and groupsel (since they're in the same group!)
*/
static void
-xfunc_form_groups(Query * queryInfo, Stream root, Stream bottom)
+xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
{
Stream temp,
parent;
@@ -495,7 +495,7 @@ xfunc_form_groups(Query * queryInfo, Stream root, Stream bottom)
}
-/* ------------------- UTILITY FUNCTIONS ------------------------- */
+/* ------------------- UTILITY FUNCTIONS ------------------------- */
/*
** xfunc_free_stream --
@@ -765,7 +765,7 @@ xfunc_stream_compare(void *arg1, void *arg2)
}
}
-/* ------------------ DEBUGGING ROUTINES ---------------------------- */
+/* ------------------ DEBUGGING ROUTINES ---------------------------- */
/*
** Make sure all pointers in stream make sense. Make sure no joins are
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index 209644c2478c8eb13ae6e0b0bc04fcfada6effc9..d6064ab8e6850ec88b8cddc891ebcaee9844eaf1 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.5 1997/09/08 02:24:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.6 1997/09/08 21:45:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
#include "utils/elog.h"
-static List *prune_joinrel(Rel * rel, List * other_rels);
+static List *prune_joinrel(Rel *rel, List *other_rels);
/*
* prune-joinrels--
@@ -35,7 +35,7 @@ static List *prune_joinrel(Rel * rel, List * other_rels);
*
*/
List *
-prune_joinrels(List * rel_list)
+prune_joinrels(List *rel_list)
{
List *temp_list = NIL;
@@ -60,7 +60,7 @@ prune_joinrels(List * rel_list)
*
*/
static List *
-prune_joinrel(Rel * rel, List * other_rels)
+prune_joinrel(Rel *rel, List *other_rels)
{
List *i = NIL;
List *t_list = NIL;
@@ -97,7 +97,7 @@ prune_joinrel(Rel * rel, List * other_rels)
*
*/
void
-prune_rel_paths(List * rel_list)
+prune_rel_paths(List *rel_list)
{
List *x = NIL;
List *y = NIL;
@@ -140,7 +140,7 @@ prune_rel_paths(List * rel_list)
*
*/
Path *
-prune_rel_path(Rel * rel, Path * unorderedpath)
+prune_rel_path(Rel *rel, Path *unorderedpath)
{
Path *cheapest = set_cheapest(rel, rel->pathlist);
@@ -171,7 +171,7 @@ prune_rel_path(Rel * rel, Path * unorderedpath)
* Returns one pruned rel node list
*/
List *
-merge_joinrels(List * rel_list1, List * rel_list2)
+merge_joinrels(List *rel_list1, List *rel_list2)
{
List *xrel = NIL;
@@ -197,7 +197,7 @@ merge_joinrels(List * rel_list1, List * rel_list2)
* Returns a new list of rel nodes
*/
List *
-prune_oldrels(List * old_rels)
+prune_oldrels(List *old_rels)
{
Rel *rel;
List *joininfo_list,
diff --git a/src/backend/optimizer/path/xfunc.c b/src/backend/optimizer/path/xfunc.c
index 061a2996c807417e12e1a7edc330c385d0bdf2a4..39d41319798d0e2cd56e98a79f4b09dec320b780 100644
--- a/src/backend/optimizer/path/xfunc.c
+++ b/src/backend/optimizer/path/xfunc.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.5 1997/09/08 02:24:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.6 1997/09/08 21:45:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,8 +47,8 @@
/* local funcs */
static int
-xfunc_card_unreferenced(Query * queryInfo,
- Expr * clause, Relid referenced);
+xfunc_card_unreferenced(Query *queryInfo,
+ Expr *clause, Relid referenced);
*/
@@ -146,11 +146,11 @@ xfunc_trypullup(Rel rel)
** XFUNC_JOINPRD if a secondary join predicate is to be pulled up
*/
int
-xfunc_shouldpull(Query * queryInfo,
+xfunc_shouldpull(Query *queryInfo,
Path childpath,
JoinPath parentpath,
int whichchild,
- CInfo * maxcinfopt) /* Out: pointer to clause to
+ CInfo *maxcinfopt) /* Out: pointer to clause to
* pullup */
{
LispValue clauselist,
@@ -231,8 +231,8 @@ xfunc_shouldpull(Query * queryInfo,
|| (!is_join(childpath)
&& (whichchild == INNER)
&& IsA(parentpath, JoinPath)
- && !IsA(parentpath, HashPath)
- && !IsA(parentpath, MergePath)))))
+ &&!IsA(parentpath, HashPath)
+ &&!IsA(parentpath, MergePath)))))
{
*maxcinfopt = maxcinfo;
@@ -267,7 +267,7 @@ xfunc_shouldpull(Query * queryInfo,
** Now returns a pointer to the new pulled-up CInfo. -- JMH, 11/18/92
*/
CInfo
-xfunc_pullup(Query * queryInfo,
+xfunc_pullup(Query *queryInfo,
Path childpath,
JoinPath parentpath,
CInfo cinfo, /* clause to pull up */
@@ -360,7 +360,7 @@ xfunc_pullup(Query * queryInfo,
** calculate (selectivity-1)/cost.
*/
Cost
-xfunc_rank(Query * queryInfo, LispValue clause)
+xfunc_rank(Query *queryInfo, LispValue clause)
{
Cost selec = compute_clause_selec(queryInfo, clause, LispNil);
Cost cost = xfunc_expense(queryInfo, clause);
@@ -379,7 +379,7 @@ xfunc_rank(Query * queryInfo, LispValue clause)
** referenced in the clause.
*/
Cost
-xfunc_expense(Query * queryInfo, clause)
+xfunc_expense(Query *queryInfo, clause)
LispValue clause;
{
Cost cost = xfunc_local_expense(clause);
@@ -400,7 +400,7 @@ LispValue clause;
** Find global expense of a join clause
*/
Cost
-xfunc_join_expense(Query * queryInfo, JoinPath path, int whichchild)
+xfunc_join_expense(Query *queryInfo, JoinPath path, int whichchild)
{
LispValue primjoinclause = xfunc_primary_join(path);
@@ -435,7 +435,7 @@ xfunc_local_expense(LispValue clause)
LispValue tmpclause;
/* First handle the base case */
- if (IsA(clause, Const) || IsA(clause, Var) || IsA(clause, Param))
+ if (IsA(clause, Const) ||IsA(clause, Var) ||IsA(clause, Param))
return (0);
/* now other stuff */
else if (IsA(clause, Iter))
@@ -519,7 +519,7 @@ xfunc_func_expense(LispValue node, LispValue args)
LispValue tmpplan;
List planlist;
- if (IsA(node, Oper) || get_func_planlist((Func) node) == LispNil)
+ if (IsA(node, Oper) ||get_func_planlist((Func) node) == LispNil)
{
Oid *argOidVect; /* vector of argtypes */
char *pq_src; /* text of PQ function */
@@ -735,7 +735,7 @@ exit:
** for joins).
*/
static Count
-xfunc_card_unreferenced(Query * queryInfo,
+xfunc_card_unreferenced(Query *queryInfo,
LispValue clause, Relid referenced)
{
Relid unreferenced,
@@ -763,7 +763,7 @@ xfunc_card_unreferenced(Query * queryInfo,
** multiple together cardinalities of a list relations.
*/
Count
-xfunc_card_product(Query * queryInfo, Relid relids)
+xfunc_card_product(Query *queryInfo, Relid relids)
{
LispValue cinfonode;
LispValue temp;
@@ -813,7 +813,7 @@ xfunc_find_references(LispValue clause)
/* Base cases */
if (IsA(clause, Var))
return (lispCons(lfirst(get_varid((Var) clause)), LispNil));
- else if (IsA(clause, Const) || IsA(clause, Param))
+ else if (IsA(clause, Const) ||IsA(clause, Param))
return ((List) LispNil);
/* recursion */
@@ -929,7 +929,7 @@ xfunc_primary_join(JoinPath pathnode)
** get the expensive function costs of the path
*/
Cost
-xfunc_get_path_cost(Query * queryInfo, Path pathnode)
+xfunc_get_path_cost(Query *queryInfo, Path pathnode)
{
Cost cost = 0;
LispValue tmplist;
@@ -1048,7 +1048,7 @@ xfunc_total_path_cost(JoinPath pathnode)
}
else if (IsA(pathnode, HashPath))
{
- HashPath hashnode = (HashPath) pathnode;
+ HashPath hashnode = (HashPath) pathnode;
cost += cost_hashjoin(get_path_cost((Path) get_outerjoinpath(hashnode)),
get_path_cost((Path) get_innerjoinpath(hashnode)),
@@ -1153,7 +1153,7 @@ xfunc_fixvars(LispValue clause, /* clause being pulled up */
TargetEntry *tle; /* tlist member corresponding to var */
- if (IsA(clause, Const) || IsA(clause, Param))
+ if (IsA(clause, Const) ||IsA(clause, Param))
return;
else if (IsA(clause, Var))
{
@@ -1261,7 +1261,7 @@ xfunc_disjunct_sort(LispValue clause_list)
** arg1 and arg2 are really pointers to disjuncts
*/
int
-xfunc_disjunct_compare(Query * queryInfo, void *arg1, void *arg2)
+xfunc_disjunct_compare(Query *queryInfo, void *arg1, void *arg2)
{
LispValue disjunct1 = *(LispValue *) arg1;
LispValue disjunct2 = *(LispValue *) arg2;
@@ -1436,11 +1436,11 @@ xfunc_LispRemove(LispValue foo, List bar)
** Just like _copyRel, but doesn't copy the paths
*/
bool
-xfunc_copyrel(Rel from, Rel * to)
+xfunc_copyrel(Rel from, Rel *to)
{
Rel newnode;
- Pointer(*alloc) () = palloc;
+ Pointer (*alloc) () = palloc;
/* COPY_CHECKARGS() */
if (to == NULL)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 310bb528f4a0389e1860d3579ace13432c9c18e3..11d777e8341aef085fc981e836ed9253a84f02a9 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.14 1997/09/08 20:56:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.15 1997/09/08 21:45:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,47 +44,47 @@
#define TEMP_SORT 1
#define TEMP_MATERIAL 2
-static List *switch_outer(List * clauses);
-static Scan *create_scan_node(Path * best_path, List * tlist);
-static Join *create_join_node(JoinPath * best_path, List * tlist);
+static List *switch_outer(List *clauses);
+static Scan *create_scan_node(Path *best_path, List *tlist);
+static Join *create_join_node(JoinPath *best_path, List *tlist);
static SeqScan *
-create_seqscan_node(Path * best_path, List * tlist,
- List * scan_clauses);
+create_seqscan_node(Path *best_path, List *tlist,
+ List *scan_clauses);
static IndexScan *
-create_indexscan_node(IndexPath * best_path, List * tlist,
- List * scan_clauses);
+create_indexscan_node(IndexPath *best_path, List *tlist,
+ List *scan_clauses);
static NestLoop *
-create_nestloop_node(JoinPath * best_path, List * tlist,
- List * clauses, Plan * outer_node, List * outer_tlist,
- Plan * inner_node, List * inner_tlist);
+create_nestloop_node(JoinPath *best_path, List *tlist,
+ List *clauses, Plan *outer_node, List *outer_tlist,
+ Plan *inner_node, List *inner_tlist);
static MergeJoin *
-create_mergejoin_node(MergePath * best_path, List * tlist,
- List * clauses, Plan * outer_node, List * outer_tlist,
- Plan * inner_node, List * inner_tlist);
+create_mergejoin_node(MergePath *best_path, List *tlist,
+ List *clauses, Plan *outer_node, List *outer_tlist,
+ Plan *inner_node, List *inner_tlist);
static HashJoin *
-create_hashjoin_node(HashPath * best_path, List * tlist,
- List * clauses, Plan * outer_node, List * outer_tlist,
- Plan * inner_node, List * inner_tlist);
-static Node *fix_indxqual_references(Node * clause, Path * index_path);
+create_hashjoin_node(HashPath *best_path, List *tlist,
+ List *clauses, Plan *outer_node, List *outer_tlist,
+ Plan *inner_node, List *inner_tlist);
+static Node *fix_indxqual_references(Node *clause, Path *index_path);
static Temp *
-make_temp(List * tlist, List * keys, Oid * operators,
- Plan * plan_node, int temptype);
+make_temp(List *tlist, List *keys, Oid *operators,
+ Plan *plan_node, int temptype);
static IndexScan *
-make_indexscan(List * qptlist, List * qpqual, Index scanrelid,
- List * indxid, List * indxqual);
+make_indexscan(List *qptlist, List *qpqual, Index scanrelid,
+ List *indxid, List *indxqual);
static NestLoop *
-make_nestloop(List * qptlist, List * qpqual, Plan * lefttree,
- Plan * righttree);
+make_nestloop(List *qptlist, List *qpqual, Plan *lefttree,
+ Plan *righttree);
static HashJoin *
-make_hashjoin(List * tlist, List * qpqual,
- List * hashclauses, Plan * lefttree, Plan * righttree);
-static Hash *make_hash(List * tlist, Var * hashkey, Plan * lefttree);
+make_hashjoin(List *tlist, List *qpqual,
+ List *hashclauses, Plan *lefttree, Plan *righttree);
+static Hash *make_hash(List *tlist, Var *hashkey, Plan *lefttree);
static MergeJoin *
-make_mergesort(List * tlist, List * qpqual,
- List * mergeclauses, Oid opcode, Oid * rightorder,
- Oid * leftorder, Plan * righttree, Plan * lefttree);
+make_mergesort(List *tlist, List *qpqual,
+ List *mergeclauses, Oid opcode, Oid *rightorder,
+ Oid *leftorder, Plan *righttree, Plan *lefttree);
static Material *
-make_material(List * tlist, Oid tempid, Plan * lefttree,
+make_material(List *tlist, Oid tempid, Plan *lefttree,
int keycount);
/*
@@ -103,7 +103,7 @@ make_material(List * tlist, Oid tempid, Plan * lefttree,
* Returns the optimal(?) access plan.
*/
Plan *
-create_plan(Path * best_path)
+create_plan(Path *best_path)
{
List *tlist;
Plan *plan_node = (Plan *) NULL;
@@ -167,7 +167,7 @@ create_plan(Path * best_path)
* Returns the scan node.
*/
static Scan *
-create_scan_node(Path * best_path, List * tlist)
+create_scan_node(Path *best_path, List *tlist)
{
Scan *node = NULL;
@@ -216,7 +216,7 @@ create_scan_node(Path * best_path, List * tlist)
* Returns the join node.
*/
static Join *
-create_join_node(JoinPath * best_path, List * tlist)
+create_join_node(JoinPath *best_path, List *tlist)
{
Plan *outer_node;
List *outer_tlist;
@@ -298,7 +298,7 @@ create_join_node(JoinPath * best_path, List * tlist)
* with restriction clauses 'scan-clauses' and targetlist 'tlist'.
*/
static SeqScan *
-create_seqscan_node(Path * best_path, List * tlist, List * scan_clauses)
+create_seqscan_node(Path *best_path, List *tlist, List *scan_clauses)
{
SeqScan *scan_node = (SeqScan *) NULL;
Index scan_relid = -1;
@@ -326,9 +326,9 @@ create_seqscan_node(Path * best_path, List * tlist, List * scan_clauses)
* with restriction clauses 'scan-clauses' and targetlist 'tlist'.
*/
static IndexScan *
-create_indexscan_node(IndexPath * best_path,
- List * tlist,
- List * scan_clauses)
+create_indexscan_node(IndexPath *best_path,
+ List *tlist,
+ List *scan_clauses)
{
/*
@@ -430,13 +430,13 @@ create_indexscan_node(IndexPath * best_path,
*****************************************************************************/
static NestLoop *
-create_nestloop_node(JoinPath * best_path,
- List * tlist,
- List * clauses,
- Plan * outer_node,
- List * outer_tlist,
- Plan * inner_node,
- List * inner_tlist)
+create_nestloop_node(JoinPath *best_path,
+ List *tlist,
+ List *clauses,
+ Plan *outer_node,
+ List *outer_tlist,
+ Plan *inner_node,
+ List *inner_tlist)
{
NestLoop *join_node = (NestLoop *) NULL;
@@ -512,13 +512,13 @@ create_nestloop_node(JoinPath * best_path,
}
static MergeJoin *
-create_mergejoin_node(MergePath * best_path,
- List * tlist,
- List * clauses,
- Plan * outer_node,
- List * outer_tlist,
- Plan * inner_node,
- List * inner_tlist)
+create_mergejoin_node(MergePath *best_path,
+ List *tlist,
+ List *clauses,
+ Plan *outer_node,
+ List *outer_tlist,
+ Plan *inner_node,
+ List *inner_tlist)
{
List *qpqual,
*mergeclauses;
@@ -609,13 +609,13 @@ create_mergejoin_node(MergePath * best_path,
* these?? at runtime? what about a hash index?
*/
static HashJoin *
-create_hashjoin_node(HashPath * best_path,
- List * tlist,
- List * clauses,
- Plan * outer_node,
- List * outer_tlist,
- Plan * inner_node,
- List * inner_tlist)
+create_hashjoin_node(HashPath *best_path,
+ List *tlist,
+ List *clauses,
+ Plan *outer_node,
+ List *outer_tlist,
+ Plan *inner_node,
+ List *inner_tlist)
{
List *qpqual;
List *hashclauses;
@@ -663,7 +663,7 @@ create_hashjoin_node(HashPath * best_path,
*****************************************************************************/
static Node *
-fix_indxqual_references(Node * clause, Path * index_path)
+fix_indxqual_references(Node *clause, Path *index_path)
{
Node *newclause;
@@ -800,7 +800,7 @@ fix_indxqual_references(Node * clause, Path * index_path)
* XXX Shouldn't the operator be commuted?!
*/
static List *
-switch_outer(List * clauses)
+switch_outer(List *clauses)
{
List *t_list = NIL;
Expr *temp = NULL;
@@ -844,7 +844,7 @@ switch_outer(List * clauses)
* Returns the modified target list.
*/
static List *
-set_temp_tlist_operators(List * tlist, List * pathkeys, Oid * operators)
+set_temp_tlist_operators(List *tlist, List *pathkeys, Oid *operators)
{
Node *keys = NULL;
int keyno = 1;
@@ -892,10 +892,10 @@ set_temp_tlist_operators(List * tlist, List * pathkeys, Oid * operators)
* 'temptype' indicates which operation(sort or hash) to perform
*/
static Temp *
-make_temp(List * tlist,
- List * keys,
- Oid * operators,
- Plan * plan_node,
+make_temp(List *tlist,
+ List *keys,
+ Oid *operators,
+ Plan *plan_node,
int temptype)
{
List *temp_tlist;
@@ -936,10 +936,10 @@ make_temp(List * tlist,
SeqScan *
-make_seqscan(List * qptlist,
- List * qpqual,
+make_seqscan(List *qptlist,
+ List *qpqual,
Index scanrelid,
- Plan * lefttree)
+ Plan *lefttree)
{
SeqScan *node = makeNode(SeqScan);
Plan *plan = &node->plan;
@@ -957,11 +957,11 @@ make_seqscan(List * qptlist,
}
static IndexScan *
-make_indexscan(List * qptlist,
- List * qpqual,
+make_indexscan(List *qptlist,
+ List *qpqual,
Index scanrelid,
- List * indxid,
- List * indxqual)
+ List *indxid,
+ List *indxqual)
{
IndexScan *node = makeNode(IndexScan);
Plan *plan = &node->scan.plan;
@@ -982,10 +982,10 @@ make_indexscan(List * qptlist,
static NestLoop *
-make_nestloop(List * qptlist,
- List * qpqual,
- Plan * lefttree,
- Plan * righttree)
+make_nestloop(List *qptlist,
+ List *qpqual,
+ Plan *lefttree,
+ Plan *righttree)
{
NestLoop *node = makeNode(NestLoop);
Plan *plan = &node->join;
@@ -1002,11 +1002,11 @@ make_nestloop(List * qptlist,
}
static HashJoin *
-make_hashjoin(List * tlist,
- List * qpqual,
- List * hashclauses,
- Plan * lefttree,
- Plan * righttree)
+make_hashjoin(List *tlist,
+ List *qpqual,
+ List *hashclauses,
+ Plan *lefttree,
+ Plan *righttree)
{
HashJoin *node = makeNode(HashJoin);
Plan *plan = &node->join;
@@ -1027,7 +1027,7 @@ make_hashjoin(List * tlist,
}
static Hash *
-make_hash(List * tlist, Var * hashkey, Plan * lefttree)
+make_hash(List *tlist, Var *hashkey, Plan *lefttree)
{
Hash *node = makeNode(Hash);
Plan *plan = &node->plan;
@@ -1047,14 +1047,14 @@ make_hash(List * tlist, Var * hashkey, Plan * lefttree)
}
static MergeJoin *
-make_mergesort(List * tlist,
- List * qpqual,
- List * mergeclauses,
+make_mergesort(List *tlist,
+ List *qpqual,
+ List *mergeclauses,
Oid opcode,
- Oid * rightorder,
- Oid * leftorder,
- Plan * righttree,
- Plan * lefttree)
+ Oid *rightorder,
+ Oid *leftorder,
+ Plan *righttree,
+ Plan *lefttree)
{
MergeJoin *node = makeNode(MergeJoin);
Plan *plan = &node->join;
@@ -1074,7 +1074,7 @@ make_mergesort(List * tlist,
}
Sort *
-make_sort(List * tlist, Oid tempid, Plan * lefttree, int keycount)
+make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount)
{
Sort *node = makeNode(Sort);
Plan *plan = &node->plan;
@@ -1092,9 +1092,9 @@ make_sort(List * tlist, Oid tempid, Plan * lefttree, int keycount)
}
static Material *
-make_material(List * tlist,
+make_material(List *tlist,
Oid tempid,
- Plan * lefttree,
+ Plan *lefttree,
int keycount)
{
Material *node = makeNode(Material);
@@ -1113,7 +1113,7 @@ make_material(List * tlist,
}
Agg *
-make_agg(List * tlist, int nagg, Aggreg **aggs)
+make_agg(List *tlist, int nagg, Aggreg **aggs)
{
Agg *node = makeNode(Agg);
@@ -1130,11 +1130,11 @@ make_agg(List * tlist, int nagg, Aggreg **aggs)
}
Group *
-make_group(List * tlist,
+make_group(List *tlist,
bool tuplePerGroup,
int ngrp,
AttrNumber *grpColIdx,
- Sort * lefttree)
+ Sort *lefttree)
{
Group *node = makeNode(Group);
@@ -1160,7 +1160,7 @@ make_group(List * tlist,
*/
Unique *
-make_unique(List * tlist, Plan * lefttree, char *uniqueAttr)
+make_unique(List *tlist, Plan *lefttree, char *uniqueAttr)
{
Unique *node = makeNode(Unique);
Plan *plan = &node->plan;
@@ -1183,7 +1183,7 @@ make_unique(List * tlist, Plan * lefttree, char *uniqueAttr)
}
List *
-generate_fjoin(List * tlist)
+generate_fjoin(List *tlist)
{
#if 0
List tlistP;
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index ebc2324d7f583795839e96a4d9262c9d0535870d..d7edd0aaea0cf7137c0e4dfc0de2c8c46b9cefa8 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.7 1997/09/08 02:24:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.8 1997/09/08 21:45:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,14 +35,14 @@
extern int Quiet;
-static void add_clause_to_rels(Query * root, List * clause);
+static void add_clause_to_rels(Query *root, List *clause);
static void
-add_join_clause_info_to_rels(Query * root, CInfo * clauseinfo,
- List * join_relids);
-static void add_vars_to_rels(Query * root, List * vars, List * join_relids);
+add_join_clause_info_to_rels(Query *root, CInfo *clauseinfo,
+ List *join_relids);
+static void add_vars_to_rels(Query *root, List *vars, List *join_relids);
-static MergeOrder *mergesortop(Expr * clause);
-static Oid hashjoinop(Expr * clause);
+static MergeOrder *mergesortop(Expr *clause);
+static Oid hashjoinop(Expr *clause);
/*****************************************************************************
@@ -61,7 +61,7 @@ static Oid hashjoinop(Expr * clause);
* Returns nothing.
*/
void
-initialize_base_rels_list(Query * root, List * tlist)
+initialize_base_rels_list(Query *root, List *tlist)
{
List *tlist_vars = NIL;
List *l = NIL;
@@ -98,7 +98,7 @@ initialize_base_rels_list(Query * root, List * tlist)
* into a join.
*/
void
-add_missing_vars_to_base_rels(Query * root, List * tlist)
+add_missing_vars_to_base_rels(Query *root, List *tlist)
{
List *l;
int varno;
@@ -145,7 +145,7 @@ add_missing_vars_to_base_rels(Query * root, List * tlist)
* Returns nothing of interest.
*/
void
-initialize_base_rels_jinfo(Query * root, List * clauses)
+initialize_base_rels_jinfo(Query *root, List *clauses)
{
List *clause;
@@ -166,7 +166,7 @@ initialize_base_rels_jinfo(Query * root, List * clauses)
* Returns nothing of interest.
*/
static void
-add_clause_to_rels(Query * root, List * clause)
+add_clause_to_rels(Query *root, List *clause)
{
List *relids;
List *vars;
@@ -259,7 +259,7 @@ add_clause_to_rels(Query * root, List * clause)
*
*/
static void
-add_join_clause_info_to_rels(Query * root, CInfo * clauseinfo, List * join_relids)
+add_join_clause_info_to_rels(Query *root, CInfo *clauseinfo, List *join_relids)
{
List *join_relid;
@@ -300,7 +300,7 @@ add_join_clause_info_to_rels(Query * root, CInfo * clauseinfo, List * join_relid
* Returns nothing.
*/
static void
-add_vars_to_rels(Query * root, List * vars, List * join_relids)
+add_vars_to_rels(Query *root, List *vars, List *join_relids)
{
Var *var;
List *temp = NIL;
@@ -334,7 +334,7 @@ add_vars_to_rels(Query * root, List * vars, List * join_relids)
* Returns nothing.
*/
void
-initialize_join_clause_info(List * rel_list)
+initialize_join_clause_info(List *rel_list)
{
List *x,
*y,
@@ -387,7 +387,7 @@ initialize_join_clause_info(List * rel_list)
* a mergesortable operator.
*/
static MergeOrder *
-mergesortop(Expr * clause)
+mergesortop(Expr *clause)
{
Oid leftOp,
rightOp;
@@ -421,7 +421,7 @@ mergesortop(Expr * clause)
* a hashjoinable operator.
*/
static Oid
-hashjoinop(Expr * clause)
+hashjoinop(Expr *clause)
{
return (op_hashjoinable(((Oper *) clause->oper)->opno,
(get_leftop(clause))->vartype,
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 029b34a24e72dabe4b2b6d3eeb548cd8cd13ff96..55cd710f420ac7390f727b56eb59b8e11034accd 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.6 1997/09/08 02:24:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.7 1997/09/08 21:45:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,12 +38,12 @@
#include "utils/mcxt.h"
#include "utils/lsyscache.h"
-static Plan *subplanner(Query * root, List * flat_tlist, List * qual);
-static Result *make_result(List * tlist, Node * resconstantqual, Plan * subplan);
+static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
+static Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
static Plan *
-make_groupPlan(List ** tlist, bool tuplePerGroup,
- List * groupClause, Plan * subplan);
+make_groupPlan(List **tlist, bool tuplePerGroup,
+ List *groupClause, Plan *subplan);
/*
* query_planner--
@@ -63,10 +63,10 @@ make_groupPlan(List ** tlist, bool tuplePerGroup,
* Returns a query plan.
*/
Plan *
-query_planner(Query * root,
+query_planner(Query *root,
int command_type,
- List * tlist,
- List * qual)
+ List *tlist,
+ List *qual)
{
List *constant_qual = NIL;
List *flattened_tlist = NIL;
@@ -278,9 +278,9 @@ query_planner(Query * root,
*
*/
static Plan *
-subplanner(Query * root,
- List * flat_tlist,
- List * qual)
+subplanner(Query *root,
+ List *flat_tlist,
+ List *qual)
{
Rel *final_relation;
List *final_relation_list;
@@ -354,9 +354,9 @@ subplanner(Query * root,
*****************************************************************************/
static Result *
-make_result(List * tlist,
- Node * resconstantqual,
- Plan * subplan)
+make_result(List *tlist,
+ Node *resconstantqual,
+ Plan *subplan)
{
Result *node = makeNode(Result);
Plan *plan = &node->plan;
@@ -378,10 +378,10 @@ make_result(List * tlist,
*****************************************************************************/
static Plan *
-make_groupPlan(List ** tlist,
+make_groupPlan(List **tlist,
bool tuplePerGroup,
- List * groupClause,
- Plan * subplan)
+ List *groupClause,
+ Plan *subplan)
{
List *sort_tlist;
List *sl,
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 72352646b71105b5a52c3b104c72f3abfe0ecac3..3fbc28cb8820a007a2ff21171f54ba2d84f22b97 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.8 1997/09/08 02:24:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.9 1997/09/08 21:45:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,9 +47,9 @@
#include "executor/executor.h"
-static Plan *make_sortplan(List * tlist, List * sortcls, Plan * plannode);
-static Plan *init_query_planner(Query * parse);
-static Existential *make_existential(Plan * left, Plan * right);
+static Plan *make_sortplan(List *tlist, List *sortcls, Plan *plannode);
+static Plan *init_query_planner(Query *parse);
+static Existential *make_existential(Plan *left, Plan *right);
/*****************************************************************************
*
@@ -69,7 +69,7 @@ static Existential *make_existential(Plan * left, Plan * right);
*
*/
Plan *
-planner(Query * parse)
+planner(Query *parse)
{
List *tlist = parse->targetList;
List *rangetable = parse->rtable;
@@ -143,7 +143,7 @@ planner(Query * parse)
* sortops: (sortop1 sortop2 sortop3 ...)
*/
static Plan *
-make_sortplan(List * tlist, List * sortcls, Plan * plannode)
+make_sortplan(List *tlist, List *sortcls, Plan *plannode)
{
Plan *sortplan = (Plan *) NULL;
List *temp_tlist = NIL;
@@ -204,7 +204,7 @@ make_sortplan(List * tlist, List * sortcls, Plan * plannode)
*
*/
static Plan *
-init_query_planner(Query * root)
+init_query_planner(Query *root)
{
List *primary_qual;
List *existential_qual;
@@ -254,7 +254,7 @@ init_query_planner(Query * root)
* the left and right subtree slots.
*/
static Existential *
-make_existential(Plan * left, Plan * right)
+make_existential(Plan *left, Plan *right)
{
Existential *node = makeNode(Existential);
@@ -273,7 +273,7 @@ make_existential(Plan * left, Plan * right)
* type he claims.
*/
void
-pg_checkretval(Oid rettype, QueryTreeList * queryTreeList)
+pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
{
Query *parse;
List *tlist;
@@ -399,6 +399,7 @@ pg_checkretval(Oid rettype, QueryTreeList * queryTreeList)
tletype = (Oid) ((Param *) thenode)->paramtype;
else if (IsA(thenode, Expr))
tletype = Expr;
+
else if (IsA(thenode, LispList))
{
thenode = lfirst(thenode);
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index bc4e8cdbe61854c1380db615808c8209d943e2b5..b6afa5fcb924bcb6e2dc318362b97afc4e4646c5 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.7 1997/09/08 20:56:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.8 1997/09/08 21:45:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,20 +33,20 @@
#include "optimizer/var.h"
#include "optimizer/tlist.h"
-static void set_join_tlist_references(Join * join);
-static void set_tempscan_tlist_references(SeqScan * tempscan);
-static void set_temp_tlist_references(Temp * temp);
+static void set_join_tlist_references(Join *join);
+static void set_tempscan_tlist_references(SeqScan *tempscan);
+static void set_temp_tlist_references(Temp *temp);
static List *
-replace_clause_joinvar_refs(Expr * clause,
- List * outer_tlist, List * inner_tlist);
+replace_clause_joinvar_refs(Expr *clause,
+ List *outer_tlist, List *inner_tlist);
static List *
-replace_subclause_joinvar_refs(List * clauses,
- List * outer_tlist, List * inner_tlist);
-static Var *replace_joinvar_refs(Var * var, List * outer_tlist, List * inner_tlist);
-static List *tlist_temp_references(Oid tempid, List * tlist);
-static void replace_result_clause(List * clause, List * subplanTargetList);
-static bool OperandIsInner(Node * opnd, int inner_relid);
-static void replace_agg_clause(Node * expr, List * targetlist);
+replace_subclause_joinvar_refs(List *clauses,
+ List *outer_tlist, List *inner_tlist);
+static Var *replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist);
+static List *tlist_temp_references(Oid tempid, List *tlist);
+static void replace_result_clause(List *clause, List *subplanTargetList);
+static bool OperandIsInner(Node *opnd, int inner_relid);
+static void replace_agg_clause(Node *expr, List *targetlist);
/*****************************************************************************
*
@@ -66,7 +66,7 @@ static void replace_agg_clause(Node * expr, List * targetlist);
*
*/
void
-set_tlist_references(Plan * plan)
+set_tlist_references(Plan *plan)
{
if (plan == NULL)
return;
@@ -75,7 +75,7 @@ set_tlist_references(Plan * plan)
{
set_join_tlist_references((Join *) plan);
}
- else if (IsA(plan, SeqScan) && plan->lefttree &&
+ else if (IsA(plan, SeqScan) &&plan->lefttree &&
IsA_Temp(plan->lefttree))
{
set_tempscan_tlist_references((SeqScan *) plan);
@@ -120,7 +120,7 @@ set_tlist_references(Plan * plan)
*
*/
static void
-set_join_tlist_references(Join * join)
+set_join_tlist_references(Join *join)
{
Plan *outer = ((Plan *) join)->lefttree;
Plan *inner = ((Plan *) join)->righttree;
@@ -165,7 +165,7 @@ set_join_tlist_references(Join * join)
*
*/
static void
-set_tempscan_tlist_references(SeqScan * tempscan)
+set_tempscan_tlist_references(SeqScan *tempscan)
{
Temp *temp = (Temp *) ((Plan *) tempscan)->lefttree;
@@ -187,7 +187,7 @@ set_tempscan_tlist_references(SeqScan * tempscan)
*
*/
static void
-set_temp_tlist_references(Temp * temp)
+set_temp_tlist_references(Temp *temp)
{
Plan *source = ((Plan *) temp)->lefttree;
@@ -218,9 +218,9 @@ set_temp_tlist_references(Temp * temp)
*
*/
List *
-join_references(List * clauses,
- List * outer_tlist,
- List * inner_tlist)
+join_references(List *clauses,
+ List *outer_tlist,
+ List *inner_tlist)
{
return (replace_subclause_joinvar_refs(clauses,
outer_tlist,
@@ -244,8 +244,8 @@ join_references(List * clauses,
*
*/
List *
-index_outerjoin_references(List * inner_indxqual,
- List * outer_tlist,
+index_outerjoin_references(List *inner_indxqual,
+ List *outer_tlist,
Index inner_relid)
{
List *t_list = NIL;
@@ -307,9 +307,9 @@ index_outerjoin_references(List * inner_indxqual,
*
*/
static List *
-replace_clause_joinvar_refs(Expr * clause,
- List * outer_tlist,
- List * inner_tlist)
+replace_clause_joinvar_refs(Expr *clause,
+ List *outer_tlist,
+ List *inner_tlist)
{
List *temp = NULL;
@@ -402,9 +402,9 @@ replace_clause_joinvar_refs(Expr * clause,
}
static List *
-replace_subclause_joinvar_refs(List * clauses,
- List * outer_tlist,
- List * inner_tlist)
+replace_subclause_joinvar_refs(List *clauses,
+ List *outer_tlist,
+ List *inner_tlist)
{
List *t_list = NIL;
List *temp = NIL;
@@ -421,7 +421,7 @@ replace_subclause_joinvar_refs(List * clauses,
}
static Var *
-replace_joinvar_refs(Var * var, List * outer_tlist, List * inner_tlist)
+replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist)
{
Resdom *outer_resdom = (Resdom *) NULL;
@@ -468,7 +468,7 @@ replace_joinvar_refs(Var * var, List * outer_tlist, List * inner_tlist)
*/
static List *
tlist_temp_references(Oid tempid,
- List * tlist)
+ List *tlist)
{
List *t_list = NIL;
TargetEntry *temp = (TargetEntry *) NULL;
@@ -511,7 +511,7 @@ tlist_temp_references(Oid tempid,
* fields....
*/
void
-set_result_tlist_references(Result * resultNode)
+set_result_tlist_references(Result *resultNode)
{
Plan *subplan;
List *resultTargetList;
@@ -560,8 +560,8 @@ set_result_tlist_references(Result * resultNode)
*
*/
static void
-replace_result_clause(List * clause,
- List * subplanTargetList) /* target list of the
+replace_result_clause(List *clause,
+ List *subplanTargetList) /* target list of the
* subplan */
{
List *t;
@@ -631,7 +631,7 @@ replace_result_clause(List * clause,
subClause = (List *) get_rightop((Expr *) clause);
replace_result_clause(subClause, subplanTargetList);
}
- else if (IsA(clause, Param) || IsA(clause, Const))
+ else if (IsA(clause, Param) ||IsA(clause, Const))
{
/* do nothing! */
}
@@ -646,8 +646,8 @@ replace_result_clause(List * clause,
}
static
- bool
-OperandIsInner(Node * opnd, int inner_relid)
+bool
+OperandIsInner(Node *opnd, int inner_relid)
{
/*
@@ -720,7 +720,7 @@ set_agg_agglist_references(Agg *aggNode)
}
static void
-replace_agg_clause(Node * clause, List * subplanTargetList)
+replace_agg_clause(Node *clause, List *subplanTargetList)
{
List *t;
TargetEntry *subplanVar;
@@ -789,7 +789,7 @@ replace_agg_clause(Node * clause, List * subplanTargetList)
if (right != (Node *) NULL)
replace_agg_clause(right, subplanTargetList);
}
- else if (IsA(clause, Param) || IsA(clause, Const))
+ else if (IsA(clause, Param) ||IsA(clause, Const))
{
/* do nothing! */
}
diff --git a/src/backend/optimizer/prep/archive.c b/src/backend/optimizer/prep/archive.c
index 64a1b1c84d960715149c75660ef0e3b4d948d5a5..d053bd61a3d4d38c12eefd309223715123808838 100644
--- a/src/backend/optimizer/prep/archive.c
+++ b/src/backend/optimizer/prep/archive.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Attic/archive.c,v 1.3 1997/09/08 02:24:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Attic/archive.c,v 1.4 1997/09/08 21:45:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
#include "commands/creatinh.h"
void
-plan_archive(List * rt)
+plan_archive(List *rt)
{
List *rtitem;
RangeTblEntry *rte;
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index 47a44d019675757a33f1b396e551eab1aedcfbe8..b8313f56cb7428fd6ab7f39e862ccc4da7ec13d3 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.5 1997/09/08 02:24:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.6 1997/09/08 21:45:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,17 +24,17 @@
#include "utils/lsyscache.h"
-static Expr *pull_args(Expr * qual);
-static List *pull_ors(List * orlist);
-static List *pull_ands(List * andlist);
-static Expr *find_nots(Expr * qual);
-static Expr *push_nots(Expr * qual);
-static Expr *normalize(Expr * qual);
-static List *or_normalize(List * orlist);
-static List *distribute_args(List * item, List * args);
-static List *qualcleanup(Expr * qual);
-static List *remove_ands(Expr * qual);
-static List *remove_duplicates(List * list);
+static Expr *pull_args(Expr *qual);
+static List *pull_ors(List *orlist);
+static List *pull_ands(List *andlist);
+static Expr *find_nots(Expr *qual);
+static Expr *push_nots(Expr *qual);
+static Expr *normalize(Expr *qual);
+static List *or_normalize(List *orlist);
+static List *distribute_args(List *item, List *args);
+static List *qualcleanup(Expr *qual);
+static List *remove_ands(Expr *qual);
+static List *remove_duplicates(List *list);
/*
* preprocess-qualification--
@@ -48,7 +48,7 @@ static List *remove_duplicates(List * list);
* normal form (see cnfify() below )
*/
List *
-preprocess_qualification(Expr * qual, List * tlist, List ** existentialQualPtr)
+preprocess_qualification(Expr *qual, List *tlist, List **existentialQualPtr)
{
List *cnf_qual = cnfify(qual, true);
@@ -101,7 +101,7 @@ preprocess_qualification(Expr * qual, List * tlist, List ** existentialQualPtr)
*
*/
List *
-cnfify(Expr * qual, bool removeAndFlag)
+cnfify(Expr *qual, bool removeAndFlag)
{
Expr *newqual = NULL;
@@ -134,7 +134,7 @@ cnfify(Expr * qual, bool removeAndFlag)
*
*/
static Expr *
-pull_args(Expr * qual)
+pull_args(Expr *qual)
{
if (qual == NULL)
return (NULL);
@@ -182,7 +182,7 @@ pull_args(Expr * qual)
* Returns the modified list.
*/
static List *
-pull_ors(List * orlist)
+pull_ors(List *orlist)
{
if (orlist == NIL)
return (NIL);
@@ -208,7 +208,7 @@ pull_ors(List * orlist)
* Returns the modified list.
*/
static List *
-pull_ands(List * andlist)
+pull_ands(List *andlist)
{
if (andlist == NIL)
return (NIL);
@@ -237,7 +237,7 @@ pull_ands(List * andlist)
*
*/
static Expr *
-find_nots(Expr * qual)
+find_nots(Expr *qual)
{
if (qual == NULL)
return (NULL);
@@ -286,7 +286,7 @@ find_nots(Expr * qual)
*
*/
static Expr *
-push_nots(Expr * qual)
+push_nots(Expr *qual)
{
if (qual == NULL)
return (NULL);
@@ -373,7 +373,7 @@ push_nots(Expr * qual)
*
*/
static Expr *
-normalize(Expr * qual)
+normalize(Expr *qual)
{
if (qual == NULL)
return (NULL);
@@ -438,7 +438,7 @@ normalize(Expr * qual)
*
*/
static List *
-or_normalize(List * orlist)
+or_normalize(List *orlist)
{
List *distributable = NIL;
List *new_orlist = NIL;
@@ -477,7 +477,7 @@ or_normalize(List * orlist)
*
*/
static List *
-distribute_args(List * item, List * args)
+distribute_args(List *item, List *args)
{
List *or_list = NIL;
List *n_list = NIL;
@@ -507,7 +507,7 @@ distribute_args(List * item, List * args)
*
*/
static List *
-qualcleanup(Expr * qual)
+qualcleanup(Expr *qual)
{
if (qual == NULL)
return (NIL);
@@ -568,7 +568,7 @@ qualcleanup(Expr * qual)
* MODIFIES: qual
*/
static List *
-remove_ands(Expr * qual)
+remove_ands(Expr *qual)
{
List *t_list = NIL;
@@ -621,7 +621,7 @@ remove_ands(Expr * qual)
*/
#ifdef NOT_USED
static List *
-update_relations(List * tlist)
+update_relations(List *tlist)
{
return (NIL);
}
@@ -635,7 +635,7 @@ update_relations(List * tlist)
*****************************************************************************/
static List *
-remove_duplicates(List * list)
+remove_duplicates(List *list)
{
List *i;
List *j;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 550dad8f94b47d28649dd319cf40a4fc813d52b0..0010c69d6abe4a7e2d628ca3169f1d65aac03ed9 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.4 1997/09/08 02:24:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.5 1997/09/08 21:45:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,11 +34,11 @@
#include "optimizer/tlist.h"
static List *
-expand_targetlist(List * tlist, Oid relid, int command_type,
+expand_targetlist(List *tlist, Oid relid, int command_type,
Index result_relation);
static List *
-replace_matching_resname(List * new_tlist,
- List * old_tlist);
+replace_matching_resname(List *new_tlist,
+ List *old_tlist);
static List *
new_relation_targetlist(Oid relid, Index rt_index,
NodeTag node_type);
@@ -55,10 +55,10 @@ new_relation_targetlist(Oid relid, Index rt_index,
* Returns the new targetlist.
*/
List *
-preprocess_targetlist(List * tlist,
+preprocess_targetlist(List *tlist,
int command_type,
Index result_relation,
- List * range_table)
+ List *range_table)
{
List *expanded_tlist = NIL;
Oid relid = InvalidOid;
@@ -144,7 +144,7 @@ preprocess_targetlist(List * tlist,
* Returns the expanded target list, sorted in resno order.
*/
static List *
-expand_targetlist(List * tlist,
+expand_targetlist(List *tlist,
Oid relid,
int command_type,
Index result_relation)
@@ -178,7 +178,7 @@ expand_targetlist(List * tlist,
static List *
-replace_matching_resname(List * new_tlist, List * old_tlist)
+replace_matching_resname(List *new_tlist, List *old_tlist)
{
List *temp,
*i;
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 39e539b223b18ba872f8d37d52862de2c03bebef..aac995901f85bba1970c5e5e472c8c0bc16602b0 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.5 1997/09/08 02:24:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.6 1997/09/08 21:45:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,21 +35,21 @@
#include "optimizer/prep.h"
static List *
-plan_union_query(List * relids, Index rt_index,
- RangeTblEntry * rt_entry, Query * parse, UnionFlag flag,
- List ** union_rtentriesPtr);
+plan_union_query(List *relids, Index rt_index,
+ RangeTblEntry *rt_entry, Query *parse, UnionFlag flag,
+ List **union_rtentriesPtr);
static RangeTblEntry *
new_rangetable_entry(Oid new_relid,
- RangeTblEntry * old_entry);
+ RangeTblEntry *old_entry);
static Query *
-subst_rangetable(Query * root, Index index,
- RangeTblEntry * new_entry);
+subst_rangetable(Query *root, Index index,
+ RangeTblEntry *new_entry);
static void
fix_parsetree_attnums(Index rt_index, Oid old_relid,
- Oid new_relid, Query * parsetree);
+ Oid new_relid, Query *parsetree);
static Append *
-make_append(List * unionplans, Index rt_index,
- List * union_rt_entries, List * tlist);
+make_append(List *unionplans, Index rt_index,
+ List *union_rt_entries, List *tlist);
/*
@@ -59,8 +59,8 @@ make_append(List * unionplans, Index rt_index,
* lists.
*/
List *
-find_all_inheritors(List * unexamined_relids,
- List * examined_relids)
+find_all_inheritors(List *unexamined_relids,
+ List *examined_relids)
{
List *new_inheritors = NIL;
List *new_examined_relids = NIL;
@@ -103,7 +103,7 @@ find_all_inheritors(List * unexamined_relids,
* Returns a rangetable index., Returns -1 if no matches
*/
int
-first_matching_rt_entry(List * rangetable, UnionFlag flag)
+first_matching_rt_entry(List *rangetable, UnionFlag flag)
{
int count = 0;
List *temp = NIL;
@@ -143,7 +143,7 @@ first_matching_rt_entry(List * rangetable, UnionFlag flag)
*/
Append *
plan_union_queries(Index rt_index,
- Query * parse,
+ Query *parse,
UnionFlag flag)
{
List *rangetable = parse->rtable;
@@ -226,12 +226,12 @@ plan_union_queries(Index rt_index,
* in union_rtentries.
*/
static List *
-plan_union_query(List * relids,
+plan_union_query(List *relids,
Index rt_index,
- RangeTblEntry * rt_entry,
- Query * root,
+ RangeTblEntry *rt_entry,
+ Query *root,
UnionFlag flag,
- List ** union_rtentriesPtr)
+ List **union_rtentriesPtr)
{
List *i;
List *union_plans = NIL;
@@ -286,7 +286,7 @@ plan_union_query(List * relids,
* Returns a copy of 'old-entry' with the parameters substituted.
*/
static RangeTblEntry *
-new_rangetable_entry(Oid new_relid, RangeTblEntry * old_entry)
+new_rangetable_entry(Oid new_relid, RangeTblEntry *old_entry)
{
RangeTblEntry *new_entry = copyObject(old_entry);
@@ -308,7 +308,7 @@ new_rangetable_entry(Oid new_relid, RangeTblEntry * old_entry)
* Returns a new copy of 'root'.
*/
static Query *
-subst_rangetable(Query * root, Index index, RangeTblEntry * new_entry)
+subst_rangetable(Query *root, Index index, RangeTblEntry *new_entry)
{
Query *new_root = copyObject(root);
List *temp = NIL;
@@ -325,7 +325,7 @@ static void
fix_parsetree_attnums_nodes(Index rt_index,
Oid old_relid,
Oid new_relid,
- Node * node)
+ Node *node)
{
if (node == NULL)
return;
@@ -396,7 +396,7 @@ static void
fix_parsetree_attnums(Index rt_index,
Oid old_relid,
Oid new_relid,
- Query * parsetree)
+ Query *parsetree)
{
if (old_relid == new_relid)
return;
@@ -408,10 +408,10 @@ fix_parsetree_attnums(Index rt_index,
}
static Append *
-make_append(List * unionplans,
+make_append(List *unionplans,
Index rt_index,
- List * union_rt_entries,
- List * tlist)
+ List *union_rt_entries,
+ List *tlist)
{
Append *node = makeNode(Append);
diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c
index 09ea9ae898cb7a3d5c09c54cf398c652676f0820..3dfa5de4f9a942ac50967c87a2c291f56e8bbd5e 100644
--- a/src/backend/optimizer/util/clauseinfo.c
+++ b/src/backend/optimizer/util/clauseinfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.5 1997/09/08 02:24:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.6 1997/09/08 21:45:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
*
*/
bool
-valid_or_clause(CInfo * clauseinfo)
+valid_or_clause(CInfo *clauseinfo)
{
if (clauseinfo != NULL &&
!single_node((Node *) clauseinfo->clause) &&
@@ -45,7 +45,7 @@ valid_or_clause(CInfo * clauseinfo)
*
*/
List *
-get_actual_clauses(List * clauseinfo_list)
+get_actual_clauses(List *clauseinfo_list)
{
List *temp = NIL;
List *result = NIL;
@@ -85,10 +85,10 @@ get_actual_clauses(List * clauseinfo_list)
*
*/
void
-get_relattvals(List * clauseinfo_list,
- List ** attnos,
- List ** values,
- List ** flags)
+get_relattvals(List *clauseinfo_list,
+ List **attnos,
+ List **values,
+ List **flags)
{
List *result1 = NIL;
List *result2 = NIL;
@@ -132,10 +132,10 @@ get_relattvals(List * clauseinfo_list,
*/
void
get_joinvars(Oid relid,
- List * clauseinfo_list,
- List ** attnos,
- List ** values,
- List ** flags)
+ List *clauseinfo_list,
+ List **attnos,
+ List **values,
+ List **flags)
{
List *result1 = NIL;
List *result2 = NIL;
@@ -174,7 +174,7 @@ get_joinvars(Oid relid,
*
*/
List *
-get_opnos(List * clauseinfo_list)
+get_opnos(List *clauseinfo_list)
{
CInfo *temp = (CInfo *) NULL;
List *result = NIL;
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 520b7456674cefc686eedb7a1d1e86b91ff689ef..177466ee83e1e7fe0dea36e77333827fe27799c0 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.10 1997/09/08 20:56:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.11 1997/09/08 21:45:47 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -34,11 +34,11 @@
#include "optimizer/internal.h"
#include "optimizer/var.h"
-static bool agg_clause(Node * clause);
+static bool agg_clause(Node *clause);
Expr *
-make_clause(int type, Node * oper, List * args)
+make_clause(int type, Node *oper, List *args)
{
if (type == AND_EXPR || type == OR_EXPR || type == NOT_EXPR ||
type == OP_EXPR || type == FUNC_EXPR)
@@ -79,11 +79,11 @@ make_clause(int type, Node * oper, List * args)
* - ay 10/94.]
*/
bool
-is_opclause(Node * clause)
+is_opclause(Node *clause)
{
return
- (clause != NULL &&
- nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == OP_EXPR);
+ (clause != NULL &&
+ nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == OP_EXPR);
}
/*
@@ -93,7 +93,7 @@ is_opclause(Node * clause)
*
*/
Expr *
-make_opclause(Oper * op, Var * leftop, Var * rightop)
+make_opclause(Oper *op, Var *leftop, Var *rightop)
{
Expr *expr = makeNode(Expr);
@@ -112,7 +112,7 @@ make_opclause(Oper * op, Var * leftop, Var * rightop)
* NB: it is assumed (for now) that all expr must be Var nodes
*/
Var *
-get_leftop(Expr * clause)
+get_leftop(Expr *clause)
{
if (clause->args != NULL)
return (lfirst(clause->args));
@@ -127,7 +127,7 @@ get_leftop(Expr * clause)
*
*/
Var *
-get_rightop(Expr * clause)
+get_rightop(Expr *clause)
{
if (clause->args != NULL && lnext(clause->args) != NULL)
return (lfirst(lnext(clause->args)));
@@ -140,7 +140,7 @@ get_rightop(Expr * clause)
*****************************************************************************/
static bool
-agg_clause(Node * clause)
+agg_clause(Node *clause)
{
return
(clause != NULL && nodeTag(clause) == T_Aggreg);
@@ -157,11 +157,11 @@ agg_clause(Node * clause)
*
*/
bool
-is_funcclause(Node * clause)
+is_funcclause(Node *clause)
{
return
- (clause != NULL &&
- nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == FUNC_EXPR);
+ (clause != NULL &&
+ nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == FUNC_EXPR);
}
/*
@@ -172,7 +172,7 @@ is_funcclause(Node * clause)
*
*/
Expr *
-make_funcclause(Func * func, List * funcargs)
+make_funcclause(Func *func, List *funcargs)
{
Expr *expr = makeNode(Expr);
@@ -194,11 +194,11 @@ make_funcclause(Func * func, List * funcargs)
*
*/
bool
-or_clause(Node * clause)
+or_clause(Node *clause)
{
return
- (clause != NULL &&
- nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == OR_EXPR);
+ (clause != NULL &&
+ nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == OR_EXPR);
}
/*
@@ -208,7 +208,7 @@ or_clause(Node * clause)
*
*/
Expr *
-make_orclause(List * orclauses)
+make_orclause(List *orclauses)
{
Expr *expr = makeNode(Expr);
@@ -230,10 +230,10 @@ make_orclause(List * orclauses)
*
*/
bool
-not_clause(Node * clause)
+not_clause(Node *clause)
{
return
- (clause != NULL &&
+ (clause != NULL &&
nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == NOT_EXPR);
}
@@ -244,7 +244,7 @@ not_clause(Node * clause)
*
*/
Expr *
-make_notclause(Expr * notclause)
+make_notclause(Expr *notclause)
{
Expr *expr = makeNode(Expr);
@@ -262,7 +262,7 @@ make_notclause(Expr * notclause)
*
*/
Expr *
-get_notclausearg(Expr * notclause)
+get_notclausearg(Expr *notclause)
{
return (lfirst(notclause->args));
}
@@ -279,10 +279,10 @@ get_notclausearg(Expr * notclause)
*
*/
bool
-and_clause(Node * clause)
+and_clause(Node *clause)
{
return
- (clause != NULL &&
+ (clause != NULL &&
nodeTag(clause) == T_Expr && ((Expr *) clause)->opType == AND_EXPR);
}
@@ -293,7 +293,7 @@ and_clause(Node * clause)
*
*/
Expr *
-make_andclause(List * andclauses)
+make_andclause(List *andclauses)
{
Expr *expr = makeNode(Expr);
@@ -321,7 +321,7 @@ make_andclause(List * andclauses)
*
*/
List *
-pull_constant_clauses(List * quals, List ** constantQual)
+pull_constant_clauses(List *quals, List **constantQual)
{
List *q;
List *constqual = NIL;
@@ -356,7 +356,7 @@ pull_constant_clauses(List * quals, List ** constantQual)
*
*/
void
-clause_relids_vars(Node * clause, List ** relids, List ** vars)
+clause_relids_vars(Node *clause, List **relids, List **vars)
{
List *clvars = pull_var_clause(clause);
List *var_list = NIL;
@@ -396,7 +396,7 @@ clause_relids_vars(Node * clause, List ** relids, List ** vars)
* Returns the number of different relations referenced in 'clause'.
*/
int
-NumRelids(Node * clause)
+NumRelids(Node *clause)
{
List *vars = pull_var_clause(clause);
List *i = NIL;
@@ -423,7 +423,7 @@ NumRelids(Node * clause)
*
*/
bool
-contains_not(Node * clause)
+contains_not(Node *clause)
{
if (single_node(clause))
return (false);
@@ -452,7 +452,7 @@ contains_not(Node * clause)
*
*/
bool
-join_clause_p(Node * clause)
+join_clause_p(Node *clause)
{
Node *leftop,
*rightop;
@@ -467,7 +467,7 @@ join_clause_p(Node * clause)
* One side of the clause (i.e. left or right operands) must either be
* a var node ...
*/
- if (IsA(leftop, Var) || IsA(rightop, Var))
+ if (IsA(leftop, Var) ||IsA(rightop, Var))
return true;
/*
@@ -486,7 +486,7 @@ join_clause_p(Node * clause)
*
*/
bool
-qual_clause_p(Node * clause)
+qual_clause_p(Node *clause)
{
if (!is_opclause(clause))
return false;
@@ -512,7 +512,7 @@ qual_clause_p(Node * clause)
*
*/
void
-fix_opid(Node * clause)
+fix_opid(Node *clause)
{
if (clause == NULL || single_node(clause))
{
@@ -560,7 +560,7 @@ fix_opid(Node * clause)
*
*/
List *
-fix_opids(List * clauses)
+fix_opids(List *clauses)
{
List *clause;
@@ -595,10 +595,10 @@ fix_opids(List * clauses)
*
*/
void
-get_relattval(Node * clause,
+get_relattval(Node *clause,
int *relid,
AttrNumber *attno,
- Datum * constval,
+ Datum *constval,
int *flag)
{
Var *left = get_leftop((Expr *) clause);
@@ -628,7 +628,7 @@ get_relattval(Node * clause,
}
#ifdef INDEXSCAN_PATCH
}
- else if (is_opclause(clause) && IsA(left, Var) && IsA(right, Param))
+ else if (is_opclause(clause) && IsA(left, Var) &&IsA(right, Param))
{
/* Function parameter used as index scan arg. DZ - 27-8-1996 */
*relid = left->varno;
@@ -691,7 +691,7 @@ get_relattval(Node * clause,
}
#ifdef INDEXSCAN_PATCH
}
- else if (is_opclause(clause) && IsA(right, Var) && IsA(left, Param))
+ else if (is_opclause(clause) && IsA(right, Var) &&IsA(left, Param))
{
/* ...And here... - vadim 01/22/97 */
*relid = right->varno;
@@ -726,7 +726,7 @@ get_relattval(Node * clause,
*
*/
void
-get_rels_atts(Node * clause,
+get_rels_atts(Node *clause,
int *relid1,
AttrNumber *attno1,
int *relid2,
@@ -736,9 +736,9 @@ get_rels_atts(Node * clause,
Var *right = get_rightop((Expr *) clause);
bool var_left = (IsA(left, Var));
bool var_right = (IsA(right, Var));
- bool varexpr_left = (bool) ((IsA(left, Func) || IsA(left, Oper)) &&
+ bool varexpr_left = (bool) ((IsA(left, Func) ||IsA(left, Oper)) &&
contain_var_clause((Node *) left));
- bool varexpr_right = (bool) ((IsA(right, Func) || IsA(right, Oper)) &&
+ bool varexpr_right = (bool) ((IsA(right, Func) ||IsA(right, Oper)) &&
contain_var_clause((Node *) right));
if (is_opclause(clause))
@@ -780,7 +780,7 @@ get_rels_atts(Node * clause,
}
void
-CommuteClause(Node * clause)
+CommuteClause(Node *clause)
{
Node *temp;
Oper *commu;
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 9714038a8b6f97fb81de054d98136ba2e1726aa2..0c4b370db16c85cca14d9a8fcca813b151815416 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.4 1997/09/08 02:24:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.5 1997/09/08 21:45:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
#include "optimizer/pathnode.h" /* where the decls go */
-static List *find_secondary_index(Query * root, Oid relid);
+static List *find_secondary_index(Query *root, Oid relid);
/*
* find-relation-indices--
@@ -33,7 +33,7 @@ static List *find_secondary_index(Query * root, Oid relid);
*
*/
List *
-find_relation_indices(Query * root, Rel * rel)
+find_relation_indices(Query *root, Rel *rel)
{
if (rel->indexed)
{
@@ -57,7 +57,7 @@ find_relation_indices(Query * root, Rel * rel)
*
*/
static List *
-find_secondary_index(Query * root, Oid relid)
+find_secondary_index(Query *root, Oid relid)
{
IdxInfoRetval indexinfo;
List *indexes = NIL;
diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c
index 31fe034dbb77456b80c6e7bbaf3f5b9f3b2dc98b..258f745a81e4aa5393d403c9b58e46a5a81214ff 100644
--- a/src/backend/optimizer/util/internal.c
+++ b/src/backend/optimizer/util/internal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.5 1997/09/08 02:24:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.6 1997/09/08 21:45:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@
/* the following should probably be moved elsewhere -ay */
TargetEntry *
-MakeTLE(Resdom * resdom, Node * expr)
+MakeTLE(Resdom *resdom, Node *expr)
{
TargetEntry *rt = makeNode(TargetEntry);
@@ -49,7 +49,7 @@ MakeTLE(Resdom * resdom, Node * expr)
}
Var *
-get_expr(TargetEntry * tle)
+get_expr(TargetEntry *tle)
{
Assert(tle != NULL);
Assert(tle->expr != NULL);
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 3f4f990a76f791c67273370bb8f9d6a51ff46c5d..03ec95db618ef5ba95834f1d450a933228b9382a 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.4 1997/09/08 02:24:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.5 1997/09/08 21:45:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,7 +36,7 @@
*
*/
JInfo *
-joininfo_member(List * join_relids, List * joininfo_list)
+joininfo_member(List *join_relids, List *joininfo_list)
{
List *i = NIL;
List *other_rels = NIL;
@@ -62,7 +62,7 @@ joininfo_member(List * join_relids, List * joininfo_list)
*
*/
JInfo *
-find_joininfo_node(Rel * this_rel, List * join_relids)
+find_joininfo_node(Rel *this_rel, List *join_relids)
{
JInfo *joininfo = joininfo_member(join_relids,
this_rel->joininfo);
@@ -89,7 +89,7 @@ find_joininfo_node(Rel * this_rel, List * join_relids)
*
*/
Var *
-other_join_clause_var(Var * var, Expr * clause)
+other_join_clause_var(Var *var, Expr *clause)
{
Var *retval;
Var *l,
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 82d8c6010b5d7f36d1e4857ed28e5db22ed79f47..2699ec98b31836dd9da00d5ec099c14d8eb3e728 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.4 1997/09/08 02:24:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.5 1997/09/08 21:45:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,8 +22,8 @@
#include "optimizer/tlist.h"
-static Expr *matching2_tlvar(int var, List * tlist, bool(*test) ());
-static bool equal_indexkey_var(int index_key, Var * var);
+static Expr *matching2_tlvar(int var, List *tlist, bool (*test) ());
+static bool equal_indexkey_var(int index_key, Var *var);
/*
* 1. index key
@@ -54,7 +54,7 @@ static bool equal_indexkey_var(int index_key, Var * var);
*
*/
bool
-match_indexkey_operand(int indexkey, Var * operand, Rel * rel)
+match_indexkey_operand(int indexkey, Var *operand, Rel *rel)
{
if (IsA(operand, Var) &&
(lfirsti(rel->relids) == operand->varno) &&
@@ -71,7 +71,7 @@ match_indexkey_operand(int indexkey, Var * operand, Rel * rel)
*
*/
static bool
-equal_indexkey_var(int index_key, Var * var)
+equal_indexkey_var(int index_key, Var *var)
{
if (index_key == var->varattno)
return (true);
@@ -86,7 +86,7 @@ equal_indexkey_var(int index_key, Var * var)
*
*/
Var *
-extract_subkey(JoinKey * jk, int which_subkey)
+extract_subkey(JoinKey *jk, int which_subkey)
{
Var *retval;
@@ -118,7 +118,7 @@ extract_subkey(JoinKey * jk, int which_subkey)
*
*/
bool
-samekeys(List * keys1, List * keys2)
+samekeys(List *keys1, List *keys2)
{
bool allmember = true;
List *key1,
@@ -153,7 +153,7 @@ samekeys(List * keys1, List * keys2)
* They should be merged.
*/
static Expr *
-matching2_tlvar(int var, List * tlist, bool(*test) ())
+matching2_tlvar(int var, List *tlist, bool (*test) ())
{
TargetEntry *tlentry = NULL;
@@ -179,7 +179,7 @@ matching2_tlvar(int var, List * tlist, bool(*test) ())
List *
-collect_index_pathkeys(int *index_keys, List * tlist)
+collect_index_pathkeys(int *index_keys, List *tlist)
{
List *retval = NIL;
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index f14d37621831937706b19ceb86cd123cd9b9547b..855f2f7274928afa4431ee1be55b26c7580911f8 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.5 1997/09/08 02:24:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.6 1997/09/08 21:45:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "optimizer/internal.h"
#include "optimizer/ordering.h"
-static bool equal_sortops_order(Oid * ordering1, Oid * ordering2);
+static bool equal_sortops_order(Oid *ordering1, Oid *ordering2);
/*
* equal-path-path-ordering--
@@ -26,8 +26,8 @@ static bool equal_sortops_order(Oid * ordering1, Oid * ordering2);
*
*/
bool
-equal_path_path_ordering(PathOrder * path_ordering1,
- PathOrder * path_ordering2)
+equal_path_path_ordering(PathOrder *path_ordering1,
+ PathOrder *path_ordering2)
{
if (path_ordering1 == path_ordering2)
return true;
@@ -77,8 +77,8 @@ equal_path_path_ordering(PathOrder * path_ordering1,
*
*/
bool
-equal_path_merge_ordering(Oid * path_ordering,
- MergeOrder * merge_ordering)
+equal_path_merge_ordering(Oid *path_ordering,
+ MergeOrder *merge_ordering)
{
if (path_ordering == NULL || merge_ordering == NULL)
return (false);
@@ -96,8 +96,8 @@ equal_path_merge_ordering(Oid * path_ordering,
*
*/
bool
-equal_merge_merge_ordering(MergeOrder * merge_ordering1,
- MergeOrder * merge_ordering2)
+equal_merge_merge_ordering(MergeOrder *merge_ordering1,
+ MergeOrder *merge_ordering2)
{
return (equal(merge_ordering1, merge_ordering2));
}
@@ -111,7 +111,7 @@ equal_merge_merge_ordering(MergeOrder * merge_ordering1,
* Returns true iff the sort operators are in the same order.
*/
static bool
-equal_sortops_order(Oid * ordering1, Oid * ordering2)
+equal_sortops_order(Oid *ordering1, Oid *ordering2)
{
int i = 0;
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index f6242e852ab16fe4d29e86710f119823fe5dacbf..61cd7be84c9262c6fc86a28f49a177d39654e2ec 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.5 1997/09/08 02:24:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.6 1997/09/08 21:45:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
#include "parser/parsetree.h" /* for getrelid() */
-static Path *better_path(Path * new_path, List * unique_paths, bool * noOther);
+static Path *better_path(Path *new_path, List *unique_paths, bool *noOther);
/*****************************************************************************
@@ -42,7 +42,7 @@ static Path *better_path(Path * new_path, List * unique_paths, bool * noOther);
*
*/
bool
-path_is_cheaper(Path * path1, Path * path2)
+path_is_cheaper(Path *path1, Path *path2)
{
Cost cost1 = path1->path_cost;
Cost cost2 = path2->path_cost;
@@ -62,7 +62,7 @@ path_is_cheaper(Path * path1, Path * path2)
*
*/
Path *
-set_cheapest(Rel * parent_rel, List * pathlist)
+set_cheapest(Rel *parent_rel, List *pathlist)
{
List *p;
Path *cheapest_so_far;
@@ -101,7 +101,7 @@ set_cheapest(Rel * parent_rel, List * pathlist)
*
*/
List *
-add_pathlist(Rel * parent_rel, List * unique_paths, List * new_paths)
+add_pathlist(Rel *parent_rel, List *unique_paths, List *new_paths)
{
List *x;
Path *new_path;
@@ -154,7 +154,7 @@ add_pathlist(Rel * parent_rel, List * unique_paths, List * new_paths)
*
*/
static Path *
-better_path(Path * new_path, List * unique_paths, bool * noOther)
+better_path(Path *new_path, List *unique_paths, bool *noOther)
{
Path *old_path = (Path *) NULL;
Path *path = (Path *) NULL;
@@ -208,7 +208,7 @@ better_path(Path * new_path, List * unique_paths, bool * noOther)
*
*/
Path *
-create_seqscan_path(Rel * rel)
+create_seqscan_path(Rel *rel)
{
int relid = 0;
@@ -258,10 +258,10 @@ create_seqscan_path(Rel * rel)
*
*/
IndexPath *
-create_index_path(Query * root,
- Rel * rel,
- Rel * index,
- List * restriction_clauses,
+create_index_path(Query *root,
+ Rel *rel,
+ Rel *index,
+ List *restriction_clauses,
bool is_join_scan)
{
IndexPath *pathnode = makeNode(IndexPath);
@@ -418,11 +418,11 @@ create_index_path(Query * root,
*
*/
JoinPath *
-create_nestloop_path(Rel * joinrel,
- Rel * outer_rel,
- Path * outer_path,
- Path * inner_path,
- List * keys)
+create_nestloop_path(Rel *joinrel,
+ Rel *outer_rel,
+ Path *outer_path,
+ Path *inner_path,
+ List *keys)
{
JoinPath *pathnode = makeNode(JoinPath);
@@ -495,18 +495,18 @@ create_nestloop_path(Rel * joinrel,
*
*/
MergePath *
-create_mergesort_path(Rel * joinrel,
+create_mergesort_path(Rel *joinrel,
int outersize,
int innersize,
int outerwidth,
int innerwidth,
- Path * outer_path,
- Path * inner_path,
- List * keys,
- MergeOrder * order,
- List * mergeclauses,
- List * outersortkeys,
- List * innersortkeys)
+ Path *outer_path,
+ Path *inner_path,
+ List *keys,
+ MergeOrder *order,
+ List *mergeclauses,
+ List *outersortkeys,
+ List *innersortkeys)
{
MergePath *pathnode = makeNode(MergePath);
@@ -561,18 +561,18 @@ create_mergesort_path(Rel * joinrel,
*
*/
HashPath *
-create_hashjoin_path(Rel * joinrel,
+create_hashjoin_path(Rel *joinrel,
int outersize,
int innersize,
int outerwidth,
int innerwidth,
- Path * outer_path,
- Path * inner_path,
- List * keys,
+ Path *outer_path,
+ Path *inner_path,
+ List *keys,
Oid operator,
- List * hashclauses,
- List * outerkeys,
- List * innerkeys)
+ List *hashclauses,
+ List *outerkeys,
+ List *innerkeys)
{
HashPath *pathnode = makeNode(HashPath);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 0957775df0d827c99afe7fb0a31b10e8e3f115f4..826a0e7b8e0df47c7e6bc9cadc242d59df266bad 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.8 1997/09/08 02:25:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.9 1997/09/08 21:45:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,8 +56,8 @@ IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
* number of tuples
*/
void
-relation_info(Query * root, Index relid,
- bool * hasindex, int *pages, int *tuples)
+relation_info(Query *root, Index relid,
+ bool *hasindex, int *pages, int *tuples)
{
HeapTuple relationTuple;
Form_pg_class relation;
@@ -101,7 +101,7 @@ relation_info(Query * root, Index relid,
*
*/
bool
-index_info(Query * root, bool first, int relid, IdxInfoRetval * info)
+index_info(Query *root, bool first, int relid, IdxInfoRetval *info)
{
register i;
HeapTuple indexTuple,
@@ -246,12 +246,12 @@ index_info(Query * root, bool first, int relid, IdxInfoRetval * info)
*/
void
index_selectivity(Oid indid,
- Oid * classes,
- List * opnos,
+ Oid *classes,
+ List *opnos,
Oid relid,
- List * attnos,
- List * values,
- List * flags,
+ List *attnos,
+ List *values,
+ List *flags,
int32 nkeys,
float *idxPages,
float *idxSelec)
@@ -355,7 +355,7 @@ restriction_selectivity(Oid functionObjectId,
elog(WARN, "RestrictionClauseSelectivity: bad value %lf",
*result);
- return ((Cost) * result);
+ return ((Cost) *result);
}
/*
@@ -394,7 +394,7 @@ join_selectivity(Oid functionObjectId,
elog(WARN, "JoinClauseSelectivity: bad value %lf",
*result);
- return ((Cost) * result);
+ return ((Cost) *result);
}
/*
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 98f3de94399e0a3f2607fbf5d8ff6db0f10aae82..dc242e531e6f50f0e0b42fe97e311141cce117c6 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.3 1997/09/08 02:25:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.4 1997/09/08 21:45:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@
*
*/
Rel *
-get_base_rel(Query * root, int relid)
+get_base_rel(Query *root, int relid)
{
List *relids;
Rel *rel;
@@ -101,7 +101,7 @@ get_base_rel(Query * root, int relid)
*
*/
Rel *
-get_join_rel(Query * root, List * relid)
+get_join_rel(Query *root, List *relid)
{
return rel_member(relid, root->join_relation_list_);
}
@@ -115,7 +115,7 @@ get_join_rel(Query * root, List * relid)
*
*/
Rel *
-rel_member(List * relid, List * rels)
+rel_member(List *relid, List *rels)
{
List *temp = NIL;
List *temprelid = NIL;
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index d9307e6d5bb5d0eebf05c701d71027ec6b270cef..089633033b154185de0d4d240e3959b7eca09940 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.6 1997/09/08 02:25:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.7 1997/09/08 21:45:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@
#include "nodes/makefuncs.h"
#include "parser/catalog_utils.h"
-static Node *flatten_tlistentry(Node * tlistentry, List * flat_tlist);
+static Node *flatten_tlistentry(Node *tlistentry, List *flat_tlist);
/*****************************************************************************
* ---------- RELATION node target list routines ----------
@@ -45,7 +45,7 @@ static Node *flatten_tlistentry(Node * tlistentry, List * flat_tlist);
* targetlist = valid sequence
*/
TargetEntry *
-tlistentry_member(Var * var, List * targetlist)
+tlistentry_member(Var *var, List *targetlist)
{
if (var)
{
@@ -70,7 +70,7 @@ tlistentry_member(Var * var, List * targetlist)
*
*/
Expr *
-matching_tlvar(Var * var, List * targetlist)
+matching_tlvar(Var *var, List *targetlist)
{
TargetEntry *tlentry;
@@ -94,7 +94,7 @@ matching_tlvar(Var * var, List * targetlist)
* CREATES: new var-node iff no matching var-node exists in targetlist
*/
void
-add_tl_element(Rel * rel, Var * var)
+add_tl_element(Rel *rel, Var *var)
{
Expr *oldvar = (Expr *) NULL;
@@ -130,7 +130,7 @@ add_tl_element(Rel * rel, Var * var)
* CREATES: new targetlist entry (always).
*/
TargetEntry *
-create_tl_element(Var * var, int resdomno)
+create_tl_element(Var *var, int resdomno)
{
TargetEntry *tlelement = makeNode(TargetEntry);
@@ -153,7 +153,7 @@ create_tl_element(Var * var, int resdomno)
*
*/
List *
-get_actual_tlist(List * tlist)
+get_actual_tlist(List *tlist)
{
/*
@@ -200,7 +200,7 @@ get_actual_tlist(List * tlist)
*
*/
Resdom *
-tlist_member(Var * var, List * tlist)
+tlist_member(Var *var, List *tlist)
{
List *i = NIL;
TargetEntry *temp_tle = (TargetEntry *) NULL;
@@ -230,7 +230,7 @@ tlist_member(Var * var, List * tlist)
* Routine to get the resdom out of a targetlist.
*/
Resdom *
-tlist_resdom(List * tlist, Resdom * resnode)
+tlist_resdom(List *tlist, Resdom *resnode)
{
Resdom *resdom = (Resdom *) NULL;
List *i = NIL;
@@ -265,7 +265,7 @@ tlist_resdom(List * tlist, Resdom * resnode)
* varoattno. Also, nested attnos are long gone. - ay 2/95]
*/
TargetEntry *
-match_varid(Var * test_var, List * tlist)
+match_varid(Var *test_var, List *tlist)
{
List *tl;
Oid type_var;
@@ -311,7 +311,7 @@ match_varid(Var * test_var, List * tlist)
*
*/
List *
-new_unsorted_tlist(List * targetlist)
+new_unsorted_tlist(List *targetlist)
{
List *new_targetlist = (List *) copyObject((Node *) targetlist);
List *x = NIL;
@@ -339,7 +339,7 @@ new_unsorted_tlist(List * targetlist)
*
*/
List *
-copy_vars(List * target, List * source)
+copy_vars(List *target, List *source)
{
List *result = NIL;
List *src = NIL;
@@ -367,7 +367,7 @@ copy_vars(List * target, List * source)
*
*/
List *
-flatten_tlist(List * tlist)
+flatten_tlist(List *tlist)
{
int last_resdomno = 1;
List *new_tlist = NIL;
@@ -423,7 +423,7 @@ flatten_tlist(List * tlist)
*
*/
List *
-flatten_tlist_vars(List * full_tlist, List * flat_tlist)
+flatten_tlist_vars(List *full_tlist, List *flat_tlist)
{
List *x = NIL;
List *result = NIL;
@@ -454,7 +454,7 @@ flatten_tlist_vars(List * full_tlist, List * flat_tlist)
*
*/
static Node *
-flatten_tlistentry(Node * tlistentry, List * flat_tlist)
+flatten_tlistentry(Node *tlistentry, List *flat_tlist)
{
if (tlistentry == NULL)
{
@@ -544,7 +544,7 @@ flatten_tlistentry(Node * tlistentry, List * flat_tlist)
TargetEntry *
-MakeTLE(Resdom * resdom, Node * expr)
+MakeTLE(Resdom *resdom, Node *expr)
{
TargetEntry *rt = makeNode(TargetEntry);
@@ -554,7 +554,7 @@ MakeTLE(Resdom * resdom, Node * expr)
}
Var *
-get_expr(TargetEntry * tle)
+get_expr(TargetEntry *tle)
{
Assert(tle != NULL);
Assert(tle->expr != NULL);
@@ -574,7 +574,7 @@ get_expr(TargetEntry * tle)
*/
#ifdef NOT_USED
void
-AddGroupAttrToTlist(List * tlist, List * grpCl)
+AddGroupAttrToTlist(List *tlist, List *grpCl)
{
List *gl;
int last_resdomno = length(tlist) + 1;
@@ -606,7 +606,7 @@ AddGroupAttrToTlist(List * tlist, List * grpCl)
/* was ExecTargetListLength() in execQual.c,
moved here to reduce dependencies on the executor module */
int
-exec_tlist_length(List * targetlist)
+exec_tlist_length(List *targetlist)
{
int len;
List *tl;
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index e01720aa2e808de506caa5a6beb2edb361eb8dc5..2f7c080910d7a227da92ff45ba3589378504b78d 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.5 1997/09/08 02:25:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.6 1997/09/08 21:45:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
* (though it currently is, see primnodes.h)
*/
List *
-pull_varnos(Node * me)
+pull_varnos(Node *me)
{
List *i,
*result = NIL;
@@ -75,7 +75,7 @@ pull_varnos(Node * me)
* Returns true if any varnode found.
*/
bool
-contain_var_clause(Node * clause)
+contain_var_clause(Node *clause)
{
if (clause == NULL)
return FALSE;
@@ -144,7 +144,7 @@ contain_var_clause(Node * clause)
* Returns list of varnodes found.
*/
List *
-pull_var_clause(Node * clause)
+pull_var_clause(Node *clause)
{
List *retval = NIL;
@@ -204,9 +204,9 @@ pull_var_clause(Node * clause)
* Returns t iff two var nodes correspond to the same attribute.
*/
bool
-var_equal(Var * var1, Var * var2)
+var_equal(Var *var1, Var *var2)
{
- if (IsA(var1, Var) && IsA(var2, Var) &&
+ if (IsA(var1, Var) &&IsA(var2, Var) &&
(((Var *) var1)->varno == ((Var *) var2)->varno) &&
(((Var *) var1)->vartype == ((Var *) var2)->vartype) &&
(((Var *) var1)->varattno == ((Var *) var2)->varattno))
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 21af9402095b1600844bb3bae70d61326b843870..9e5f83071fc66d48b6f5933d8bb3f0410121ee2e 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.41 1997/09/08 20:56:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.42 1997/09/08 21:46:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,54 +44,54 @@
#include "port-protos.h" /* strdup() */
/* convert the parse tree into a query tree */
-static Query *transformStmt(ParseState * pstate, Node * stmt);
-
-static Query *transformDeleteStmt(ParseState * pstate, DeleteStmt * stmt);
-static Query *transformInsertStmt(ParseState * pstate, AppendStmt *stmt);
-static Query *transformIndexStmt(ParseState * pstate, IndexStmt * stmt);
-static Query *transformExtendStmt(ParseState * pstate, ExtendStmt * stmt);
-static Query *transformRuleStmt(ParseState * query, RuleStmt * stmt);
-static Query *transformSelectStmt(ParseState * pstate, RetrieveStmt * stmt);
-static Query *transformUpdateStmt(ParseState * pstate, ReplaceStmt * stmt);
-static Query *transformCursorStmt(ParseState * pstate, CursorStmt * stmt);
-static Node *handleNestedDots(ParseState * pstate, Attr *attr, int *curr_resno);
+static Query *transformStmt(ParseState *pstate, Node *stmt);
+
+static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
+static Query *transformInsertStmt(ParseState *pstate, AppendStmt *stmt);
+static Query *transformIndexStmt(ParseState *pstate, IndexStmt *stmt);
+static Query *transformExtendStmt(ParseState *pstate, ExtendStmt *stmt);
+static Query *transformRuleStmt(ParseState *query, RuleStmt *stmt);
+static Query *transformSelectStmt(ParseState *pstate, RetrieveStmt *stmt);
+static Query *transformUpdateStmt(ParseState *pstate, ReplaceStmt *stmt);
+static Query *transformCursorStmt(ParseState *pstate, CursorStmt *stmt);
+static Node *handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno);
#define EXPR_COLUMN_FIRST 1
#define EXPR_RELATION_FIRST 2
-static Node *transformExpr(ParseState * pstate, Node * expr, int precedence);
-static Node *transformIdent(ParseState * pstate, Node * expr, int precedence);
-
-static void makeRangeTable(ParseState * pstate, char *relname, List * frmList);
-static List *expandAllTables(ParseState * pstate);
-static char *figureColname(Node * expr, Node * resval);
-static List *makeTargetNames(ParseState * pstate, List * cols);
-static List *transformTargetList(ParseState * pstate, List * targetlist);
+static Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
+static Node *transformIdent(ParseState *pstate, Node *expr, int precedence);
+
+static void makeRangeTable(ParseState *pstate, char *relname, List *frmList);
+static List *expandAllTables(ParseState *pstate);
+static char *figureColname(Node *expr, Node *resval);
+static List *makeTargetNames(ParseState *pstate, List *cols);
+static List *transformTargetList(ParseState *pstate, List *targetlist);
static TargetEntry *
-make_targetlist_expr(ParseState * pstate,
- char *colname, Node * expr,
- List * arrayRef);
+make_targetlist_expr(ParseState *pstate,
+ char *colname, Node *expr,
+ List *arrayRef);
static bool inWhereClause = false;
-static Node *transformWhereClause(ParseState * pstate, Node * a_expr);
+static Node *transformWhereClause(ParseState *pstate, Node *a_expr);
static List *
-transformGroupClause(ParseState * pstate, List * grouplist,
- List * targetlist);
+transformGroupClause(ParseState *pstate, List *grouplist,
+ List *targetlist);
static List *
-transformSortClause(ParseState * pstate,
- List * orderlist, List * targetlist,
+transformSortClause(ParseState *pstate,
+ List *orderlist, List *targetlist,
char *uniqueFlag);
-static void parseFromClause(ParseState * pstate, List * frmList);
+static void parseFromClause(ParseState *pstate, List *frmList);
static Node *
-ParseFunc(ParseState * pstate, char *funcname,
- List * fargs, int *curr_resno);
+ParseFunc(ParseState *pstate, char *funcname,
+ List *fargs, int *curr_resno);
static List *setup_tlist(char *attname, Oid relid);
static List *setup_base_tlist(Oid typeid);
static void
-make_arguments(int nargs, List * fargs, Oid * input_typeids,
- Oid * function_typeids);
-static void AddAggToParseState(ParseState * pstate, Aggreg *aggreg);
-static void finalizeAggregates(ParseState * pstate, Query * qry);
-static void parseCheckAggregates(ParseState * pstate, Query * qry);
+make_arguments(int nargs, List *fargs, Oid *input_typeids,
+ Oid *function_typeids);
+static void AddAggToParseState(ParseState *pstate, Aggreg *aggreg);
+static void finalizeAggregates(ParseState *pstate, Query *qry);
+static void parseCheckAggregates(ParseState *pstate, Query *qry);
static ParseState *makeParseState(void);
/*****************************************************************************
@@ -135,7 +135,7 @@ makeParseState(void)
* CALLER is responsible for freeing the QueryTreeList* returned
*/
QueryTreeList *
-parse_analyze(List * pl)
+parse_analyze(List *pl)
{
QueryTreeList *result;
ParseState *pstate;
@@ -166,7 +166,7 @@ parse_analyze(List * pl)
* into a Query tree.
*/
static Query *
-transformStmt(ParseState * pstate, Node * parseTree)
+transformStmt(ParseState *pstate, Node *parseTree)
{
Query *result = NULL;
@@ -271,7 +271,7 @@ transformStmt(ParseState * pstate, Node * parseTree)
* transforms a Delete Statement
*/
static Query *
-transformDeleteStmt(ParseState * pstate, DeleteStmt * stmt)
+transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt)
{
Query *qry = makeNode(Query);
@@ -300,7 +300,7 @@ transformDeleteStmt(ParseState * pstate, DeleteStmt * stmt)
* transform an Insert Statement
*/
static Query *
-transformInsertStmt(ParseState * pstate, AppendStmt *stmt)
+transformInsertStmt(ParseState *pstate, AppendStmt *stmt)
{
Query *qry = makeNode(Query); /* make a new query tree */
@@ -335,7 +335,7 @@ transformInsertStmt(ParseState * pstate, AppendStmt *stmt)
* transforms the qualification of the index statement
*/
static Query *
-transformIndexStmt(ParseState * pstate, IndexStmt * stmt)
+transformIndexStmt(ParseState *pstate, IndexStmt *stmt)
{
Query *q;
@@ -357,7 +357,7 @@ transformIndexStmt(ParseState * pstate, IndexStmt * stmt)
*
*/
static Query *
-transformExtendStmt(ParseState * pstate, ExtendStmt * stmt)
+transformExtendStmt(ParseState *pstate, ExtendStmt *stmt)
{
Query *q;
@@ -378,7 +378,7 @@ transformExtendStmt(ParseState * pstate, ExtendStmt * stmt)
* trees which is transformed into a list of query trees.
*/
static Query *
-transformRuleStmt(ParseState * pstate, RuleStmt * stmt)
+transformRuleStmt(ParseState *pstate, RuleStmt *stmt)
{
Query *q;
List *actions;
@@ -426,7 +426,7 @@ transformRuleStmt(ParseState * pstate, RuleStmt * stmt)
*
*/
static Query *
-transformSelectStmt(ParseState * pstate, RetrieveStmt * stmt)
+transformSelectStmt(ParseState *pstate, RetrieveStmt *stmt)
{
Query *qry = makeNode(Query);
@@ -478,7 +478,7 @@ transformSelectStmt(ParseState * pstate, RetrieveStmt * stmt)
*
*/
static Query *
-transformUpdateStmt(ParseState * pstate, ReplaceStmt * stmt)
+transformUpdateStmt(ParseState *pstate, ReplaceStmt *stmt)
{
Query *qry = makeNode(Query);
@@ -513,7 +513,7 @@ transformUpdateStmt(ParseState * pstate, ReplaceStmt * stmt)
*
*/
static Query *
-transformCursorStmt(ParseState * pstate, CursorStmt * stmt)
+transformCursorStmt(ParseState *pstate, CursorStmt *stmt)
{
Query *qry = makeNode(Query);
@@ -571,7 +571,7 @@ transformCursorStmt(ParseState * pstate, CursorStmt * stmt)
* here.
*/
static Node *
-transformExpr(ParseState * pstate, Node * expr, int precedence)
+transformExpr(ParseState *pstate, Node *expr, int precedence)
{
Node *result = NULL;
@@ -791,7 +791,7 @@ transformExpr(ParseState * pstate, Node * expr, int precedence)
}
static Node *
-transformIdent(ParseState * pstate, Node * expr, int precedence)
+transformIdent(ParseState *pstate, Node *expr, int precedence)
{
Ident *ident = (Ident *) expr;
RangeTblEntry *rte;
@@ -856,7 +856,7 @@ transformIdent(ParseState * pstate, Node * expr, int precedence)
*
*/
static void
-parseFromClause(ParseState * pstate, List * frmList)
+parseFromClause(ParseState *pstate, List *frmList)
{
List *fl;
@@ -893,7 +893,7 @@ parseFromClause(ParseState * pstate, List * frmList)
* from-clause.
*/
static void
-makeRangeTable(ParseState * pstate, char *relname, List * frmList)
+makeRangeTable(ParseState *pstate, char *relname, List *frmList)
{
RangeTblEntry *rte;
@@ -919,7 +919,7 @@ makeRangeTable(ParseState * pstate, char *relname, List * frmList)
* returns the Oid of the type of the expression. (Used for typechecking.)
*/
Oid
-exprType(Node * expr)
+exprType(Node *expr)
{
Oid type = (Oid) 0;
@@ -967,7 +967,7 @@ exprType(Node * expr)
* relations in the range table)
*/
static List *
-expandAllTables(ParseState * pstate)
+expandAllTables(ParseState *pstate)
{
List *target = NIL;
List *legit_rtable = NIL;
@@ -1033,7 +1033,7 @@ expandAllTables(ParseState * pstate)
*
*/
static char *
-figureColname(Node * expr, Node * resval)
+figureColname(Node *expr, Node *resval)
{
switch (nodeTag(expr))
{
@@ -1067,7 +1067,7 @@ figureColname(Node * expr, Node * resval)
* (used exclusively for inserts)
*/
static List *
-makeTargetNames(ParseState * pstate, List * cols)
+makeTargetNames(ParseState *pstate, List *cols)
{
List *tl = NULL;
@@ -1110,7 +1110,7 @@ makeTargetNames(ParseState * pstate, List * cols)
* turns a list of ResTarget's into a list of TargetEntry's
*/
static List *
-transformTargetList(ParseState * pstate, List * targetlist)
+transformTargetList(ParseState *pstate, List *targetlist)
{
List *p_target = NIL;
List *tail_p_target = NIL;
@@ -1397,10 +1397,10 @@ transformTargetList(ParseState * pstate, List * targetlist)
* arrayRef is a list of transformed A_Indices
*/
static TargetEntry *
-make_targetlist_expr(ParseState * pstate,
+make_targetlist_expr(ParseState *pstate,
char *colname,
- Node * expr,
- List * arrayRef)
+ Node *expr,
+ List *arrayRef)
{
Oid type_id,
attrtype;
@@ -1607,7 +1607,7 @@ make_targetlist_expr(ParseState * pstate,
*
*/
static Node *
-transformWhereClause(ParseState * pstate, Node * a_expr)
+transformWhereClause(ParseState *pstate, Node *a_expr)
{
Node *qual;
@@ -1639,7 +1639,7 @@ transformWhereClause(ParseState * pstate, Node * a_expr)
*
*/
static TargetEntry *
-find_targetlist_entry(ParseState * pstate, SortGroupBy * sortgroupby, List * tlist)
+find_targetlist_entry(ParseState *pstate, SortGroupBy *sortgroupby, List *tlist)
{
List *i;
int real_rtable_pos = 0,
@@ -1716,7 +1716,7 @@ any_ordering_op(int restype)
*
*/
static List *
-transformGroupClause(ParseState * pstate, List * grouplist, List * targetlist)
+transformGroupClause(ParseState *pstate, List *grouplist, List *targetlist)
{
List *glist = NIL,
*gl = NIL;
@@ -1756,8 +1756,8 @@ transformGroupClause(ParseState * pstate, List * grouplist, List * targetlist)
*
*/
static List *
-transformSortClause(ParseState * pstate,
- List * orderlist, List * targetlist,
+transformSortClause(ParseState *pstate,
+ List *orderlist, List *targetlist,
char *uniqueFlag)
{
List *sortlist = NIL;
@@ -1872,7 +1872,7 @@ transformSortClause(ParseState * pstate,
** a tree with of Iter and Func nodes.
*/
static Node *
-handleNestedDots(ParseState * pstate, Attr *attr, int *curr_resno)
+handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno)
{
List *mutator_iter;
Node *retval = NULL;
@@ -1915,9 +1915,9 @@ handleNestedDots(ParseState * pstate, Attr *attr, int *curr_resno)
*/
static void
make_arguments(int nargs,
- List * fargs,
- Oid * input_typeids,
- Oid * function_typeids)
+ List *fargs,
+ Oid *input_typeids,
+ Oid *function_typeids)
{
/*
@@ -2016,10 +2016,10 @@ setup_base_tlist(Oid typeid)
* This routine returns NULL if it can't handle the projection (eg. sets).
*/
static Node *
-ParseComplexProjection(ParseState * pstate,
+ParseComplexProjection(ParseState *pstate,
char *funcname,
- Node * first_arg,
- bool * attisset)
+ Node *first_arg,
+ bool *attisset)
{
Oid argtype;
Oid argrelid;
@@ -2174,7 +2174,7 @@ ParseComplexProjection(ParseState * pstate,
}
static Node *
-ParseFunc(ParseState * pstate, char *funcname, List * fargs, int *curr_resno)
+ParseFunc(ParseState *pstate, char *funcname, List *fargs, int *curr_resno)
{
Oid rettype = (Oid) 0;
Oid argrelid = (Oid) 0;
@@ -2524,7 +2524,7 @@ ParseFunc(ParseState * pstate, char *funcname, List * fargs, int *curr_resno)
* SIDE EFFECT: aggno in target list entry will be modified
*/
static void
-AddAggToParseState(ParseState * pstate, Aggreg *aggreg)
+AddAggToParseState(ParseState *pstate, Aggreg *aggreg)
{
List *ag;
int i;
@@ -2562,7 +2562,7 @@ AddAggToParseState(ParseState * pstate, Aggreg *aggreg)
* are used in the proper place.
*/
static void
-finalizeAggregates(ParseState * pstate, Query * qry)
+finalizeAggregates(ParseState *pstate, Query *qry)
{
List *l;
int i;
@@ -2584,7 +2584,7 @@ finalizeAggregates(ParseState * pstate, Query * qry)
* Returns true if any aggregate found.
*/
static bool
-contain_agg_clause(Node * clause)
+contain_agg_clause(Node *clause)
{
if (clause == NULL)
return FALSE;
@@ -2642,12 +2642,12 @@ contain_agg_clause(Node * clause)
* returns true if the expression does not contain non-group columns.
*/
static bool
-exprIsAggOrGroupCol(Node * expr, List * groupClause)
+exprIsAggOrGroupCol(Node *expr, List *groupClause)
{
List *gl;
if (expr == NULL || IsA(expr, Const) ||
- IsA(expr, Param) || IsA(expr, Aggreg))
+ IsA(expr, Param) ||IsA(expr, Aggreg))
return TRUE;
foreach(gl, groupClause)
@@ -2676,12 +2676,12 @@ exprIsAggOrGroupCol(Node * expr, List * groupClause)
* returns true if the TargetEntry is Agg or GroupCol.
*/
static bool
-tleIsAggOrGroupCol(TargetEntry * tle, List * groupClause)
+tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause)
{
Node *expr = tle->expr;
List *gl;
- if (expr == NULL || IsA(expr, Const) || IsA(expr, Param))
+ if (expr == NULL || IsA(expr, Const) ||IsA(expr, Param))
return TRUE;
foreach(gl, groupClause)
@@ -2719,7 +2719,7 @@ tleIsAggOrGroupCol(TargetEntry * tle, List * groupClause)
* here when the target list and the qualifications are finalized.
*/
static void
-parseCheckAggregates(ParseState * pstate, Query * qry)
+parseCheckAggregates(ParseState *pstate, Query *qry)
{
List *tl;
diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
index 967bf08101a0b1f13faf8d027388c994baa1576a..db92e155221b60d65b7d6b3ff75d6a7f04ff2917 100644
--- a/src/backend/parser/catalog_utils.c
+++ b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.24 1997/09/08 02:25:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.25 1997/09/08 21:46:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -121,7 +121,7 @@ typedef struct _InhPaths
int nsupers; /* number of superclasses */
Oid self; /* this class */
Oid *supervec; /* vector of superclasses */
-} InhPaths;
+} InhPaths;
/*
* This structure holds a list of possible functions or operators that
@@ -133,9 +133,9 @@ typedef struct _CandidateList
struct _CandidateList *next;
} *CandidateList;
-static Oid **argtype_inherit(int nargs, Oid * oid_array);
-static Oid **genxprod(InhPaths * arginh, int nargs);
-static int findsupers(Oid relid, Oid ** supervec);
+static Oid **argtype_inherit(int nargs, Oid *oid_array);
+static Oid **genxprod(InhPaths *arginh, int nargs);
+static int findsupers(Oid relid, Oid **supervec);
static bool check_typeid(Oid id);
static char *instr1(TypeTupleForm tp, char *string, int typlen);
static void op_error(char *op, Oid arg1, Oid arg2);
@@ -308,7 +308,7 @@ static int
binary_oper_get_candidates(char *opname,
Oid leftTypeId,
Oid rightTypeId,
- CandidateList * candidates)
+ CandidateList *candidates)
{
CandidateList current_candidate;
Relation pg_operator_desc;
@@ -624,7 +624,7 @@ oper(char *op, Oid arg1, Oid arg2, bool noWarnings)
static int
unary_oper_get_candidates(char *op,
Oid typeId,
- CandidateList * candidates,
+ CandidateList *candidates,
char rightleft)
{
CandidateList current_candidate;
@@ -641,10 +641,10 @@ unary_oper_get_candidates(char *op,
*candidates = NULL;
- fmgr_info(NameEqualRegProcedure, (func_ptr *) & opKey[0].sk_func,
+ fmgr_info(NameEqualRegProcedure, (func_ptr *) &opKey[0].sk_func,
&opKey[0].sk_nargs);
opKey[0].sk_argument = NameGetDatum(op);
- fmgr_info(CharacterEqualRegProcedure, (func_ptr *) & opKey[1].sk_func,
+ fmgr_info(CharacterEqualRegProcedure, (func_ptr *) &opKey[1].sk_func,
&opKey[1].sk_nargs);
opKey[1].sk_argument = CharGetDatum(rightleft);
@@ -954,7 +954,7 @@ GetArrayElementType(Oid typearray)
if (type_struct_array->typelem == InvalidOid)
{
elog(WARN, "GetArrayElementType: type %s is not an array",
- (Name) & (type_struct_array->typname.data[0]));
+ (Name) &(type_struct_array->typname.data[0]));
}
return (type_struct_array->typelem);
@@ -1061,7 +1061,7 @@ func_get_candidates(char *funcname, int nargs)
* can input_typeids be coerced to func_typeids?
*/
static bool
-can_coerce(int nargs, Oid * input_typeids, Oid * func_typeids)
+can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids)
{
int i;
Type tp;
@@ -1101,9 +1101,9 @@ can_coerce(int nargs, Oid * input_typeids, Oid * func_typeids)
*/
static int
match_argtypes(int nargs,
- Oid * input_typeids,
+ Oid *input_typeids,
CandidateList function_typeids,
- CandidateList * candidates) /* return value */
+ CandidateList *candidates) /* return value */
{
CandidateList current_candidate;
CandidateList matching_candidate;
@@ -1139,7 +1139,7 @@ match_argtypes(int nargs,
*/
static Oid *
func_select_candidate(int nargs,
- Oid * input_typeids,
+ Oid *input_typeids,
CandidateList candidates)
{
/* XXX no conflict resolution implemeneted yet */
@@ -1149,11 +1149,11 @@ func_select_candidate(int nargs,
bool
func_get_detail(char *funcname,
int nargs,
- Oid * oid_array,
- Oid * funcid, /* return value */
- Oid * rettype, /* return value */
- bool * retset, /* return value */
- Oid ** true_typeids) /* return value */
+ Oid *oid_array,
+ Oid *funcid, /* return value */
+ Oid *rettype, /* return value */
+ bool *retset, /* return value */
+ Oid **true_typeids) /* return value */
{
Oid **input_typeid_vector;
Oid *current_input_typeids;
@@ -1292,7 +1292,7 @@ func_get_detail(char *funcname,
* catalogs.
*/
static Oid **
-argtype_inherit(int nargs, Oid * oid_array)
+argtype_inherit(int nargs, Oid *oid_array)
{
Oid relid;
int i;
@@ -1328,10 +1328,10 @@ argtype_inherit(int nargs, Oid * oid_array)
typedef struct _SuperQE
{
Oid sqe_relid;
-} SuperQE;
+} SuperQE;
static int
-findsupers(Oid relid, Oid ** supervec)
+findsupers(Oid relid, Oid **supervec)
{
Oid *relidvec;
Relation inhrel;
@@ -1452,7 +1452,7 @@ findsupers(Oid relid, Oid ** supervec)
}
static Oid **
-genxprod(InhPaths * arginh, int nargs)
+genxprod(InhPaths *arginh, int nargs)
{
int nanswers;
Oid **result,
@@ -1657,7 +1657,7 @@ op_error(char *op, Oid arg1, Oid arg2)
* argument types
*/
void
-func_error(char *caller, char *funcname, int nargs, Oid * argtypes)
+func_error(char *caller, char *funcname, int nargs, Oid *argtypes)
{
char p[(NAMEDATALEN + 2) * MAXFMGRARGS],
*ptr;
diff --git a/src/backend/parser/dbcommands.c b/src/backend/parser/dbcommands.c
index e0add781242f78f9cabab61682d88b7ef350e736..c39fa49404e22bf76287b30b08c4b26db10105bc 100644
--- a/src/backend/parser/dbcommands.c
+++ b/src/backend/parser/dbcommands.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.8 1997/09/08 02:25:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.9 1997/09/08 21:46:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@
/* non-export function prototypes */
static void
check_permissions(char *command, char *dbname,
- Oid * dbIdP, Oid * userIdP);
+ Oid *dbIdP, Oid *userIdP);
static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel);
static void stop_vacuum(char *dbname);
@@ -161,8 +161,8 @@ get_pg_dbtup(char *command, char *dbname, Relation dbrel)
static void
check_permissions(char *command,
char *dbname,
- Oid * dbIdP,
- Oid * userIdP)
+ Oid *dbIdP,
+ Oid *userIdP)
{
Relation dbrel;
HeapTuple dbtup,
diff --git a/src/backend/parser/parse_query.c b/src/backend/parser/parse_query.c
index f9670431f33c69f64aaeaf26660c5dc32e3938f7..088fe180f18943af566ec03b3a0ad3bca7b51b98 100644
--- a/src/backend/parser/parse_query.c
+++ b/src/backend/parser/parse_query.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.20 1997/09/08 02:25:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.21 1997/09/08 21:46:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@
#include "nodes/makefuncs.h"
static void
-checkTargetTypes(ParseState * pstate, char *target_colname,
+checkTargetTypes(ParseState *pstate, char *target_colname,
char *refname, char *colname);
Oid *param_type_info;
@@ -47,7 +47,7 @@ int pfunc_num_args;
/* given refname, return a pointer to the range table entry */
RangeTblEntry *
-refnameRangeTableEntry(List * rtable, char *refname)
+refnameRangeTableEntry(List *rtable, char *refname)
{
List *temp;
@@ -63,7 +63,7 @@ refnameRangeTableEntry(List * rtable, char *refname)
/* given refname, return id of variable; position starts with 1 */
int
-refnameRangeTablePosn(List * rtable, char *refname)
+refnameRangeTablePosn(List *rtable, char *refname)
{
int index;
List *temp;
@@ -84,7 +84,7 @@ refnameRangeTablePosn(List * rtable, char *refname)
* returns range entry if found, else NULL
*/
RangeTblEntry *
-colnameRangeTableEntry(ParseState * pstate, char *colname)
+colnameRangeTableEntry(ParseState *pstate, char *colname)
{
List *et;
List *rtable;
@@ -124,11 +124,11 @@ colnameRangeTableEntry(ParseState * pstate, char *colname)
* if pstate null
*/
RangeTblEntry *
-addRangeTableEntry(ParseState * pstate,
+addRangeTableEntry(ParseState *pstate,
char *relname,
char *refname,
bool inh, bool inFromCl,
- TimeRange * timeRange)
+ TimeRange *timeRange)
{
Relation relation;
RangeTblEntry *rte = makeNode(RangeTblEntry);
@@ -180,7 +180,7 @@ addRangeTableEntry(ParseState * pstate,
* assumes reldesc caching works
*/
List *
-expandAll(ParseState * pstate, char *relname, char *refname, int *this_resno)
+expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno)
{
Relation rdesc;
List *te_tail = NIL,
@@ -305,7 +305,7 @@ makeTimeRange(char *datestring1,
}
static void
-disallow_setop(char *op, Type optype, Node * operand)
+disallow_setop(char *op, Type optype, Node *operand)
{
if (operand == NULL)
return;
@@ -321,7 +321,7 @@ disallow_setop(char *op, Type optype, Node * operand)
static Node *
make_operand(char *opname,
- Node * tree,
+ Node *tree,
Oid orig_typeId,
Oid true_typeId)
{
@@ -374,7 +374,7 @@ make_operand(char *opname,
Expr *
-make_op(char *opname, Node * ltree, Node * rtree)
+make_op(char *opname, Node *ltree, Node *rtree)
{
Oid ltypeId,
rtypeId;
@@ -525,7 +525,7 @@ find_atttype(Oid relid, char *attrname)
Var *
-make_var(ParseState * pstate, char *refname, char *attrname, Oid * type_id)
+make_var(ParseState *pstate, char *refname, char *attrname, Oid *type_id)
{
Var *varnode;
int vnum,
@@ -568,8 +568,8 @@ make_var(ParseState * pstate, char *refname, char *attrname, Oid * type_id)
* indirection is a list of A_Indices
*/
ArrayRef *
-make_array_ref(Node * expr,
- List * indirection)
+make_array_ref(Node *expr,
+ List *indirection)
{
Oid typearray;
HeapTuple type_tuple;
@@ -596,7 +596,7 @@ make_array_ref(Node * expr,
if (type_struct_array->typelem == InvalidOid)
{
elog(WARN, "make_array_ref: type %s is not an array",
- (Name) & (type_struct_array->typname.data[0]));
+ (Name) &(type_struct_array->typname.data[0]));
}
/* get the type tuple for the element type */
@@ -650,10 +650,10 @@ make_array_ref(Node * expr,
}
ArrayRef *
-make_array_set(Expr * target_expr,
- List * upperIndexpr,
- List * lowerIndexpr,
- Expr * expr)
+make_array_set(Expr *target_expr,
+ List *upperIndexpr,
+ List *lowerIndexpr,
+ Expr *expr)
{
Oid typearray;
HeapTuple type_tuple;
@@ -678,7 +678,7 @@ make_array_set(Expr * target_expr,
if (type_struct_array->typelem == InvalidOid)
{
elog(WARN, "make_array_ref: type %s is not an array",
- (Name) & (type_struct_array->typname.data[0]));
+ (Name) &(type_struct_array->typname.data[0]));
}
/* get the type tuple for the element type */
type_tuple = SearchSysCacheTuple(TYPOID,
@@ -724,7 +724,7 @@ make_array_set(Expr * target_expr,
* eventually, produces a "const" lisp-struct as per nodedefs.cl
*/
Const *
-make_const(Value * value)
+make_const(Value *value)
{
Type tp;
Datum val;
@@ -786,7 +786,7 @@ make_const(Value * value)
* used in postquel functions
*/
void
-param_type_init(Oid * typev, int nargs)
+param_type_init(Oid *typev, int nargs)
{
pfunc_num_args = nargs;
param_type_info = typev;
@@ -805,7 +805,7 @@ param_type(int t)
* use column names from insert
*/
void
-handleTargetColname(ParseState * pstate, char **resname,
+handleTargetColname(ParseState *pstate, char **resname,
char *refname, char *colname)
{
if (pstate->p_is_insert)
@@ -829,7 +829,7 @@ handleTargetColname(ParseState * pstate, char **resname,
* checks value and target column types
*/
static void
-checkTargetTypes(ParseState * pstate, char *target_colname,
+checkTargetTypes(ParseState *pstate, char *target_colname,
char *refname, char *colname)
{
Oid attrtype_id,
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 3ca419dd6b4151118afea2864c49bfd223241808..598b59506487892eeeac7f5ec82470179417c392 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.24 1997/09/08 02:25:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.25 1997/09/08 21:46:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@
#include "optimizer/clauses.h"
void init_io(); /* from scan.l */
-void parser_init(Oid * typev, int nargs); /* from gram.y */
+void parser_init(Oid *typev, int nargs); /* from gram.y */
int yyparse(); /* from gram.c */
char *parseString; /* the char* which holds the string to be
@@ -58,7 +58,7 @@ static void define_sets();
* CALLER is responsible for free'ing the list returned
*/
QueryTreeList *
-parser(char *str, Oid * typev, int nargs)
+parser(char *str, Oid *typev, int nargs)
{
QueryTreeList *queryList;
int yyresult;
@@ -112,7 +112,7 @@ parser(char *str, Oid * typev, int nargs)
#ifdef SETS_FIXED
static void
-fixupsets(Query * parse)
+fixupsets(Query *parse)
{
if (parse == NULL)
return;
@@ -129,7 +129,7 @@ fixupsets(Query * parse)
* the set, and store the OID of the new set in the Const instead.
*/
static void
-define_sets(Node * clause)
+define_sets(Node *clause)
{
Oid setoid;
Type t = type("oid");
@@ -210,7 +210,7 @@ define_sets(Node * clause)
*/
Node *
-parser_typecast(Value * expr, TypeName * typename, int typlen)
+parser_typecast(Value *expr, TypeName *typename, int typlen)
{
/* check for passing non-ints */
Const *adt;
@@ -347,7 +347,7 @@ parser_typecast(Value * expr, TypeName * typename, int typlen)
}
Node *
-parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen)
+parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen)
{
/* check for passing non-ints */
Const *adt;
@@ -486,7 +486,7 @@ parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen)
}
Aggreg *
-ParseAgg(char *aggname, Oid basetype, Node * target)
+ParseAgg(char *aggname, Oid basetype, Node *target)
{
Oid fintype;
Oid vartype;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index d6c53d2ee263b5239d7eae11b516614edbd33306..eb35b294f8f827eccdc75596327c0c8990fc6037 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.56 1997/09/08 20:56:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.57 1997/09/08 21:46:16 momjian Exp $
*
* NOTES
*
@@ -156,7 +156,7 @@ static int MultiplexedBackendPort;
*/
static void pmdaemonize(void);
static void
-ConnStartup(Port * port, int *status,
+ConnStartup(Port *port, int *status,
char *errormsg, const int errormsg_len);
static int ConnCreate(int serverFd, int *newFdP);
static void reset_shared(short port);
@@ -164,12 +164,12 @@ static void pmdie(SIGNAL_ARGS);
static void reaper(SIGNAL_ARGS);
static void dumpstatus(SIGNAL_ARGS);
static void CleanupProc(int pid, int exitstatus);
-static int DoExec(StartupInfo * packet, int portFd);
+static int DoExec(StartupInfo *packet, int portFd);
static void ExitPostmaster(int status);
static void usage(const char *);
static int ServerLoop(void);
-static int BackendStartup(StartupInfo * packet, Port * port, int *pidPtr);
-static void send_error_reply(Port * port, const char *errormsg);
+static int BackendStartup(StartupInfo *packet, Port *port, int *pidPtr);
+static void send_error_reply(Port *port, const char *errormsg);
extern char *optarg;
extern int optind,
@@ -178,7 +178,7 @@ extern int optind,
static void
-checkDataDir(const char *DataDir, bool * DataDirOK)
+checkDataDir(const char *DataDir, bool *DataDirOK)
{
if (DataDir == NULL)
{
@@ -686,7 +686,7 @@ ServerLoop(void)
*/
static void
-ConnStartup(Port * port, int *status,
+ConnStartup(Port *port, int *status,
char *errormsg, const int errormsg_len)
{
MsgType msgType;
@@ -791,7 +791,7 @@ ConnStartup(Port * port, int *status,
*/
static void
-send_error_reply(Port * port, const char *errormsg)
+send_error_reply(Port *port, const char *errormsg)
{
int rc; /* return code from sendto */
char *reply;
@@ -1040,8 +1040,8 @@ CleanupProc(int pid,
*
*/
static int
-BackendStartup(StartupInfo * packet, /* client's startup packet */
- Port * port,
+BackendStartup(StartupInfo *packet, /* client's startup packet */
+ Port *port,
int *pidPtr)
{
Backend *bn; /* for backend cleanup */
@@ -1173,7 +1173,7 @@ split_opts(char **argv, int *argcp, char *s)
* If execv() fails, return status.
*/
static int
-DoExec(StartupInfo * packet, int portFd)
+DoExec(StartupInfo *packet, int portFd)
{
char execbuf[MAXPATHLEN];
char portbuf[ARGV_SIZE];
diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c
index 1d86dcc7bd9ced2189bc7a271ee1655888e063a9..a16ae18b0d3fcf84f2de1e7aa0bbb89efa08e178 100644
--- a/src/backend/regex/engine.c
+++ b/src/backend/regex/engine.c
@@ -120,7 +120,7 @@ extern "C"
#define NNONCHAR (CODEMAX-CHAR_MAX)
#ifdef REDEBUG
static void
- print(struct match * m, char *caption, states st, int ch, FILE * d);
+ print(struct match * m, char *caption, states st, int ch, FILE *d);
#endif
#ifdef REDEBUG
static void
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index da4f2020ce3abc1c9e73e59bd553976b130ed16a..d9b31980246a0b94bb3eb677364678e898db7838 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -90,9 +90,9 @@ extern "C"
static int p_simp_re(struct parse * p, int starordinary);
static int p_count(struct parse * p);
static void p_bracket(struct parse * p);
- static void p_b_term(struct parse * p, cset * cs);
- static void p_b_cclass(struct parse * p, cset * cs);
- static void p_b_eclass(struct parse * p, cset * cs);
+ static void p_b_term(struct parse * p, cset *cs);
+ static void p_b_cclass(struct parse * p, cset *cs);
+ static void p_b_eclass(struct parse * p, cset *cs);
static char p_b_symbol(struct parse * p);
static char p_b_coll_elem(struct parse * p, int endc);
static char othercase(int ch);
@@ -102,13 +102,13 @@ extern "C"
static void repeat(struct parse * p, sopno start, int from, int to);
static int seterr(struct parse * p, int e);
static cset *allocset(struct parse * p);
- static void freeset(struct parse * p, cset * cs);
- static int freezeset(struct parse * p, cset * cs);
- static int firstch(struct parse * p, cset * cs);
- static int nch(struct parse * p, cset * cs);
- static void mcadd(struct parse * p, cset * cs, char *cp);
- static void mcinvert(struct parse * p, cset * cs);
- static void mccase(struct parse * p, cset * cs);
+ static void freeset(struct parse * p, cset *cs);
+ static int freezeset(struct parse * p, cset *cs);
+ static int firstch(struct parse * p, cset *cs);
+ static int nch(struct parse * p, cset *cs);
+ static void mcadd(struct parse * p, cset *cs, char *cp);
+ static void mcinvert(struct parse * p, cset *cs);
+ static void mccase(struct parse * p, cset *cs);
static int isinsets(struct re_guts * g, int c);
static int samesets(struct re_guts * g, int c1, int c2);
static void categorize(struct parse * p, struct re_guts * g);
@@ -1501,7 +1501,7 @@ register struct re_guts *g;
- dupl - emit a duplicate of a bunch of sops
== static sopno dupl(register struct parse *p, sopno start, sopno finish);
*/
-static sopno /* start of duplicate */
+static sopno /* start of duplicate */
dupl(p, start, finish)
register struct parse *p;
sopno start; /* from here */
@@ -1752,7 +1752,7 @@ register struct re_guts *g;
- pluscount - count + nesting
== static sopno pluscount(register struct parse *p, register struct re_guts *g);
*/
-static sopno /* nesting depth */
+static sopno /* nesting depth */
pluscount(p, g)
struct parse *p;
register struct re_guts *g;
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index d5f92559836237a695d1ef0a042020649b4ecb7c..430814d2d0d88fbe4e293b1031f87d6e34e16a63 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -60,7 +60,7 @@ extern "C"
#endif
/* === regerror.c === */
- static char *regatoi(const regex_t * preg, char *localbuf);
+ static char *regatoi(const regex_t *preg, char *localbuf);
#ifdef __cplusplus
}
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index 6a62e8ddee375a51bb2b417679cda6fd46a3b3f8..d446da653cc3672075c9d483f76b4bf0d7607c92 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.4 1997/09/08 02:28:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.5 1997/09/08 21:46:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
* otherwise, we return false
*/
static bool
-nodeThisLockWasTriggered(Node * node, int varno, AttrNumber attnum)
+nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum)
{
if (node == NULL)
return FALSE;
@@ -85,7 +85,7 @@ nodeThisLockWasTriggered(Node * node, int varno, AttrNumber attnum)
static bool
thisLockWasTriggered(int varno,
AttrNumber attnum,
- Query * parsetree)
+ Query *parsetree)
{
return
(nodeThisLockWasTriggered(parsetree->qual, varno, attnum) ||
@@ -99,9 +99,9 @@ thisLockWasTriggered(int varno,
*/
List *
matchLocks(CmdType event,
- RuleLock * rulelocks,
+ RuleLock *rulelocks,
int varno,
- Query * parsetree)
+ Query *parsetree)
{
List *real_locks = NIL;
int nlocks;
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index c849d7edab9095279b66048defe3ab351ccee0ab..33fad4925a85a090e06d148e1c84a4dedbebfdff 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.5 1997/09/08 02:28:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.6 1997/09/08 21:46:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -147,8 +147,8 @@ static void
ValidateRule(int event_type,
char *eobj_string,
char *eslot_string,
- Node * event_qual,
- List ** action,
+ Node *event_qual,
+ List **action,
int is_instead,
Oid event_attype)
{
@@ -186,7 +186,7 @@ ValidateRule(int event_type,
}
void
-DefineQueryRewrite(RuleStmt * stmt)
+DefineQueryRewrite(RuleStmt *stmt)
{
CmdType event_type = stmt->event;
Attr *event_obj = stmt->object;
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index af15f6b7171e160d236596e6e07290e42387c72c..d6dc95e387d7c0f39513065ead9e7599002b35db 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.5 1997/09/08 02:28:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.6 1997/09/08 21:46:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,12 +30,12 @@
#include "access/heapam.h"
static void
-ApplyRetrieveRule(Query * parsetree, RewriteRule * rule,
+ApplyRetrieveRule(Query *parsetree, RewriteRule *rule,
int rt_index, int relation_level, int *modified);
static List *
-fireRules(Query * parsetree, int rt_index, CmdType event,
- bool * instead_flag, List * locks, List ** qual_products);
-static List *deepRewriteQuery(Query * parsetree);
+fireRules(Query *parsetree, int rt_index, CmdType event,
+ bool *instead_flag, List *locks, List **qual_products);
+static List *deepRewriteQuery(Query *parsetree);
/*
* gatherRewriteMeta -
@@ -44,12 +44,12 @@ static List *deepRewriteQuery(Query * parsetree);
* maintain semantic validity
*/
static RewriteInfo *
-gatherRewriteMeta(Query * parsetree,
- Query * rule_action,
- Node * rule_qual,
+gatherRewriteMeta(Query *parsetree,
+ Query *rule_action,
+ Node *rule_qual,
int rt_index,
CmdType event,
- bool * instead_flag)
+ bool *instead_flag)
{
RewriteInfo *info;
int rt_length;
@@ -110,7 +110,7 @@ gatherRewriteMeta(Query * parsetree,
}
static List *
-OptimizeRIRRules(List * locks)
+OptimizeRIRRules(List *locks)
{
List *attr_level = NIL,
*i;
@@ -133,7 +133,7 @@ OptimizeRIRRules(List * locks)
* excess semantically queasy queries aren't processed
*/
static List *
-orderRules(List * locks)
+orderRules(List *locks)
{
List *regular = NIL,
*i;
@@ -152,7 +152,7 @@ orderRules(List * locks)
}
static int
-AllRetrieve(List * actions)
+AllRetrieve(List *actions)
{
List *n;
@@ -172,10 +172,10 @@ AllRetrieve(List * actions)
}
static List *
-FireRetrieveRulesAtQuery(Query * parsetree,
+FireRetrieveRulesAtQuery(Query *parsetree,
int rt_index,
Relation relation,
- bool * instead_flag,
+ bool *instead_flag,
int rule_flag)
{
List *i,
@@ -242,8 +242,8 @@ FireRetrieveRulesAtQuery(Query * parsetree,
* side effect: parsetree's rtable field might be changed
*/
static void
-ApplyRetrieveRule(Query * parsetree,
- RewriteRule * rule,
+ApplyRetrieveRule(Query *parsetree,
+ RewriteRule *rule,
int rt_index,
int relation_level,
int *modified)
@@ -310,9 +310,9 @@ ApplyRetrieveRule(Query * parsetree,
}
static List *
-ProcessRetrieveQuery(Query * parsetree,
- List * rtable,
- bool * instead_flag,
+ProcessRetrieveQuery(Query *parsetree,
+ List *rtable,
+ bool *instead_flag,
bool rule)
{
List *rt;
@@ -377,9 +377,9 @@ ProcessRetrieveQuery(Query * parsetree,
}
static Query *
-CopyAndAddQual(Query * parsetree,
- List * actions,
- Node * rule_qual,
+CopyAndAddQual(Query *parsetree,
+ List *actions,
+ Node *rule_qual,
int rt_index,
CmdType event)
{
@@ -419,12 +419,12 @@ CopyAndAddQual(Query * parsetree,
*
*/
static List *
-fireRules(Query * parsetree,
+fireRules(Query *parsetree,
int rt_index,
CmdType event,
- bool * instead_flag,
- List * locks,
- List ** qual_products)
+ bool *instead_flag,
+ List *locks,
+ List **qual_products)
{
RewriteInfo *info;
List *results = NIL;
@@ -536,7 +536,7 @@ fireRules(Query * parsetree,
}
static List *
-RewriteQuery(Query * parsetree, bool * instead_flag, List ** qual_products)
+RewriteQuery(Query *parsetree, bool *instead_flag, List **qual_products)
{
CmdType event;
List *product_queries = NIL;
@@ -621,7 +621,7 @@ static int numQueryRewriteInvoked = 0;
* queries
*/
List *
-QueryRewrite(Query * parsetree)
+QueryRewrite(Query *parsetree)
{
numQueryRewriteInvoked = 0;
@@ -636,7 +636,7 @@ QueryRewrite(Query * parsetree)
* rewrites the query and apply the rules again on the queries rewritten
*/
static List *
-deepRewriteQuery(Query * parsetree)
+deepRewriteQuery(Query *parsetree)
{
List *n;
List *rewritten = NIL;
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 8e6b7a21ba4df805bd9a310e28a7497663d93b6a..513733fde693688b5aa7e4cfa409c5016c5b2eb3 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.6 1997/09/08 02:28:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.7 1997/09/08 21:46:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,12 +28,12 @@
#include "nodes/plannodes.h"
#include "optimizer/clauses.h"
-static void ResolveNew(RewriteInfo * info, List * targetlist, Node ** node);
+static void ResolveNew(RewriteInfo *info, List *targetlist, Node **node);
void
-OffsetVarNodes(Node * node, int offset)
+OffsetVarNodes(Node *node, int offset)
{
if (node == NULL)
return;
@@ -78,7 +78,7 @@ OffsetVarNodes(Node * node, int offset)
}
void
-ChangeVarNodes(Node * node, int old_varno, int new_varno)
+ChangeVarNodes(Node *node, int old_varno, int new_varno)
{
if (node == NULL)
return;
@@ -126,7 +126,7 @@ ChangeVarNodes(Node * node, int old_varno, int new_varno)
}
void
-AddQual(Query * parsetree, Node * qual)
+AddQual(Query *parsetree, Node *qual)
{
Node *copy,
*old;
@@ -144,7 +144,7 @@ AddQual(Query * parsetree, Node * qual)
}
void
-AddNotQual(Query * parsetree, Node * qual)
+AddNotQual(Query *parsetree, Node *qual)
{
Node *copy;
@@ -170,7 +170,7 @@ make_null(Oid type)
}
void
-FixResdomTypes(List * tlist)
+FixResdomTypes(List *tlist)
{
List *i;
@@ -189,7 +189,7 @@ FixResdomTypes(List * tlist)
}
static Node *
-FindMatchingNew(List * tlist, int attno)
+FindMatchingNew(List *tlist, int attno)
{
List *i;
@@ -206,7 +206,7 @@ FindMatchingNew(List * tlist, int attno)
}
static Node *
-FindMatchingTLEntry(List * tlist, char *e_attname)
+FindMatchingTLEntry(List *tlist, char *e_attname)
{
List *i;
@@ -223,7 +223,7 @@ FindMatchingTLEntry(List * tlist, char *e_attname)
}
static void
-ResolveNew(RewriteInfo * info, List * targetlist, Node ** nodePtr)
+ResolveNew(RewriteInfo *info, List *targetlist, Node **nodePtr)
{
Node *node = *nodePtr;
@@ -272,7 +272,7 @@ ResolveNew(RewriteInfo * info, List * targetlist, Node ** nodePtr)
foreach(l, (List *) node)
{
- ResolveNew(info, targetlist, (Node **) & (lfirst(l)));
+ ResolveNew(info, targetlist, (Node **) &(lfirst(l)));
}
break;
}
@@ -283,17 +283,17 @@ ResolveNew(RewriteInfo * info, List * targetlist, Node ** nodePtr)
}
void
-FixNew(RewriteInfo * info, Query * parsetree)
+FixNew(RewriteInfo *info, Query *parsetree)
{
ResolveNew(info, parsetree->targetList,
- (Node **) & (info->rule_action->targetList));
+ (Node **) &(info->rule_action->targetList));
ResolveNew(info, parsetree->targetList, &info->rule_action->qual);
}
static void
-nodeHandleRIRAttributeRule(Node ** nodePtr,
- List * rtable,
- List * targetlist,
+nodeHandleRIRAttributeRule(Node **nodePtr,
+ List *rtable,
+ List *targetlist,
int rt_index,
int attr_num,
int *modified,
@@ -387,9 +387,9 @@ nodeHandleRIRAttributeRule(Node ** nodePtr,
* do instead retrieve (attribute = expression) w/qual'
*/
void
-HandleRIRAttributeRule(Query * parsetree,
- List * rtable,
- List * targetlist,
+HandleRIRAttributeRule(Query *parsetree,
+ List *rtable,
+ List *targetlist,
int rt_index,
int attr_num,
int *modified,
@@ -404,9 +404,9 @@ HandleRIRAttributeRule(Query * parsetree,
static void
-nodeHandleViewRule(Node ** nodePtr,
- List * rtable,
- List * targetlist,
+nodeHandleViewRule(Node **nodePtr,
+ List *rtable,
+ List *targetlist,
int rt_index,
int *modified)
{
@@ -477,9 +477,9 @@ nodeHandleViewRule(Node ** nodePtr,
}
void
-HandleViewRule(Query * parsetree,
- List * rtable,
- List * targetlist,
+HandleViewRule(Query *parsetree,
+ List *rtable,
+ List *targetlist,
int rt_index,
int *modified)
{
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index b9059e9dca0d5c97f649f835985f79c7911a77d8..19423dc99825fb3e9e944e76cf50ecee1c4e73ae 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.8 1997/09/08 02:28:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.9 1997/09/08 21:46:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@
*/
#ifdef NOT_USED
static Node *
-RuleIdGetActionInfo(Oid ruleoid, bool * instead_flag, Query ** parseTrees)
+RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
{
HeapTuple ruletuple;
char *ruleaction = NULL;
@@ -169,8 +169,8 @@ prs2_addToRelation(Oid relid,
CmdType event_type,
AttrNumber attno,
bool isInstead,
- Node * qual,
- List * actions)
+ Node *qual,
+ List *actions)
{
Relation relation;
RewriteRule *thisRule;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index b384963101efc4cf342ada61dee3524014f2a747..7fa9ab380e6777299cedb4781c058e0474a39c24 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.7 1997/09/08 20:56:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.8 1997/09/08 21:46:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@ typedef struct lookup
{
BufferTag key;
Buffer id;
-} LookupEnt;
+} LookupEnt;
/*
* Initialize shmem hash table for mapping buffers
@@ -74,7 +74,7 @@ InitBufTable()
}
BufferDesc *
-BufTableLookup(BufferTag * tagPtr)
+BufTableLookup(BufferTag *tagPtr)
{
LookupEnt *result;
bool found;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index cdd4909cad1a8c5bd290e21c02f990b5cb5df577..7acc70342caafded6427fcdc7547baf159272b1b 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.22 1997/09/08 20:56:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.23 1997/09/08 21:46:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -93,7 +93,7 @@ ReadBufferWithBufferLock(Relation relation, BlockNumber blockNum,
bool bufferLockHeld);
static BufferDesc *
BufferAlloc(Relation reln, BlockNumber blockNum,
- bool * foundPtr, bool bufferLockHeld);
+ bool *foundPtr, bool bufferLockHeld);
static int FlushBuffer(Buffer buffer, bool release);
static void BufferSync(void);
static int BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld);
@@ -354,7 +354,7 @@ ReadBufferWithBufferLock(Relation reln,
static BufferDesc *
BufferAlloc(Relation reln,
BlockNumber blockNum,
- bool * foundPtr,
+ bool *foundPtr,
bool bufferLockHeld)
{
BufferDesc *buf,
@@ -1154,7 +1154,7 @@ long NDirectFileRead; /* some I/O's are direct file access.
long NDirectFileWrite; /* e.g., I/O in psort and hashjoin. */
void
-PrintBufferUsage(FILE * statfp)
+PrintBufferUsage(FILE *statfp)
{
float hitrate;
float localhitrate;
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 3916abc2a76410ff715196e4d54e1c9c65483df9..480dee7a7c4a2f7bd5f23fac6b559d76d62a0847 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.10 1997/09/08 02:28:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.11 1997/09/08 21:46:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,7 @@ static int nextFreeLocalBuf = 0;
* allocate a local buffer. We do round robin allocation for now.
*/
BufferDesc *
-LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool * foundPtr)
+LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
{
int i;
BufferDesc *bufHdr = (BufferDesc *) NULL;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index aa09bbdfb6b6835d63792e57386abb90acddb2f9..beb0170afedf4efad498414e0b1efcc1b3c6356e 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.24 1997/09/08 02:28:38 momjian Exp $
+ * $Id: fd.c,v 1.25 1997/09/08 21:46:54 momjian Exp $
*
* NOTES:
*
@@ -111,7 +111,7 @@ typedef struct vfd
char *fileName;
int fileFlags;
int fileMode;
-} Vfd;
+} Vfd;
/*
* Virtual File Descriptor array pointer and size. This grows as
@@ -883,7 +883,7 @@ TryAgain:
* AllocateFile()?
*/
void
-FreeFile(FILE * file)
+FreeFile(FILE *file)
{
DO_DB(elog(DEBUG, "FreeFile: Allocated %d.", allocatedFiles));
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index af59de7cca8a34b9648b8c3f85bc481dd11c0400..856ca1350802cfaf702ee98028ae088b15952e8c 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.13 1997/09/08 02:28:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.14 1997/09/08 21:46:59 momjian Exp $
*
* NOTES
*
@@ -73,7 +73,7 @@ typedef struct _PrivateMemStruct
{
int id;
char *memptr;
-} PrivateMem;
+} PrivateMem;
PrivateMem IpcPrivateMem[16];
@@ -668,11 +668,11 @@ AttachSLockMemory(IPCKey key)
slockM = (struct ipcdummy *) IpcMemoryAttach(SLockMemoryId);
if (slockM == IpcMemAttachFailed)
elog(FATAL, "AttachSLockMemory: could not attach segment");
- FreeSLockPP = (SLock **) & (slockM->free);
+ FreeSLockPP = (SLock **) &(slockM->free);
UnusedSLockIP = (int *) &(slockM->unused);
- SLockMemoryLock = (slock_t *) & (slockM->memlock);
+ SLockMemoryLock = (slock_t *) &(slockM->memlock);
S_INIT_LOCK(SLockMemoryLock);
- SLockArray = (SLock *) & (slockM->slocks[0]);
+ SLockArray = (SLock *) &(slockM->slocks[0]);
return;
}
diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c
index 3f75c5bc79bb2799528fd14b47556211e3d087bf..82551f8b96d355f84860acc253cf95d056e0d942 100644
--- a/src/backend/storage/ipc/s_lock.c
+++ b/src/backend/storage/ipc/s_lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.23 1997/09/08 02:28:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.24 1997/09/08 21:47:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,24 +50,24 @@
* slock_t is defined as a struct mutex.
*/
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
mutex_lock(lock);
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
mutex_unlock(lock);
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
mutex_init(lock);
}
/* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */
int
-S_LOCK_FREE(slock_t * lock)
+S_LOCK_FREE(slock_t *lock)
{
/* For Mach, we have to delve inside the entrails of `struct mutex'. Ick! */
return (lock->lock == 0);
@@ -88,7 +88,7 @@ S_LOCK_FREE(slock_t * lock)
* for the R3000 chips out there.
*/
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
/* spin_lock(lock); */
while (!acquire_lock(lock))
@@ -96,20 +96,20 @@ S_LOCK(slock_t * lock)
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
release_lock(lock);
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
init_lock(lock);
}
/* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */
int
-S_LOCK_FREE(slock_t * lock)
+S_LOCK_FREE(slock_t *lock)
{
return (stat_lock(lock) == UNLOCKED);
}
@@ -127,26 +127,26 @@ S_LOCK_FREE(slock_t * lock)
#if defined(__alpha__) || defined(__alpha)
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (msem_lock(lock, MSEM_IF_NOWAIT) < 0)
;
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
msem_unlock(lock, 0);
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
msem_init(lock, MSEM_UNLOCKED);
}
int
-S_LOCK_FREE(slock_t * lock)
+S_LOCK_FREE(slock_t *lock)
{
return (lock->msem_state ? 0 : 1);
}
@@ -161,23 +161,23 @@ S_LOCK_FREE(slock_t * lock)
defined(sparc_solaris)
/* for xxxxx_solaris, this is defined in port/.../tas.s */
-static int tas(slock_t * lock);
+static int tas(slock_t *lock);
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (tas(lock))
;
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -194,20 +194,20 @@ S_INIT_LOCK(slock_t * lock)
#if defined(aix)
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (cs((int *) lock, 0, 1))
;
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -229,29 +229,29 @@ S_INIT_LOCK(slock_t * lock)
*/
static slock_t clear_lock = {-1, -1, -1, -1};
-static int tas(slock_t * lock);
+static int tas(slock_t *lock);
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (tas(lock))
;
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = clear_lock; /* struct assignment */
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
int
-S_LOCK_FREE(slock_t * lock)
+S_LOCK_FREE(slock_t *lock)
{
register int *lock_word = (int *) (((long) lock + 15) & ~15);
@@ -266,22 +266,22 @@ S_LOCK_FREE(slock_t * lock)
#if defined(sun3)
-static int tas(slock_t * lock);
+static int tas(slock_t *lock);
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (tas(lock));
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -320,7 +320,7 @@ tas_dummy()
#define asm(x) __asm__(x)
#endif
-static int tas(slock_t * lock);
+static int tas(slock_t *lock);
static int
tas_dummy()
@@ -386,7 +386,7 @@ S_INIT_LOCK(unsigned char *addr)
#if defined(NEED_I386_TAS_ASM)
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
slock_t res;
@@ -397,13 +397,13 @@ __asm__("xchgb %0,%1": "=q"(res), "=m"(*lock):"0"(0x1));
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -414,7 +414,7 @@ S_INIT_LOCK(slock_t * lock)
#if defined(__alpha__) && defined(linux)
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
slock_t res;
@@ -437,14 +437,14 @@ __asm__(" ldq $0, %0 \n\
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
__asm__("mb");
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -454,7 +454,7 @@ S_INIT_LOCK(slock_t * lock)
#if defined(linux) && defined(sparc)
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
slock_t res;
@@ -467,13 +467,13 @@ S_LOCK(slock_t * lock)
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
@@ -502,20 +502,20 @@ success: \n\
}
void
-S_LOCK(slock_t * lock)
+S_LOCK(slock_t *lock)
{
while (tas(lock))
;
}
void
-S_UNLOCK(slock_t * lock)
+S_UNLOCK(slock_t *lock)
{
*lock = 0;
}
void
-S_INIT_LOCK(slock_t * lock)
+S_INIT_LOCK(slock_t *lock)
{
S_UNLOCK(lock);
}
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 5a1af74584d55812891313a46c6861b056bb4f7a..a83dc9b11c580ae1e31770b633e69c70cb108d79 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.12 1997/09/08 02:28:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.13 1997/09/08 21:47:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -342,7 +342,7 @@ HTAB *
ShmemInitHash(char *name, /* table string name for binding */
long init_size, /* initial size */
long max_size, /* max size of the table */
- HASHCTL * infoP, /* info about key and bucket size */
+ HASHCTL *infoP, /* info about key and bucket size */
int hash_flags) /* info about infoP */
{
bool found;
@@ -400,7 +400,7 @@ ShmemInitHash(char *name, /* table string name for binding */
* locationPtr.
*/
bool
-ShmemPIDLookup(int pid, SHMEM_OFFSET * locationPtr)
+ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr)
{
BindingEnt *result,
item;
@@ -497,7 +497,7 @@ ShmemPIDDestroy(int pid)
* initialized).
*/
long *
-ShmemInitStruct(char *name, unsigned long size, bool * foundPtr)
+ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
{
BindingEnt *result,
item;
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index d4cf06f17180575ce43facac9b3ba9e65f59b7f9..caba5ff637848f84978aabd4cd97c6af53582722 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.5 1997/09/08 02:28:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.6 1997/09/08 21:47:10 momjian Exp $
*
* NOTES
*
@@ -39,7 +39,7 @@
* to itself
*/
void
-SHMQueueInit(SHM_QUEUE * queue)
+SHMQueueInit(SHM_QUEUE *queue)
{
Assert(SHM_PTR_VALID(queue));
(queue)->prev = (queue)->next = MAKE_OFFSET(queue);
@@ -51,7 +51,7 @@ SHMQueueInit(SHM_QUEUE * queue)
*/
#ifdef NOT_USED
bool
-SHMQueueIsDetached(SHM_QUEUE * queue)
+SHMQueueIsDetached(SHM_QUEUE *queue)
{
Assert(SHM_PTR_VALID(queue));
return ((queue)->prev == INVALID_OFFSET);
@@ -63,7 +63,7 @@ SHMQueueIsDetached(SHM_QUEUE * queue)
* SHMQueueElemInit -- clear an element's links
*/
void
-SHMQueueElemInit(SHM_QUEUE * queue)
+SHMQueueElemInit(SHM_QUEUE *queue)
{
Assert(SHM_PTR_VALID(queue));
(queue)->prev = (queue)->next = INVALID_OFFSET;
@@ -74,7 +74,7 @@ SHMQueueElemInit(SHM_QUEUE * queue)
* close the links
*/
void
-SHMQueueDelete(SHM_QUEUE * queue)
+SHMQueueDelete(SHM_QUEUE *queue)
{
SHM_QUEUE *nextElem = (SHM_QUEUE *) MAKE_PTR((queue)->next);
SHM_QUEUE *prevElem = (SHM_QUEUE *) MAKE_PTR((queue)->prev);
@@ -97,7 +97,7 @@ SHMQueueDelete(SHM_QUEUE * queue)
#ifdef SHMQUEUE_DEBUG
void
-dumpQ(SHM_QUEUE * q, char *s)
+dumpQ(SHM_QUEUE *q, char *s)
{
char elem[16];
char buf[1024];
@@ -152,7 +152,7 @@ dumpQ(SHM_QUEUE * q, char *s)
*/
#ifdef NOT_USED
void
-SHMQueueInsertHD(SHM_QUEUE * queue, SHM_QUEUE * elem)
+SHMQueueInsertHD(SHM_QUEUE *queue, SHM_QUEUE *elem)
{
SHM_QUEUE *prevPtr = (SHM_QUEUE *) MAKE_PTR((queue)->prev);
SHMEM_OFFSET elemOffset = MAKE_OFFSET(elem);
@@ -177,7 +177,7 @@ SHMQueueInsertHD(SHM_QUEUE * queue, SHM_QUEUE * elem)
#endif
void
-SHMQueueInsertTL(SHM_QUEUE * queue, SHM_QUEUE * elem)
+SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem)
{
SHM_QUEUE *nextPtr = (SHM_QUEUE *) MAKE_PTR((queue)->next);
SHMEM_OFFSET elemOffset = MAKE_OFFSET(elem);
@@ -222,7 +222,7 @@ SHMQueueInsertTL(SHM_QUEUE * queue, SHM_QUEUE * elem)
* next.
*/
void
-SHMQueueFirst(SHM_QUEUE * queue, Pointer * nextPtrPtr, SHM_QUEUE * nextQueue)
+SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, SHM_QUEUE *nextQueue)
{
SHM_QUEUE *elemPtr = (SHM_QUEUE *) MAKE_PTR((queue)->next);
@@ -243,7 +243,7 @@ SHMQueueFirst(SHM_QUEUE * queue, Pointer * nextPtrPtr, SHM_QUEUE * nextQueue)
* SHMQueueEmpty -- TRUE if queue head is only element, FALSE otherwise
*/
bool
-SHMQueueEmpty(SHM_QUEUE * queue)
+SHMQueueEmpty(SHM_QUEUE *queue)
{
Assert(SHM_PTR_VALID(queue));
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 368b2675bd1e0b3f9058b9d04de3328f1e135331..6bdf5a9f521ed1e808b37c49043456f16fcd8868 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.7 1997/09/08 02:29:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.8 1997/09/08 21:47:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,9 +59,9 @@ IpcSemaphoreId SharedInvalidationSemaphore;
SISeg *shmInvalBuffer;
extern BackendId MyBackendId;
-static void CleanupInvalidationState(int status, SISeg * segInOutP);
-static BackendId SIAssignBackendId(SISeg * segInOutP, BackendTag backendTag);
-static int SIGetNumEntries(SISeg * segP);
+static void CleanupInvalidationState(int status, SISeg *segInOutP);
+static BackendId SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag);
+static int SIGetNumEntries(SISeg *segP);
/************************************************************************/
/* SISetActiveProcess(segP, backendId) set the backend status active */
@@ -69,7 +69,7 @@ static int SIGetNumEntries(SISeg * segP);
/************************************************************************/
/* XXX I suspect that the segP parameter is extraneous. -hirohama */
static void
-SISetActiveProcess(SISeg * segInOutP, BackendId backendId)
+SISetActiveProcess(SISeg *segInOutP, BackendId backendId)
{
/* mark all messages as read */
@@ -83,7 +83,7 @@ SISetActiveProcess(SISeg * segInOutP, BackendId backendId)
/* SIBackendInit() initializes a backend to operate on the buffer */
/****************************************************************************/
int
-SIBackendInit(SISeg * segInOutP)
+SIBackendInit(SISeg *segInOutP)
{
LRelId LtCreateRelId();
TransactionId LMITransactionIdCopy();
@@ -109,7 +109,7 @@ SIBackendInit(SISeg * segInOutP)
* ----------------
*/
static BackendId
-SIAssignBackendId(SISeg * segInOutP, BackendTag backendTag)
+SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
{
Index index;
ProcState *stateP;
@@ -180,7 +180,7 @@ SIAssignBackendId(SISeg * segInOutP, BackendTag backendTag)
/* should be called only by the postmaster when a backend died */
/************************************************************************/
static void
-SISetDeadProcess(SISeg * segP, int backendId)
+SISetDeadProcess(SISeg *segP, int backendId)
{
/* XXX call me.... */
@@ -197,7 +197,7 @@ SISetDeadProcess(SISeg * segP, int backendId)
*/
static void
CleanupInvalidationState(int status, /* XXX */
- SISeg * segInOutP) /* XXX style */
+ SISeg *segInOutP) /* XXX style */
{
Assert(PointerIsValid(segInOutP));
@@ -237,7 +237,7 @@ SIComputeSize(int *segSize)
/* SISetStartEntrySection(segP, offset) - sets the offset */
/************************************************************************/
static void
-SISetStartEntrySection(SISeg * segP, Offset offset)
+SISetStartEntrySection(SISeg *segP, Offset offset)
{
segP->startEntrySection = offset;
}
@@ -246,7 +246,7 @@ SISetStartEntrySection(SISeg * segP, Offset offset)
/* SIGetStartEntrySection(segP) - returnss the offset */
/************************************************************************/
static Offset
-SIGetStartEntrySection(SISeg * segP)
+SIGetStartEntrySection(SISeg *segP)
{
return (segP->startEntrySection);
}
@@ -256,7 +256,7 @@ SIGetStartEntrySection(SISeg * segP)
/* SISetEndEntrySection(segP, offset) - sets the offset */
/************************************************************************/
static void
-SISetEndEntrySection(SISeg * segP, Offset offset)
+SISetEndEntrySection(SISeg *segP, Offset offset)
{
segP->endEntrySection = offset;
}
@@ -265,7 +265,7 @@ SISetEndEntrySection(SISeg * segP, Offset offset)
/* SISetEndEntryChain(segP, offset) - sets the offset */
/************************************************************************/
static void
-SISetEndEntryChain(SISeg * segP, Offset offset)
+SISetEndEntryChain(SISeg *segP, Offset offset)
{
segP->endEntryChain = offset;
}
@@ -274,7 +274,7 @@ SISetEndEntryChain(SISeg * segP, Offset offset)
/* SIGetEndEntryChain(segP) - returnss the offset */
/************************************************************************/
static Offset
-SIGetEndEntryChain(SISeg * segP)
+SIGetEndEntryChain(SISeg *segP)
{
return (segP->endEntryChain);
}
@@ -283,7 +283,7 @@ SIGetEndEntryChain(SISeg * segP)
/* SISetStartEntryChain(segP, offset) - sets the offset */
/************************************************************************/
static void
-SISetStartEntryChain(SISeg * segP, Offset offset)
+SISetStartEntryChain(SISeg *segP, Offset offset)
{
segP->startEntryChain = offset;
}
@@ -292,7 +292,7 @@ SISetStartEntryChain(SISeg * segP, Offset offset)
/* SIGetStartEntryChain(segP) - returns the offset */
/************************************************************************/
static Offset
-SIGetStartEntryChain(SISeg * segP)
+SIGetStartEntryChain(SISeg *segP)
{
return (segP->startEntryChain);
}
@@ -301,7 +301,7 @@ SIGetStartEntryChain(SISeg * segP)
/* SISetNumEntries(segP, num) sets the current nuber of entries */
/************************************************************************/
static bool
-SISetNumEntries(SISeg * segP, int num)
+SISetNumEntries(SISeg *segP, int num)
{
if (num <= MAXNUMMESSAGES)
{
@@ -318,7 +318,7 @@ SISetNumEntries(SISeg * segP, int num)
/* SIGetNumEntries(segP) - returns the current nuber of entries */
/************************************************************************/
static int
-SIGetNumEntries(SISeg * segP)
+SIGetNumEntries(SISeg *segP)
{
return (segP->numEntries);
}
@@ -328,7 +328,7 @@ SIGetNumEntries(SISeg * segP)
/* SISetMaxNumEntries(segP, num) sets the maximal number of entries */
/************************************************************************/
static bool
-SISetMaxNumEntries(SISeg * segP, int num)
+SISetMaxNumEntries(SISeg *segP, int num)
{
if (num <= MAXNUMMESSAGES)
{
@@ -346,7 +346,7 @@ SISetMaxNumEntries(SISeg * segP, int num)
/* SIGetProcStateLimit(segP, i) returns the limit of read messages */
/************************************************************************/
static int
-SIGetProcStateLimit(SISeg * segP, int i)
+SIGetProcStateLimit(SISeg *segP, int i)
{
return (segP->procState[i].limit);
}
@@ -355,7 +355,7 @@ SIGetProcStateLimit(SISeg * segP, int i)
/* SIIncNumEntries(segP, num) increments the current nuber of entries */
/************************************************************************/
static bool
-SIIncNumEntries(SISeg * segP, int num)
+SIIncNumEntries(SISeg *segP, int num)
{
if ((segP->numEntries + num) <= MAXNUMMESSAGES)
{
@@ -372,7 +372,7 @@ SIIncNumEntries(SISeg * segP, int num)
/* SIDecNumEntries(segP, num) decrements the current nuber of entries */
/************************************************************************/
static bool
-SIDecNumEntries(SISeg * segP, int num)
+SIDecNumEntries(SISeg *segP, int num)
{
if ((segP->numEntries - num) >= 0)
{
@@ -389,7 +389,7 @@ SIDecNumEntries(SISeg * segP, int num)
/* SISetStartFreeSpace(segP, offset) - sets the offset */
/************************************************************************/
static void
-SISetStartFreeSpace(SISeg * segP, Offset offset)
+SISetStartFreeSpace(SISeg *segP, Offset offset)
{
segP->startFreeSpace = offset;
}
@@ -398,7 +398,7 @@ SISetStartFreeSpace(SISeg * segP, Offset offset)
/* SIGetStartFreeSpace(segP) - returns the offset */
/************************************************************************/
static Offset
-SIGetStartFreeSpace(SISeg * segP)
+SIGetStartFreeSpace(SISeg *segP)
{
return (segP->startFreeSpace);
}
@@ -409,7 +409,7 @@ SIGetStartFreeSpace(SISeg * segP)
/* SIGetFirstDataEntry(segP) returns first data entry */
/************************************************************************/
static SISegEntry *
-SIGetFirstDataEntry(SISeg * segP)
+SIGetFirstDataEntry(SISeg *segP)
{
SISegEntry *eP;
Offset startChain;
@@ -430,7 +430,7 @@ SIGetFirstDataEntry(SISeg * segP)
/* SIGetLastDataEntry(segP) returns last data entry in the chain */
/************************************************************************/
static SISegEntry *
-SIGetLastDataEntry(SISeg * segP)
+SIGetLastDataEntry(SISeg *segP)
{
SISegEntry *eP;
Offset endChain;
@@ -450,7 +450,7 @@ SIGetLastDataEntry(SISeg * segP)
/* SIGetNextDataEntry(segP, offset) returns next data entry */
/************************************************************************/
static SISegEntry *
-SIGetNextDataEntry(SISeg * segP, Offset offset)
+SIGetNextDataEntry(SISeg *segP, Offset offset)
{
SISegEntry *eP;
@@ -468,7 +468,7 @@ SIGetNextDataEntry(SISeg * segP, Offset offset)
/* SIGetNthDataEntry(segP, n) returns the n-th data entry in chain */
/************************************************************************/
static SISegEntry *
-SIGetNthDataEntry(SISeg * segP,
+SIGetNthDataEntry(SISeg *segP,
int n) /* must range from 1 to MaxMessages */
{
SISegEntry *eP;
@@ -491,7 +491,7 @@ SIGetNthDataEntry(SISeg * segP,
/* SIEntryOffset(segP, entryP) returns the offset for an pointer */
/************************************************************************/
static Offset
-SIEntryOffset(SISeg * segP, SISegEntry * entryP)
+SIEntryOffset(SISeg *segP, SISegEntry *entryP)
{
/* relative to B !! */
return ((Offset) ((Pointer) entryP -
@@ -504,7 +504,7 @@ SIEntryOffset(SISeg * segP, SISegEntry * entryP)
/* SISetDataEntry(segP, data) - sets a message in the segemnt */
/************************************************************************/
bool
-SISetDataEntry(SISeg * segP, SharedInvalidData * data)
+SISetDataEntry(SISeg *segP, SharedInvalidData *data)
{
Offset offsetToNewData;
SISegEntry *eP,
@@ -543,7 +543,7 @@ SISetDataEntry(SISeg * segP, SharedInvalidData * data)
/* SIDecProcLimit(segP, num) decrements all process limits */
/************************************************************************/
static void
-SIDecProcLimit(SISeg * segP, int num)
+SIDecProcLimit(SISeg *segP, int num)
{
int i;
@@ -568,7 +568,7 @@ SIDecProcLimit(SISeg * segP, int num)
/* SIDelDataEntry(segP) - free the FIRST entry */
/************************************************************************/
bool
-SIDelDataEntry(SISeg * segP)
+SIDelDataEntry(SISeg *segP)
{
SISegEntry *e1P;
@@ -600,7 +600,7 @@ SIDelDataEntry(SISeg * segP)
/* invalid */
/************************************************************************/
void
-SISetProcStateInvalid(SISeg * segP)
+SISetProcStateInvalid(SISeg *segP)
{
int i;
@@ -625,7 +625,7 @@ SISetProcStateInvalid(SISeg * segP)
/* and executes function */
/************************************************************************/
void
-SIReadEntryData(SISeg * segP,
+SIReadEntryData(SISeg *segP,
int backendId,
void (*invalFunction) (),
void (*resetFunction) ())
@@ -673,7 +673,7 @@ SIReadEntryData(SISeg * segP,
/* SIDelExpiredDataEntries (segP) - removes irrelevant messages */
/************************************************************************/
void
-SIDelExpiredDataEntries(SISeg * segP)
+SIDelExpiredDataEntries(SISeg *segP)
{
int min,
i,
@@ -709,7 +709,7 @@ SIDelExpiredDataEntries(SISeg * segP)
/* SISegInit(segP) - initializes the segment */
/************************************************************************/
static void
-SISegInit(SISeg * segP)
+SISegInit(SISeg *segP)
{
SISegOffsets *oP;
int segSize,
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 38cf0b47995ac132af36b6a7601bbee57c71e70f..f31f7e208f0e9cf5e98176e36dfad3ee9f8554d0 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.16 1997/09/08 20:56:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.17 1997/09/08 21:47:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,14 +64,14 @@
/* non-export function prototypes */
static HeapTuple
-inv_newtuple(LargeObjectDesc * obj_desc, Buffer buffer,
+inv_newtuple(LargeObjectDesc *obj_desc, Buffer buffer,
Page page, char *dbuf, int nwrite);
-static HeapTuple inv_fetchtup(LargeObjectDesc * obj_desc, Buffer *bufP);
-static int inv_wrnew(LargeObjectDesc * obj_desc, char *buf, int nbytes);
+static HeapTuple inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *bufP);
+static int inv_wrnew(LargeObjectDesc *obj_desc, char *buf, int nbytes);
static int
-inv_wrold(LargeObjectDesc * obj_desc, char *dbuf, int nbytes,
+inv_wrold(LargeObjectDesc *obj_desc, char *dbuf, int nbytes,
HeapTuple htup, Buffer buffer);
-static void inv_indextup(LargeObjectDesc * obj_desc, HeapTuple htup);
+static void inv_indextup(LargeObjectDesc *obj_desc, HeapTuple htup);
static int _inv_getsize(Relation hreln, TupleDesc hdesc, Relation ireln);
/*
@@ -267,7 +267,7 @@ inv_open(Oid lobjId, int flags)
* Closes an existing large object descriptor.
*/
void
-inv_close(LargeObjectDesc * obj_desc)
+inv_close(LargeObjectDesc *obj_desc)
{
Assert(PointerIsValid(obj_desc));
@@ -313,7 +313,7 @@ inv_destroy(Oid lobjId)
*/
#ifdef NOT_USED
int
-inv_stat(LargeObjectDesc * obj_desc, struct pgstat * stbuf)
+inv_stat(LargeObjectDesc *obj_desc, struct pgstat * stbuf)
{
Assert(PointerIsValid(obj_desc));
Assert(stbuf != NULL);
@@ -346,7 +346,7 @@ inv_stat(LargeObjectDesc * obj_desc, struct pgstat * stbuf)
#endif
int
-inv_seek(LargeObjectDesc * obj_desc, int offset, int whence)
+inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
{
int oldOffset;
Datum d;
@@ -423,7 +423,7 @@ inv_seek(LargeObjectDesc * obj_desc, int offset, int whence)
}
int
-inv_tell(LargeObjectDesc * obj_desc)
+inv_tell(LargeObjectDesc *obj_desc)
{
Assert(PointerIsValid(obj_desc));
@@ -431,7 +431,7 @@ inv_tell(LargeObjectDesc * obj_desc)
}
int
-inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes)
+inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
{
HeapTuple htup;
Buffer b;
@@ -495,7 +495,7 @@ inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes)
}
int
-inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes)
+inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes)
{
HeapTuple htup;
Buffer b;
@@ -576,7 +576,7 @@ inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes)
* such tuple exists.
*/
static HeapTuple
-inv_fetchtup(LargeObjectDesc * obj_desc, Buffer *bufP)
+inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *bufP)
{
HeapTuple htup;
RetrieveIndexResult res;
@@ -691,7 +691,7 @@ inv_fetchtup(LargeObjectDesc * obj_desc, Buffer *bufP)
* number of bytes actually written to the new tuple.
*/
static int
-inv_wrnew(LargeObjectDesc * obj_desc, char *buf, int nbytes)
+inv_wrnew(LargeObjectDesc *obj_desc, char *buf, int nbytes)
{
Relation hr;
HeapTuple ntup;
@@ -762,7 +762,7 @@ inv_wrnew(LargeObjectDesc * obj_desc, char *buf, int nbytes)
}
static int
-inv_wrold(LargeObjectDesc * obj_desc,
+inv_wrold(LargeObjectDesc *obj_desc,
char *dbuf,
int nbytes,
HeapTuple htup,
@@ -939,7 +939,7 @@ inv_wrold(LargeObjectDesc * obj_desc,
}
static HeapTuple
-inv_newtuple(LargeObjectDesc * obj_desc,
+inv_newtuple(LargeObjectDesc *obj_desc,
Buffer buffer,
Page page,
char *dbuf,
@@ -1061,7 +1061,7 @@ inv_newtuple(LargeObjectDesc * obj_desc,
}
static void
-inv_indextup(LargeObjectDesc * obj_desc, HeapTuple htup)
+inv_indextup(LargeObjectDesc *obj_desc, HeapTuple htup)
{
InsertIndexResult res;
Datum v[1];
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 495a11f76a5b7aa47b5374b9523b330788f32954..c0367a992aba2c32e7b5342acd95c946735974d1 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.7 1997/09/08 02:29:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.8 1997/09/08 21:47:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@
#include "storage/bufmgr.h"
#include "access/transam.h" /* for AmiTransactionId */
-static void LRelIdAssign(LRelId * lRelId, Oid dbId, Oid relId);
+static void LRelIdAssign(LRelId *lRelId, Oid dbId, Oid relId);
/* ----------------
*
@@ -166,7 +166,7 @@ bool
DatabaseIdIsMyDatabaseId(Oid databaseId)
{
return (bool)
- (!OidIsValid(databaseId) || databaseId == MyDatabaseId);
+ (!OidIsValid(databaseId) || databaseId == MyDatabaseId);
}
#endif
@@ -180,7 +180,7 @@ bool
LRelIdContainsMyDatabaseId(LRelId lRelId)
{
return (bool)
- (!OidIsValid(lRelId.dbId) || lRelId.dbId == MyDatabaseId);
+ (!OidIsValid(lRelId.dbId) || lRelId.dbId == MyDatabaseId);
}
#endif
@@ -960,7 +960,7 @@ RelationUnsetLockForExtend(Relation relation)
* Create an LRelid --- Why not just pass in a pointer to the storage?
*/
static void
-LRelIdAssign(LRelId * lRelId, Oid dbId, Oid relId)
+LRelIdAssign(LRelId *lRelId, Oid dbId, Oid relId)
{
lRelId->dbId = dbId;
lRelId->relId = relId;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 3bcef3549c8cab24cec5e13cc386d0f552758e92..dc6b7bd466cbca53597dd62b48c957561f44747d 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.13 1997/09/08 02:29:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.14 1997/09/08 21:47:26 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -49,7 +49,7 @@
#include "access/transam.h"
static int
-WaitOnLock(LOCKTAB * ltable, LockTableId tableId, LOCK * lock,
+WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock,
LOCKT lockt);
/*#define LOCK_MGR_DEBUG*/
@@ -194,8 +194,8 @@ LockDisable(int status)
* Notes: just copying. Should only be called once.
*/
static void
-LockTypeInit(LOCKTAB * ltable,
- MASK * conflictsP,
+LockTypeInit(LOCKTAB *ltable,
+ MASK *conflictsP,
int *prioP,
int ntypes)
{
@@ -222,7 +222,7 @@ LockTypeInit(LOCKTAB * ltable,
*/
LockTableId
LockTabInit(char *tabName,
- MASK * conflictsP,
+ MASK *conflictsP,
int *prioP,
int ntypes)
{
@@ -452,7 +452,7 @@ LockTabRename(LockTableId tableId)
#endif
*/
bool
-LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
+LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt)
{
XIDLookupEnt *result,
item;
@@ -559,7 +559,7 @@ LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
}
#endif
- result = (XIDLookupEnt *) hash_search(xidTable, (Pointer) & item, HASH_ENTER, &found);
+ result = (XIDLookupEnt *) hash_search(xidTable, (Pointer) &item, HASH_ENTER, &found);
if (!result)
{
elog(NOTICE, "LockAcquire: xid table corrupted");
@@ -619,7 +619,7 @@ LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
if (!result->nHolding)
{
SHMQueueDelete(&result->queue);
- hash_search(xidTable, (Pointer) & item, HASH_REMOVE, &found);
+ hash_search(xidTable, (Pointer) &item, HASH_REMOVE, &found);
}
lock->nHolding--;
lock->holders[lockt]--;
@@ -656,8 +656,8 @@ LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
* ----------------------------
*/
int
-LockResolveConflicts(LOCKTAB * ltable,
- LOCK * lock,
+LockResolveConflicts(LOCKTAB *ltable,
+ LOCK *lock,
LOCKT lockt,
TransactionId xid)
{
@@ -690,7 +690,7 @@ LockResolveConflicts(LOCKTAB * ltable,
#endif
if (!(result = (XIDLookupEnt *)
- hash_search(xidTable, (Pointer) & item, HASH_ENTER, &found)))
+ hash_search(xidTable, (Pointer) &item, HASH_ENTER, &found)))
{
elog(NOTICE, "LockResolveConflicts: xid table corrupted");
return (STATUS_ERROR);
@@ -770,7 +770,7 @@ LockResolveConflicts(LOCKTAB * ltable,
}
static int
-WaitOnLock(LOCKTAB * ltable, LockTableId tableId, LOCK * lock, LOCKT lockt)
+WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, LOCKT lockt)
{
PROC_QUEUE *waitQueue = &(lock->waitProcs);
@@ -819,7 +819,7 @@ WaitOnLock(LOCKTAB * ltable, LockTableId tableId, LOCK * lock, LOCKT lockt)
* come along and request the lock).
*/
bool
-LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
+LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt)
{
LOCK *lock = NULL;
SPINLOCK masterLock;
@@ -935,7 +935,7 @@ LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
*/
Assert(ltable->lockHash->hash == tag_hash);
lock = (LOCK *) hash_search(ltable->lockHash,
- (Pointer) & (lock->tag),
+ (Pointer) &(lock->tag),
HASH_REMOVE_SAVED,
&found);
Assert(lock && found);
@@ -971,7 +971,7 @@ LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
#endif
if (!(result = (XIDLookupEnt *) hash_search(xidTable,
- (Pointer) & item,
+ (Pointer) &item,
HASH_FIND_SAVE,
&found))
|| !found)
@@ -1020,7 +1020,7 @@ LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
if (result->queue.next != INVALID_OFFSET)
SHMQueueDelete(&result->queue);
if (!(result = (XIDLookupEnt *)
- hash_search(xidTable, (Pointer) & item, HASH_REMOVE_SAVED, &found)) ||
+ hash_search(xidTable, (Pointer) &item, HASH_REMOVE_SAVED, &found)) ||
!found)
{
SpinRelease(masterLock);
@@ -1062,7 +1062,7 @@ LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
*/
Assert(ltable->lockHash->hash == tag_hash);
lock = (LOCK *) hash_search(ltable->lockHash,
- (Pointer) & (lock->tag),
+ (Pointer) &(lock->tag),
HASH_REMOVE,
&found);
Assert(lock && found);
@@ -1103,7 +1103,7 @@ LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt)
* the new lock holder.
*/
void
-GrantLock(LOCK * lock, LOCKT lockt)
+GrantLock(LOCK *lock, LOCKT lockt)
{
lock->nActive++;
lock->activeHolders[lockt]++;
@@ -1123,7 +1123,7 @@ GrantLock(LOCK * lock, LOCKT lockt)
*/
#endif
bool
-LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue)
+LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue)
{
PROC_QUEUE *waitQueue;
int done;
@@ -1168,7 +1168,7 @@ LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue)
#ifdef USER_LOCKS
SpinAcquire(masterLock);
#endif
- SHMQueueFirst(lockQueue, (Pointer *) & xidLook, &xidLook->queue);
+ SHMQueueFirst(lockQueue, (Pointer *) &xidLook, &xidLook->queue);
XID_PRINT("LockReleaseAll", xidLook);
@@ -1312,7 +1312,7 @@ LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue)
Assert(ltable->lockHash->hash == tag_hash);
lock = (LOCK *)
- hash_search(ltable->lockHash, (Pointer) & (lock->tag), HASH_REMOVE, &found);
+ hash_search(ltable->lockHash, (Pointer) &(lock->tag), HASH_REMOVE, &found);
if ((!lock) || (!found))
{
SpinRelease(masterLock);
@@ -1341,7 +1341,7 @@ next_item:
#endif
if (done)
break;
- SHMQueueFirst(&xidLook->queue, (Pointer *) & tmp, &tmp->queue);
+ SHMQueueFirst(&xidLook->queue, (Pointer *) &tmp, &tmp->queue);
xidLook = tmp;
}
SpinRelease(masterLock);
@@ -1444,7 +1444,7 @@ DumpLocks()
if (SHMQueueEmpty(lockQueue))
return;
- SHMQueueFirst(lockQueue, (Pointer *) & xidLook, &xidLook->queue);
+ SHMQueueFirst(lockQueue, (Pointer *) &xidLook, &xidLook->queue);
end = MAKE_OFFSET(lockQueue);
LOCK_DUMP("DumpLocks", MyProc->waitLock, 0);
@@ -1471,7 +1471,7 @@ DumpLocks()
if (done)
break;
- SHMQueueFirst(&xidLook->queue, (Pointer *) & tmp, &tmp->queue);
+ SHMQueueFirst(&xidLook->queue, (Pointer *) &tmp, &tmp->queue);
xidLook = tmp;
}
}
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 529c889b163eef4be44133d4d7de192f76456218..f62129595d3d8a8b6db054f68f12b513a58e9417 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.6 1997/09/08 02:29:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.7 1997/09/08 21:47:29 momjian Exp $
*
* NOTES:
* (1) The lock.c module assumes that the caller here is doing
@@ -30,10 +30,10 @@
#include "miscadmin.h" /* MyDatabaseId */
static bool
-MultiAcquire(LockTableId tableId, LOCKTAG * tag, LOCKT lockt,
+MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt,
LOCK_LEVEL level);
static bool
-MultiRelease(LockTableId tableId, LOCKTAG * tag, LOCKT lockt,
+MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt,
LOCK_LEVEL level);
/*
@@ -199,7 +199,7 @@ MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt)
*/
static bool
MultiAcquire(LockTableId tableId,
- LOCKTAG * tag,
+ LOCKTAG *tag,
LOCKT lockt,
LOCK_LEVEL level)
{
@@ -359,7 +359,7 @@ MultiReleaseReln(LockInfo linfo, LOCKT lockt)
*/
static bool
MultiRelease(LockTableId tableId,
- LOCKTAG * tag,
+ LOCKTAG *tag,
LOCKT lockt,
LOCK_LEVEL level)
{
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index ddcb4ac7248c30b2634f5562fc86b1edf89cdcbb..07abe6ce96cd445c1903637dabb21ca99057b8ce 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.20 1997/09/08 02:29:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.21 1997/09/08 21:47:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.20 1997/09/08 02:29:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.21 1997/09/08 21:47:30 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -77,7 +77,7 @@
#include "storage/proc.h"
static void HandleDeadLock(int sig);
-static PROC *ProcWakeup(PROC * proc, int errType);
+static PROC *ProcWakeup(PROC *proc, int errType);
/*
* timeout (in seconds) for resolving possible deadlock
@@ -106,7 +106,7 @@ static PROC_HDR *ProcGlobal = NULL;
PROC *MyProc = NULL;
static void ProcKill(int exitStatus, int pid);
-static void ProcGetNewSemKeyAndNum(IPCKey * key, int *semNum);
+static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum);
static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum);
/*
@@ -441,7 +441,7 @@ ProcQueueAlloc(char *name)
* ProcQueueInit -- initialize a shared memory process queue
*/
void
-ProcQueueInit(PROC_QUEUE * queue)
+ProcQueueInit(PROC_QUEUE *queue)
{
SHMQueueInit(&(queue->links));
queue->size = 0;
@@ -462,11 +462,11 @@ ProcQueueInit(PROC_QUEUE * queue)
* NOTES: The process queue is now a priority queue for locking.
*/
int
-ProcSleep(PROC_QUEUE * queue,
+ProcSleep(PROC_QUEUE *queue,
SPINLOCK spinlock,
int token,
int prio,
- LOCK * lock)
+ LOCK *lock)
{
int i;
PROC *proc;
@@ -556,7 +556,7 @@ ProcSleep(PROC_QUEUE * queue,
* RETURN: the next process in the wait queue.
*/
static PROC *
-ProcWakeup(PROC * proc, int errType)
+ProcWakeup(PROC *proc, int errType)
{
PROC *retProc;
@@ -597,7 +597,7 @@ ProcGetId()
* released.
*/
int
-ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock)
+ProcLockWakeup(PROC_QUEUE *queue, char *ltable, char *lock)
{
PROC *proc;
int count;
@@ -642,7 +642,7 @@ ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock)
}
void
-ProcAddLock(SHM_QUEUE * elem)
+ProcAddLock(SHM_QUEUE *elem)
{
SHMQueueInsertTL(&MyProc->lockQueue, elem);
}
@@ -741,7 +741,7 @@ HandleDeadLock(int sig)
}
void
-ProcReleaseSpins(PROC * proc)
+ProcReleaseSpins(PROC *proc)
{
int i;
@@ -772,7 +772,7 @@ ProcReleaseSpins(PROC * proc)
* semaphore set.)
*/
static void
-ProcGetNewSemKeyAndNum(IPCKey * key, int *semNum)
+ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum)
{
int i;
int32 *freeSemMap = ProcGlobal->freeSemMap;
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 755d29266e68c9fc8afeb609402174e9e56668f8..340a97097476dd881fa286a203515a1b09746d4f 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.20 1997/09/08 02:29:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.21 1997/09/08 21:47:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ typedef struct _MdfdVec
int mdfd_lstbcnt; /* most recent block count */
int mdfd_nextFree; /* next free vector */
struct _MdfdVec *mdfd_chain;/* for large relations */
-} MdfdVec;
+} MdfdVec;
static int Nfds = 100;
static MdfdVec *Md_fdvec = (MdfdVec *) NULL;
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index b3a2648336d8df1a5a898b3be7ca9ef7f6ee9e45..cda65c57f26f77c8c1046f8351602da6ed73aed3 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.10 1997/09/08 02:29:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.11 1997/09/08 21:47:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,7 @@ typedef struct f_smgr
int (*smgr_truncate) ();
int (*smgr_commit) (); /* may be NULL */
int (*smgr_abort) (); /* may be NULL */
-} f_smgr;
+} f_smgr;
/*
* The weird placement of commas in this init block is to keep the compiler
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index 9439dbc0a2e014dfd7d5e372a33f46fa50ac072e..dec7c18f14d5e5b92dfea88d42d29658aef36b15 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.4 1997/09/08 02:29:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.5 1997/09/08 21:47:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
typedef struct smgrid
{
char *smgr_name;
-} smgrid;
+} smgrid;
/*
* StorageManager[] -- List of defined storage managers.
diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index 0e66b0c857b9a90f16acb257e64e71af43741cbb..d1525b2b152d491825d421ec5d6e5b71dbd59261 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.16 1997/09/08 20:56:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.17 1997/09/08 21:47:48 momjian Exp $
*
* NOTES
* See acl.h.
@@ -582,7 +582,7 @@ int32
pg_func_ownercheck(char *usename,
char *funcname,
int nargs,
- Oid * arglist)
+ Oid *arglist)
{
HeapTuple htp;
AclId user_id,
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index c010072199d0071bfeda2e9a703ce432da5d3195..7e70158e588d8ba40091300d28f4de45e2752e30 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.44 1997/09/08 02:29:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.45 1997/09/08 21:47:51 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -146,7 +146,7 @@ typedef struct frontend
FILE *fn_Pfout; /* the output fd */
bool fn_done; /* set after the frontend closes its
* connection */
-} FrontEnd;
+} FrontEnd;
static Dllist *frontendList;
@@ -397,9 +397,9 @@ ReadCommand(char *inBuf, bool multiplexedBackend)
List *
pg_plan(char *query_string, /* string to execute */
- Oid * typev, /* argument types */
+ Oid *typev, /* argument types */
int nargs, /* number of arguments */
- QueryTreeList ** queryListP, /* pointer to the parse trees */
+ QueryTreeList **queryListP, /* pointer to the parse trees */
CommandDest dest) /* where results should go */
{
QueryTreeList *querytree_list;
@@ -646,7 +646,7 @@ pg_plan(char *query_string, /* string to execute */
*/
void
-pg_eval(char *query_string, char **argv, Oid * typev, int nargs)
+pg_eval(char *query_string, char **argv, Oid *typev, int nargs)
{
pg_eval_dest(query_string, argv, typev, nargs, whereToSendOutput);
}
@@ -654,7 +654,7 @@ pg_eval(char *query_string, char **argv, Oid * typev, int nargs)
void
pg_eval_dest(char *query_string,/* string to execute */
char **argv, /* arguments */
- Oid * typev, /* argument types */
+ Oid *typev, /* argument types */
int nargs, /* number of arguments */
CommandDest dest) /* where results should go */
{
@@ -1385,7 +1385,7 @@ PostgresMain(int argc, char *argv[])
if (IsUnderPostmaster == false)
{
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.44 $ $Date: 1997/09/08 02:29:48 $");
+ puts("$Revision: 1.45 $ $Date: 1997/09/08 21:47:51 $");
}
/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 46a2000cf0561cc46283fdc827dc0fd4ff98d4a5..c482c871d8ef6c26ce0d64c7bafbc0748320d698 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.9 1997/09/08 02:29:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.10 1997/09/08 21:47:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@
#include "commands/command.h"
static char *CreateOperationTag(int operationType);
-static void ProcessQueryDesc(QueryDesc * queryDesc);
+static void ProcessQueryDesc(QueryDesc *queryDesc);
/* ----------------------------------------------------------------
@@ -47,8 +47,8 @@ static void ProcessQueryDesc(QueryDesc * queryDesc);
* ----------------------------------------------------------------
*/
QueryDesc *
-CreateQueryDesc(Query * parsetree,
- Plan * plantree,
+CreateQueryDesc(Query *parsetree,
+ Plan *plantree,
CommandDest dest)
{
QueryDesc *qd = (QueryDesc *) palloc(sizeof(QueryDesc));
@@ -150,9 +150,9 @@ CreateOperationTag(int operationType)
void
ProcessPortal(char *portalName,
- Query * parseTree,
- Plan * plan,
- EState * state,
+ Query *parseTree,
+ Plan *plan,
+ EState *state,
TupleDesc attinfo,
CommandDest dest)
{
@@ -203,7 +203,7 @@ ProcessPortal(char *portalName,
* ----------------------------------------------------------------
*/
static void
-ProcessQueryDesc(QueryDesc * queryDesc)
+ProcessQueryDesc(QueryDesc *queryDesc)
{
Query *parseTree;
Plan *plan;
@@ -355,16 +355,16 @@ ProcessQueryDesc(QueryDesc * queryDesc)
*/
void
-ProcessQuery(Query * parsetree,
- Plan * plan,
+ProcessQuery(Query *parsetree,
+ Plan *plan,
char *argv[],
- Oid * typev,
+ Oid *typev,
int nargs,
CommandDest dest)
{
QueryDesc *queryDesc;
extern int dontExecute; /* from postgres.c */
- extern void print_plan(Plan * p, Query * parsetree); /* from print.c */
+ extern void print_plan(Plan *p, Query *parsetree); /* from print.c */
queryDesc = CreateQueryDesc(parsetree, plan, dest);
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 33fe08c45513f9005e86fd78be1cceb9fe6ca83f..76f5865021b27f12f6cc397c93586ec83d63728e 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.23 1997/09/08 02:29:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.24 1997/09/08 21:47:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -75,7 +75,7 @@
* ----------------
*/
void
-ProcessUtility(Node * parsetree,
+ProcessUtility(Node *parsetree,
CommandDest dest)
{
char *commandTag = NULL;
@@ -330,6 +330,7 @@ ProcessUtility(Node * parsetree,
CHECK_IF_ABORTED();
aip = stmt->aclitem;
+
modechg = stmt->modechg;
#ifndef NO_SECURITY
foreach(i, stmt->relNames)
diff --git a/src/backend/tcop/variable.c b/src/backend/tcop/variable.c
index d702bbaa08eee6b308da834c1cab0e4d6f19d814..2f41cedf033a47d83486b1f8450d26e8c57114e1 100644
--- a/src/backend/tcop/variable.c
+++ b/src/backend/tcop/variable.c
@@ -2,7 +2,7 @@
* Routines for handling of 'SET var TO', 'SHOW var' and 'RESET var'
* statements.
*
- * $Id: variable.c,v 1.15 1997/09/08 02:29:52 momjian Exp $
+ * $Id: variable.c,v 1.16 1997/09/08 21:47:59 momjian Exp $
*
*/
@@ -402,9 +402,9 @@ reset_date()
struct VariableParsers
{
const char *name;
- bool(*parser) (const char *);
- bool(*show) ();
- bool(*reset) ();
+ bool (*parser) (const char *);
+ bool (*show) ();
+ bool (*reset) ();
} VariableParsers[] =
{
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index e5156fe776919312e3c819bd43bdd9d824cd469f..cb3e0fc6d3f872e27620fdca3c1bfba7d53a3cb0 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.5 1997/09/08 02:30:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.6 1997/09/08 21:48:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,9 +44,9 @@ static Arr_TgString *TextArray2ArrTgString(char *str);
"select * from Edge e where e.belongsTo = '%s'"
/* static functions only used here */
-static void fillTgElement(TgElement * elem, PortalBuffer * pbuf, int tupno);
-static void fillTgNode(TgRecipe * r, TgNode * node, PortalBuffer * pbuf, int tupno);
-static TgRecipe *fillTgRecipe(PortalBuffer * pbuf, int tupno);
+static void fillTgElement(TgElement * elem, PortalBuffer *pbuf, int tupno);
+static void fillTgNode(TgRecipe * r, TgNode * node, PortalBuffer *pbuf, int tupno);
+static TgRecipe *fillTgRecipe(PortalBuffer *pbuf, int tupno);
static void lookupEdges(TgRecipe * r, char *name);
static void fillAllNodes(TgRecipe * r, char *name);
static void fillAllElements(TgRecipe * r, char *name);
@@ -174,7 +174,7 @@ fillTgNode
-------------------------------------- */
void
-fillTgNode(TgRecipe * r, TgNode * node, PortalBuffer * pbuf, int tupno)
+fillTgNode(TgRecipe * r, TgNode * node, PortalBuffer *pbuf, int tupno)
{
char *nodeType;
char *nodeElem;
@@ -259,7 +259,7 @@ fillTgElement
------------------------------------ */
void
-fillTgElement(TgElement * elem, PortalBuffer * pbuf, int tupno)
+fillTgElement(TgElement * elem, PortalBuffer *pbuf, int tupno)
{
char *srcLang,
*elemType;
@@ -621,7 +621,7 @@ fillTgRecipe
and converts it to a C TgRecipe strcture
------------------------------------ */
TgRecipe *
-fillTgRecipe(PortalBuffer * pbuf, int tupno)
+fillTgRecipe(PortalBuffer *pbuf, int tupno)
{
TgRecipe *r;
int i,
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index 8dc0292061a24f7438396e500b6853765f2ca043..47e1bbb8f6c35a0d9404ced5f5dd3dc0c1745013 100644
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tgRecipe.h,v 1.4 1997/09/08 20:57:05 momjian Exp $
+ * $Id: tgRecipe.h,v 1.5 1997/09/08 21:48:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,8 +27,9 @@ typedef struct
{
double x,
y;
-} Point; /* this should match whatever is in
+} Point; /* this should match whatever is in
+ *
*
*
* geo-decls.h */
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index e1a2db85ff166e274c7fa494dbded804a4618bab..119bac40ef9211decfa1686498ca69c49bafe43a 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.16 1997/09/08 20:57:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.17 1997/09/08 21:48:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -653,13 +653,14 @@ aclmakeuser(char *user_type, char *user)
*/
ChangeACLStmt *
-makeAclStmt(char *privileges, List * rel_list, char *grantee,
+makeAclStmt(char *privileges, List *rel_list, char *grantee,
char grant_or_revoke)
{
ChangeACLStmt *n = makeNode(ChangeACLStmt);
char str[MAX_PARSE_BUFFER];
n->aclitem = (AclItem *) palloc(sizeof(AclItem));
+
/* the grantee string is "G <group_name>", "U <user_name>", or "ALL" */
if (grantee[0] == 'G') /* group permissions */
{
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 7b1cb869a98e734d631f07bda9503380d9f4cc99..a9a32d11c56563658a566b7da2241952147e6fae 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.18 1997/09/08 20:57:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.19 1997/09/08 21:48:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@ _ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[],
#ifdef LOARRAY
static char *
-_ReadLOArray(char *str, int *nbytes, int *fd, bool * chunkFlag,
+_ReadLOArray(char *str, int *nbytes, int *fd, bool *chunkFlag,
int ndim, int dim[], int baseSize);
#endif
@@ -60,7 +60,7 @@ _CopyArrayEls(char **values, char *p, int nitems, int typlen,
char typalign, bool typbyval);
static void
system_cache_lookup(Oid element_type, bool input, int *typlen,
- bool * typbyval, char *typdelim, Oid * typelem, Oid * proc,
+ bool *typbyval, char *typdelim, Oid *typelem, Oid *proc,
char *typalign);
static Datum _ArrayCast(char *value, bool byval, int len);
@@ -74,10 +74,10 @@ _ArrayRange(int st[], int endp[], int bsize, char *destPtr,
static int _ArrayClipCount(int stI[], int endpI[], ArrayType *array);
static void
_LOArrayRange(int st[], int endp[], int bsize, int srcfd,
- int destfd, ArrayType *array, int isSrcLO, bool * isNull);
+ int destfd, ArrayType *array, int isSrcLO, bool *isNull);
static void
_ReadArray(int st[], int endp[], int bsize, int srcfd, int destfd,
- ArrayType *array, int isDestLO, bool * isNull);
+ ArrayType *array, int isDestLO, bool *isNull);
static ArrayCastAndSet(char *src, bool typbyval, int typlen, char *dest);
static SanityCheckInput(int ndim, int n, int dim[], int lb[], int indx[]);
static int array_read(char *destptr, int eltsize, int nitems, char *srcptr);
@@ -521,7 +521,7 @@ static char *
_ReadLOArray(char *str,
int *nbytes,
int *fd,
- bool * chunkFlag,
+ bool *chunkFlag,
int ndim,
int dim[],
int baseSize)
@@ -771,7 +771,7 @@ array_out(ArrayType *v, Oid element_type)
*----------------------------------------------------------------------------
*/
char *
-array_dims(ArrayType *v, bool * isNull)
+array_dims(ArrayType *v, bool *isNull)
{
char *p,
*save_p;
@@ -816,7 +816,7 @@ array_ref(ArrayType *array,
int reftype,
int elmlen,
int arraylen,
- bool * isNull)
+ bool *isNull)
{
int i,
ndim,
@@ -937,7 +937,7 @@ array_clip(ArrayType *array,
int lowerIndx[],
int reftype,
int len,
- bool * isNull)
+ bool *isNull)
{
int i,
ndim,
@@ -1080,7 +1080,7 @@ array_set(ArrayType *array,
int reftype,
int elmlen,
int arraylen,
- bool * isNull)
+ bool *isNull)
{
int ndim,
*dim,
@@ -1215,7 +1215,7 @@ array_assgn(ArrayType *array,
ArrayType *newArr,
int reftype,
int len,
- bool * isNull)
+ bool *isNull)
{
int i,
ndim,
@@ -1301,10 +1301,10 @@ static void
system_cache_lookup(Oid element_type,
bool input,
int *typlen,
- bool * typbyval,
+ bool *typbyval,
char *typdelim,
- Oid * typelem,
- Oid * proc,
+ Oid *typelem,
+ Oid *proc,
char *typalign)
{
HeapTuple typeTuple;
@@ -1343,12 +1343,12 @@ _ArrayCast(char *value, bool byval, int len)
switch (len)
{
case 1:
- return ((Datum) * value);
+ return ((Datum) *value);
case 2:
- return ((Datum) * (int16 *) value);
+ return ((Datum) *(int16 *) value);
case 3:
case 4:
- return ((Datum) * (int32 *) value);
+ return ((Datum) *(int32 *) value);
default:
elog(WARN, "array_ref: byval and elt len > 4!");
break;
@@ -1570,7 +1570,7 @@ _LOArrayRange(int st[],
int destfd,
ArrayType *array,
int isSrcLO,
- bool * isNull)
+ bool *isNull)
{
int n,
*dim,
@@ -1624,7 +1624,7 @@ _ReadArray(int st[],
int destfd,
ArrayType *array,
int isDestLO,
- bool * isNull)
+ bool *isNull)
{
int n,
*dim,
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index a219ea3b832df20845f3e6b19ecd74565e6c0563..6430e9d00f4af7e795ab7fd4185e8998358749f9 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,7 +9,7 @@
* workings can be found in the book "Software Solutions in C" by
* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.11 1997/09/08 02:30:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.12 1997/09/08 21:48:13 momjian Exp $
*/
#include <stdio.h>
@@ -165,7 +165,7 @@ cash_in(const char *str)
* positive-valued amounts. - tgl 97/04/14
*/
const char *
-cash_out(Cash * value)
+cash_out(Cash *value)
{
char *result;
char buf[CASH_BUFSZ];
@@ -271,7 +271,7 @@ cash_out(Cash * value)
bool
-cash_eq(Cash * c1, Cash * c2)
+cash_eq(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -280,7 +280,7 @@ cash_eq(Cash * c1, Cash * c2)
} /* cash_eq() */
bool
-cash_ne(Cash * c1, Cash * c2)
+cash_ne(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -289,7 +289,7 @@ cash_ne(Cash * c1, Cash * c2)
} /* cash_ne() */
bool
-cash_lt(Cash * c1, Cash * c2)
+cash_lt(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -298,7 +298,7 @@ cash_lt(Cash * c1, Cash * c2)
} /* cash_lt() */
bool
-cash_le(Cash * c1, Cash * c2)
+cash_le(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -307,7 +307,7 @@ cash_le(Cash * c1, Cash * c2)
} /* cash_le() */
bool
-cash_gt(Cash * c1, Cash * c2)
+cash_gt(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -316,7 +316,7 @@ cash_gt(Cash * c1, Cash * c2)
} /* cash_gt() */
bool
-cash_ge(Cash * c1, Cash * c2)
+cash_ge(Cash *c1, Cash *c2)
{
if (!PointerIsValid(c1) || !PointerIsValid(c2))
return (FALSE);
@@ -329,7 +329,7 @@ cash_ge(Cash * c1, Cash * c2)
* Add two cash values.
*/
Cash *
-cash_pl(Cash * c1, Cash * c2)
+cash_pl(Cash *c1, Cash *c2)
{
Cash *result;
@@ -349,7 +349,7 @@ cash_pl(Cash * c1, Cash * c2)
* Subtract two cash values.
*/
Cash *
-cash_mi(Cash * c1, Cash * c2)
+cash_mi(Cash *c1, Cash *c2)
{
Cash *result;
@@ -369,7 +369,7 @@ cash_mi(Cash * c1, Cash * c2)
* Multiply cash by floating point number.
*/
Cash *
-cash_mul(Cash * c, float8 * f)
+cash_mul(Cash *c, float8 *f)
{
Cash *result;
@@ -392,7 +392,7 @@ cash_mul(Cash * c, float8 * f)
* Round for now. - tgl 97/04/15
*/
Cash *
-cash_div(Cash * c, float8 * f)
+cash_div(Cash *c, float8 *f)
{
Cash *result;
@@ -415,7 +415,7 @@ cash_div(Cash * c, float8 * f)
* Return larger of two cash values.
*/
Cash *
-cashlarger(Cash * c1, Cash * c2)
+cashlarger(Cash *c1, Cash *c2)
{
Cash *result;
@@ -435,7 +435,7 @@ cashlarger(Cash * c1, Cash * c2)
* Return smaller of two cash values.
*/
Cash *
-cashsmaller(Cash * c1, Cash * c2)
+cashsmaller(Cash *c1, Cash *c2)
{
Cash *result;
@@ -456,7 +456,7 @@ cashsmaller(Cash * c1, Cash * c2)
* Obviously way North American centric - sorry
*/
const char *
-cash_words_out(Cash * value)
+cash_words_out(Cash *value)
{
static char buf[128];
char *p = buf;
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 61f999b6700c7e1ce1350569cff213c07d32e228..9d719319d9a810cb1bcd562e5778fef12cf7e410 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.10 1997/09/08 20:57:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.11 1997/09/08 21:48:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@ charin(char *ch)
{
if (ch == NULL)
return ((int32) NULL);
- return ((int32) * ch);
+ return ((int32) *ch);
}
/*
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index 353a221859ce45ca499bea3043e4c2990ea1a277..ea274467a1287d2c6871e1b5bdb4a43bba15d63b 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.9 1997/09/08 20:57:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.10 1997/09/08 21:48:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ static int
_FindBestChunk(int size, int dmax[], int dbest[], int dim,
int A[MAXPAT][MAXDIM + 1], int N);
static int get_next(int d[], int k, int C, int dmax[]);
-static void initialize_info(CHUNK_INFO * A, int ndim, int dim[], int chunk[]);
+static void initialize_info(CHUNK_INFO *A, int ndim, int dim[], int chunk[]);
#ifdef LOARRAY
static void
@@ -63,7 +63,7 @@ static int seek_and_read(int pos, int size, char buff[], int fp, int from);
#endif
static int
-GetChunkSize(FILE * fd, int ndim, int dim[MAXDIM], int baseSize,
+GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize,
int d[MAXDIM]);
/*------------------------------------------------------------------------
@@ -77,7 +77,7 @@ GetChunkSize(FILE * fd, int ndim, int dim[MAXDIM], int baseSize,
*/
char *
_ChunkArray(int fd,
- FILE * afd,
+ FILE *afd,
int ndim,
int dim[],
int baseSize,
@@ -130,7 +130,7 @@ _ChunkArray(int fd,
*-----------------------------------------------------------------------
*/
static int
-GetChunkSize(FILE * fd,
+GetChunkSize(FILE *fd,
int ndim,
int dim[MAXDIM],
int baseSize,
@@ -276,7 +276,7 @@ static char a_chunk[BLCKSZ + 4];/* 4 since a_chunk is in varlena format */
#endif
static void
-initialize_info(CHUNK_INFO * A, int ndim, int dim[], int chunk[])
+initialize_info(CHUNK_INFO *A, int ndim, int dim[], int chunk[])
{
int i;
@@ -441,7 +441,7 @@ _ReadChunkArray(int st[],
char *destfp,
ArrayType *array,
int isDestLO,
- bool * isNull)
+ bool *isNull)
{
int i,
j,
@@ -638,7 +638,7 @@ _ReadChunkArray1El(int st[],
int bsize,
int fp,
ArrayType *array,
- bool * isNull)
+ bool *isNull)
{
int i,
j,
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 7543780cffa768fe033cf6bddd6437e07a54e938..7843dee6493afaccc201db24b3246bfd774d1a20 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.17 1997/09/08 20:57:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.18 1997/09/08 21:48:21 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -304,7 +304,7 @@ tintervalout(TimeInterval interval)
*****************************************************************************/
RelativeTime
-timespan_reltime(TimeSpan * timespan)
+timespan_reltime(TimeSpan *timespan)
{
RelativeTime time;
int year,
@@ -1071,7 +1071,7 @@ timeofday(void)
gettimeofday(&tp, &tpz);
strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%d %Y %Z",
- localtime((time_t *) & tp.tv_sec));
+ localtime((time_t *) &tp.tv_sec));
sprintf(buf, templ, tp.tv_usec);
len = VARHDRSZ + strlen(buf);
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 0ab3b501022f25d735529f2f444d35d527186332..ed41398dea861b0c68f2255a469e5c791e6754aa 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.15 1997/09/08 02:30:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.16 1997/09/08 21:48:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -268,7 +268,7 @@ date_datetime(DateADT dateVal)
* Convert datetime to date data type.
*/
DateADT
-datetime_date(DateTime * datetime)
+datetime_date(DateTime *datetime)
{
DateADT result;
struct tm tt,
@@ -485,7 +485,7 @@ time_in(char *str)
char *
-time_out(TimeADT * time)
+time_out(TimeADT *time)
{
char *result;
struct tm tt,
@@ -539,7 +539,7 @@ time_out(TimeADT * time)
bool
-time_eq(TimeADT * time1, TimeADT * time2)
+time_eq(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -548,7 +548,7 @@ time_eq(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
bool
-time_ne(TimeADT * time1, TimeADT * time2)
+time_ne(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -557,7 +557,7 @@ time_ne(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
bool
-time_lt(TimeADT * time1, TimeADT * time2)
+time_lt(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -566,7 +566,7 @@ time_lt(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
bool
-time_le(TimeADT * time1, TimeADT * time2)
+time_le(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -575,7 +575,7 @@ time_le(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
bool
-time_gt(TimeADT * time1, TimeADT * time2)
+time_gt(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -584,7 +584,7 @@ time_gt(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
bool
-time_ge(TimeADT * time1, TimeADT * time2)
+time_ge(TimeADT *time1, TimeADT *time2)
{
if (!PointerIsValid(time1) || !PointerIsValid(time2))
return (FALSE);
@@ -593,7 +593,7 @@ time_ge(TimeADT * time1, TimeADT * time2)
} /* time_eq() */
int
-time_cmp(TimeADT * time1, TimeADT * time2)
+time_cmp(TimeADT *time1, TimeADT *time2)
{
return ((*time1 < *time2) ? -1 : (((*time1 > *time2) ? 1 : 0)));
} /* time_cmp() */
@@ -603,7 +603,7 @@ time_cmp(TimeADT * time1, TimeADT * time2)
* Convert date and time to datetime data type.
*/
DateTime *
-datetime_datetime(DateADT date, TimeADT * time)
+datetime_datetime(DateADT date, TimeADT *time)
{
DateTime *result;
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index e7968e9a40c2772de627a13e61391a0f39208323..12c43f1d7e27c022bced3ac01acfe024563e2a43 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.39 1997/09/08 02:30:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.40 1997/09/08 21:48:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,12 +45,12 @@ DecodeTime(char *str, int fmask, int *tmask,
static int DecodeTimezone(char *str, int *tzp);
static int DecodeUnits(int field, char *lowtoken, int *val);
static int EncodeSpecialDateTime(DateTime dt, char *str);
-static datetkn *datebsearch(char *key, datetkn * base, unsigned int nel);
+static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
static DateTime dt2local(DateTime dt, int timezone);
static void dt2time(DateTime dt, int *hour, int *min, double *sec);
static int j2day(int jd);
-static int timespan2tm(TimeSpan span, struct tm * tm, float8 * fsec);
-static int tm2timespan(struct tm * tm, double fsec, TimeSpan * span);
+static int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
+static int tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
#define USE_DATE_CACHE 1
#define ROUND_ALL 0
@@ -162,7 +162,7 @@ datetime_in(char *str)
* Convert a datetime to external form.
*/
char *
-datetime_out(DateTime * dt)
+datetime_out(DateTime *dt)
{
char *result;
int tz;
@@ -258,7 +258,7 @@ timespan_in(char *str)
* Convert a time span to external form.
*/
char *
-timespan_out(TimeSpan * span)
+timespan_out(TimeSpan *span)
{
char *result;
@@ -289,7 +289,7 @@ timespan_out(TimeSpan * span)
bool
-datetime_finite(DateTime * datetime)
+datetime_finite(DateTime *datetime)
{
if (!PointerIsValid(datetime))
return FALSE;
@@ -300,7 +300,7 @@ datetime_finite(DateTime * datetime)
#ifdef NOT_USED
bool
-timespan_finite(TimeSpan * timespan)
+timespan_finite(TimeSpan *timespan)
{
if (!PointerIsValid(timespan))
return FALSE;
@@ -371,7 +371,7 @@ SetDateTime(DateTime dt)
/* datetime_relop - is datetime1 relop datetime2
*/
bool
-datetime_eq(DateTime * datetime1, DateTime * datetime2)
+datetime_eq(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -394,7 +394,7 @@ datetime_eq(DateTime * datetime1, DateTime * datetime2)
} /* datetime_eq() */
bool
-datetime_ne(DateTime * datetime1, DateTime * datetime2)
+datetime_ne(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -417,7 +417,7 @@ datetime_ne(DateTime * datetime1, DateTime * datetime2)
} /* datetime_ne() */
bool
-datetime_lt(DateTime * datetime1, DateTime * datetime2)
+datetime_lt(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -440,7 +440,7 @@ datetime_lt(DateTime * datetime1, DateTime * datetime2)
} /* datetime_lt() */
bool
-datetime_gt(DateTime * datetime1, DateTime * datetime2)
+datetime_gt(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -466,7 +466,7 @@ datetime_gt(DateTime * datetime1, DateTime * datetime2)
} /* datetime_gt() */
bool
-datetime_le(DateTime * datetime1, DateTime * datetime2)
+datetime_le(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -489,7 +489,7 @@ datetime_le(DateTime * datetime1, DateTime * datetime2)
} /* datetime_le() */
bool
-datetime_ge(DateTime * datetime1, DateTime * datetime2)
+datetime_ge(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -516,7 +516,7 @@ datetime_ge(DateTime * datetime1, DateTime * datetime2)
* collate invalid datetime at the end
*/
int
-datetime_cmp(DateTime * datetime1, DateTime * datetime2)
+datetime_cmp(DateTime *datetime1, DateTime *datetime2)
{
DateTime dt1,
dt2;
@@ -552,7 +552,7 @@ datetime_cmp(DateTime * datetime1, DateTime * datetime2)
/* timespan_relop - is timespan1 relop timespan2
*/
bool
-timespan_eq(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_eq(TimeSpan *timespan1, TimeSpan *timespan2)
{
if (!PointerIsValid(timespan1) || !PointerIsValid(timespan2))
return FALSE;
@@ -565,7 +565,7 @@ timespan_eq(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_eq() */
bool
-timespan_ne(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_ne(TimeSpan *timespan1, TimeSpan *timespan2)
{
if (!PointerIsValid(timespan1) || !PointerIsValid(timespan2))
return FALSE;
@@ -578,7 +578,7 @@ timespan_ne(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_ne() */
bool
-timespan_lt(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_lt(TimeSpan *timespan1, TimeSpan *timespan2)
{
double span1,
span2;
@@ -600,7 +600,7 @@ timespan_lt(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_lt() */
bool
-timespan_gt(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_gt(TimeSpan *timespan1, TimeSpan *timespan2)
{
double span1,
span2;
@@ -622,7 +622,7 @@ timespan_gt(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_gt() */
bool
-timespan_le(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_le(TimeSpan *timespan1, TimeSpan *timespan2)
{
double span1,
span2;
@@ -644,7 +644,7 @@ timespan_le(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_le() */
bool
-timespan_ge(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_ge(TimeSpan *timespan1, TimeSpan *timespan2)
{
double span1,
span2;
@@ -669,7 +669,7 @@ timespan_ge(TimeSpan * timespan1, TimeSpan * timespan2)
/* timespan_cmp - 3-state comparison for timespan
*/
int
-timespan_cmp(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_cmp(TimeSpan *timespan1, TimeSpan *timespan2)
{
double span1,
span2;
@@ -707,7 +707,7 @@ timespan_cmp(TimeSpan * timespan1, TimeSpan * timespan2)
*---------------------------------------------------------*/
DateTime *
-datetime_smaller(DateTime * datetime1, DateTime * datetime2)
+datetime_smaller(DateTime *datetime1, DateTime *datetime2)
{
DateTime *result;
@@ -744,7 +744,7 @@ datetime_smaller(DateTime * datetime1, DateTime * datetime2)
} /* datetime_smaller() */
DateTime *
-datetime_larger(DateTime * datetime1, DateTime * datetime2)
+datetime_larger(DateTime *datetime1, DateTime *datetime2)
{
DateTime *result;
@@ -782,7 +782,7 @@ datetime_larger(DateTime * datetime1, DateTime * datetime2)
TimeSpan *
-datetime_mi(DateTime * datetime1, DateTime * datetime2)
+datetime_mi(DateTime *datetime1, DateTime *datetime2)
{
TimeSpan *result;
@@ -831,7 +831,7 @@ datetime_mi(DateTime * datetime1, DateTime * datetime2)
* to the last day of month.
*/
DateTime *
-datetime_pl_span(DateTime * datetime, TimeSpan * span)
+datetime_pl_span(DateTime *datetime, TimeSpan *span)
{
DateTime *result;
DateTime dt;
@@ -925,7 +925,7 @@ datetime_pl_span(DateTime * datetime, TimeSpan * span)
} /* datetime_pl_span() */
DateTime *
-datetime_mi_span(DateTime * datetime, TimeSpan * span)
+datetime_mi_span(DateTime *datetime, TimeSpan *span)
{
DateTime *result;
TimeSpan tspan;
@@ -943,7 +943,7 @@ datetime_mi_span(DateTime * datetime, TimeSpan * span)
TimeSpan *
-timespan_um(TimeSpan * timespan)
+timespan_um(TimeSpan *timespan)
{
TimeSpan *result;
@@ -960,7 +960,7 @@ timespan_um(TimeSpan * timespan)
TimeSpan *
-timespan_smaller(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_smaller(TimeSpan *timespan1, TimeSpan *timespan2)
{
TimeSpan *result;
@@ -1015,7 +1015,7 @@ timespan_smaller(TimeSpan * timespan1, TimeSpan * timespan2)
} /* timespan_smaller() */
TimeSpan *
-timespan_larger(TimeSpan * timespan1, TimeSpan * timespan2)
+timespan_larger(TimeSpan *timespan1, TimeSpan *timespan2)
{
TimeSpan *result;
@@ -1071,7 +1071,7 @@ timespan_larger(TimeSpan * timespan1, TimeSpan * timespan2)
TimeSpan *
-timespan_pl(TimeSpan * span1, TimeSpan * span2)
+timespan_pl(TimeSpan *span1, TimeSpan *span2)
{
TimeSpan *result;
@@ -1087,7 +1087,7 @@ timespan_pl(TimeSpan * span1, TimeSpan * span2)
} /* timespan_pl() */
TimeSpan *
-timespan_mi(TimeSpan * span1, TimeSpan * span2)
+timespan_mi(TimeSpan *span1, TimeSpan *span2)
{
TimeSpan *result;
@@ -1103,7 +1103,7 @@ timespan_mi(TimeSpan * span1, TimeSpan * span2)
} /* timespan_mi() */
TimeSpan *
-timespan_div(TimeSpan * span1, float8 * arg2)
+timespan_div(TimeSpan *span1, float8 *arg2)
{
TimeSpan *result;
@@ -1129,7 +1129,7 @@ timespan_div(TimeSpan * span1, float8 * arg2)
* is done.
*/
TimeSpan *
-datetime_age(DateTime * datetime1, DateTime * datetime2)
+datetime_age(DateTime *datetime1, DateTime *datetime2)
{
TimeSpan *result;
@@ -1276,7 +1276,7 @@ datetime_age(DateTime * datetime1, DateTime * datetime2)
* Convert datetime to text data type.
*/
text *
-datetime_text(DateTime * datetime)
+datetime_text(DateTime *datetime)
{
text *result;
char *str;
@@ -1309,7 +1309,7 @@ datetime_text(DateTime * datetime)
* then call the standard input routine.
*/
DateTime *
-text_datetime(text * str)
+text_datetime(text *str)
{
DateTime *result;
int i;
@@ -1336,7 +1336,7 @@ text_datetime(text * str)
* Convert timespan to text data type.
*/
text *
-timespan_text(TimeSpan * timespan)
+timespan_text(TimeSpan *timespan)
{
text *result;
char *str;
@@ -1370,7 +1370,7 @@ timespan_text(TimeSpan * timespan)
*/
#ifdef NOT_USED
TimeSpan *
-text_timespan(text * str)
+text_timespan(text *str)
{
TimeSpan *result;
int i;
@@ -1398,7 +1398,7 @@ text_timespan(text * str)
* Extract specified field from datetime.
*/
DateTime *
-datetime_trunc(text * units, DateTime * datetime)
+datetime_trunc(text *units, DateTime *datetime)
{
DateTime *result;
@@ -1546,7 +1546,7 @@ datetime_trunc(text * units, DateTime * datetime)
* Extract specified field from timespan.
*/
TimeSpan *
-timespan_trunc(text * units, TimeSpan * timespan)
+timespan_trunc(text *units, TimeSpan *timespan)
{
TimeSpan *result;
@@ -1672,7 +1672,7 @@ timespan_trunc(text * units, TimeSpan * timespan)
* Extract specified field from datetime.
*/
float64
-datetime_part(text * units, DateTime * datetime)
+datetime_part(text *units, DateTime *datetime)
{
float64 result;
@@ -1824,7 +1824,7 @@ datetime_part(text * units, DateTime * datetime)
* Extract specified field from timespan.
*/
float64
-timespan_part(text * units, TimeSpan * timespan)
+timespan_part(text *units, TimeSpan *timespan)
{
float64 result;
@@ -1961,7 +1961,7 @@ timespan_part(text * units, TimeSpan * timespan)
* Encode datetime type with specified time zone.
*/
text *
-datetime_zone(text * zone, DateTime * datetime)
+datetime_zone(text *zone, DateTime *datetime)
{
text *result;
@@ -2553,7 +2553,7 @@ datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn)
* Also, month is one-based, _not_ zero-based.
*/
int
-tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * result)
+tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result)
{
double date,
@@ -2581,7 +2581,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * result)
* Convert a timespan data type to a tm structure.
*/
static int
-timespan2tm(TimeSpan span, struct tm * tm, float8 * fsec)
+timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
{
double time;
@@ -2618,7 +2618,7 @@ timespan2tm(TimeSpan span, struct tm * tm, float8 * fsec)
} /* timespan2tm() */
static int
-tm2timespan(struct tm * tm, double fsec, TimeSpan * span)
+tm2timespan(struct tm * tm, double fsec, TimeSpan *span)
{
span->month = ((tm->tm_year * 12) + tm->tm_mon);
span->time = ((((((tm->tm_mday * 24) + tm->tm_hour) * 60) + tm->tm_min) * 60) + tm->tm_sec);
@@ -3995,7 +3995,7 @@ DecodeUnits(int field, char *lowtoken, int *val)
* is WAY faster than the generic bsearch().
*/
static datetkn *
-datebsearch(char *key, datetkn * base, unsigned int nel)
+datebsearch(char *key, datetkn *base, unsigned int nel)
{
register datetkn *last = base + nel - 1,
*position;
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 03bd767dc65ad582be4bf2025f01ef608edc3031..c69d9141a80cd8c4c4fbd4b19b88845eb30c17cf 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.19 1997/09/08 02:30:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.20 1997/09/08 21:48:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -981,7 +981,7 @@ dtrunc(float64 arg1)
if (*arg1 >= 0)
*result = (float64data) floor(tmp);
else
- *result = (float64data) - (floor(-tmp));
+ *result = (float64data) -(floor(-tmp));
return (result);
}
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 95287601bc508b1d574f8844f1a0bf50b2d745ca..031f754ee65ba246fe74e75851f75a58b2a1791a 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.22 1997/09/08 20:57:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.23 1997/09/08 21:48:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,38 +28,38 @@
#define PI 3.1415926536
#endif
-static int point_inside(Point * p, int npts, Point plist[]);
+static int point_inside(Point *p, int npts, Point plist[]);
static int lseg_crossing(double x, double y, double px, double py);
static BOX *box_construct(double x1, double x2, double y1, double y2);
static BOX *box_copy(BOX *box);
static BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2);
static double box_ht(BOX *box);
static double box_wd(BOX *box);
-static double circle_ar(CIRCLE * circle);
-static CIRCLE *circle_copy(CIRCLE * circle);
-static LINE *line_construct_pm(Point * pt, double m);
-static bool line_horizontal(LINE * line);
-static Point *line_interpt(LINE * l1, LINE * l2);
-static bool line_intersect(LINE * l1, LINE * l2);
-static bool line_parallel(LINE * l1, LINE * l2);
-static bool line_vertical(LINE * line);
-static double lseg_dt(LSEG * l1, LSEG * l2);
-static void make_bound_box(POLYGON * poly);
-static PATH *path_copy(PATH * path);
+static double circle_ar(CIRCLE *circle);
+static CIRCLE *circle_copy(CIRCLE *circle);
+static LINE *line_construct_pm(Point *pt, double m);
+static bool line_horizontal(LINE *line);
+static Point *line_interpt(LINE *l1, LINE *l2);
+static bool line_intersect(LINE *l1, LINE *l2);
+static bool line_parallel(LINE *l1, LINE *l2);
+static bool line_vertical(LINE *line);
+static double lseg_dt(LSEG *l1, LSEG *l2);
+static void make_bound_box(POLYGON *poly);
+static PATH *path_copy(PATH *path);
static bool plist_same(int npts, Point p1[], Point p2[]);
static Point *point_construct(double x, double y);
-static Point *point_copy(Point * pt);
-static int single_decode(char *str, float8 * x, char **ss);
+static Point *point_copy(Point *pt);
+static int single_decode(char *str, float8 *x, char **ss);
static int single_encode(float8 x, char *str);
-static int pair_decode(char *str, float8 * x, float8 * y, char **s);
+static int pair_decode(char *str, float8 *x, float8 *y, char **s);
static int pair_encode(float8 x, float8 y, char *str);
static int pair_count(char *s, char delim);
-static int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point * p);
-static char *path_encode(bool closed, int npts, Point * pt);
-static void statlseg_construct(LSEG * lseg, Point * pt1, Point * pt2);
+static int path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p);
+static char *path_encode(bool closed, int npts, Point *pt);
+static void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
static double box_ar(BOX *box);
-static Point *interpt_sl(LSEG * lseg, LINE * line);
-static LINE *line_construct_pp(Point * pt1, Point * pt2);
+static Point *interpt_sl(LSEG *lseg, LINE *line);
+static LINE *line_construct_pp(Point *pt1, Point *pt2);
/*
@@ -109,7 +109,7 @@ static int digits8 = P_MAXDIG;
*/
static int
-single_decode(char *str, float8 * x, char **s)
+single_decode(char *str, float8 *x, char **s)
{
char *cp;
@@ -141,7 +141,7 @@ single_encode(float8 x, char *str)
} /* single_encode() */
static int
-pair_decode(char *str, float8 * x, float8 * y, char **s)
+pair_decode(char *str, float8 *x, float8 *y, char **s)
{
int has_delim;
char *cp;
@@ -192,7 +192,7 @@ pair_encode(float8 x, float8 y, char *str)
}
static int
-path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point * p)
+path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p)
{
int depth = 0;
char *s,
@@ -264,7 +264,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point * p
} /* path_decode() */
static char *
-path_encode(bool closed, int npts, Point * pt)
+path_encode(bool closed, int npts, Point *pt)
{
char *result = PALLOC(npts * (P_MAXLEN + 3) + 2);
@@ -389,7 +389,7 @@ box_out(BOX *box)
if (!PointerIsValid(box))
return (NULL);
- return (path_encode(-1, 2, (Point *) & (box->high)));
+ return (path_encode(-1, 2, (Point *) &(box->high)));
} /* box_out() */
@@ -777,7 +777,7 @@ box_diagonal(BOX *box)
*---------------------------------------------------------*/
static LINE * /* point-slope */
-line_construct_pm(Point * pt, double m)
+line_construct_pm(Point *pt, double m)
{
LINE *result = PALLOCTYPE(LINE);
@@ -793,7 +793,7 @@ line_construct_pm(Point * pt, double m)
static LINE * /* two points */
-line_construct_pp(Point * pt1, Point * pt2)
+line_construct_pp(Point *pt1, Point *pt2)
{
LINE *result = PALLOCTYPE(LINE);
@@ -845,13 +845,13 @@ line_construct_pp(Point * pt1, Point * pt2)
*---------------------------------------------------------*/
static bool
-line_intersect(LINE * l1, LINE * l2)
+line_intersect(LINE *l1, LINE *l2)
{
return (!line_parallel(l1, l2));
}
static bool
-line_parallel(LINE * l1, LINE * l2)
+line_parallel(LINE *l1, LINE *l2)
{
#if FALSE
return (FPeq(l1->m, l2->m));
@@ -866,7 +866,7 @@ line_parallel(LINE * l1, LINE * l2)
#ifdef NOT_USED
bool
-line_perp(LINE * l1, LINE * l2)
+line_perp(LINE *l1, LINE *l2)
{
#if FALSE
if (l1->m)
@@ -889,7 +889,7 @@ line_perp(LINE * l1, LINE * l2)
#endif
static bool
-line_vertical(LINE * line)
+line_vertical(LINE *line)
{
#if FALSE
return (FPeq(line->A, -1.0) && FPzero(line->B));
@@ -898,7 +898,7 @@ line_vertical(LINE * line)
} /* line_vertical() */
static bool
-line_horizontal(LINE * line)
+line_horizontal(LINE *line)
{
#if FALSE
return (FPzero(line->m));
@@ -908,7 +908,7 @@ line_horizontal(LINE * line)
#ifdef NOT_USED
bool
-line_eq(LINE * l1, LINE * l2)
+line_eq(LINE *l1, LINE *l2)
{
double k;
@@ -933,7 +933,7 @@ line_eq(LINE * l1, LINE * l2)
*---------------------------------------------------------*/
double * /* distance between l1, l2 */
-line_distance(LINE * l1, LINE * l2)
+line_distance(LINE *l1, LINE *l2)
{
double *result = PALLOCTYPE(double);
Point *tmp;
@@ -958,7 +958,7 @@ line_distance(LINE * l1, LINE * l2)
* Point where two lines l1, l2 intersect (if any)
*/
static Point *
-line_interpt(LINE * l1, LINE * l2)
+line_interpt(LINE *l1, LINE *l2)
{
Point *result;
double x,
@@ -1068,7 +1068,7 @@ path_in(char *str)
depth++;
}
- size = offsetof(PATH, p[0]) + (sizeof(path->p[0]) * npts);
+ size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * npts);
path = PALLOC(size);
path->size = size;
@@ -1085,12 +1085,12 @@ path_in(char *str)
char *
-path_out(PATH * path)
+path_out(PATH *path)
{
if (!PointerIsValid(path))
return NULL;
- return (path_encode(path->closed, path->npts, (Point *) & (path->p[0])));
+ return (path_encode(path->closed, path->npts, (Point *) &(path->p[0])));
} /* path_out() */
@@ -1103,31 +1103,31 @@ path_out(PATH * path)
*---------------------------------------------------------*/
bool
-path_n_lt(PATH * p1, PATH * p2)
+path_n_lt(PATH *p1, PATH *p2)
{
return ((p1->npts < p2->npts));
}
bool
-path_n_gt(PATH * p1, PATH * p2)
+path_n_gt(PATH *p1, PATH *p2)
{
return ((p1->npts > p2->npts));
}
bool
-path_n_eq(PATH * p1, PATH * p2)
+path_n_eq(PATH *p1, PATH *p2)
{
return ((p1->npts == p2->npts));
}
bool
-path_n_le(PATH * p1, PATH * p2)
+path_n_le(PATH *p1, PATH *p2)
{
return ((p1->npts <= p2->npts));
}
bool
-path_n_ge(PATH * p1, PATH * p2)
+path_n_ge(PATH *p1, PATH *p2)
{
return ((p1->npts >= p2->npts));
}
@@ -1138,7 +1138,7 @@ path_n_ge(PATH * p1, PATH * p2)
*---------------------------------------------------------*/
bool
-path_isclosed(PATH * path)
+path_isclosed(PATH *path)
{
if (!PointerIsValid(path))
return FALSE;
@@ -1147,7 +1147,7 @@ path_isclosed(PATH * path)
} /* path_isclosed() */
bool
-path_isopen(PATH * path)
+path_isopen(PATH *path)
{
if (!PointerIsValid(path))
return FALSE;
@@ -1157,7 +1157,7 @@ path_isopen(PATH * path)
int4
-path_npoints(PATH * path)
+path_npoints(PATH *path)
{
if (!PointerIsValid(path))
return 0;
@@ -1166,7 +1166,7 @@ path_npoints(PATH * path)
} /* path_npoints() */
PATH *
-path_close(PATH * path)
+path_close(PATH *path)
{
PATH *result;
@@ -1181,7 +1181,7 @@ path_close(PATH * path)
PATH *
-path_open(PATH * path)
+path_open(PATH *path)
{
PATH *result;
@@ -1196,12 +1196,12 @@ path_open(PATH * path)
PATH *
-path_copy(PATH * path)
+path_copy(PATH *path)
{
PATH *result;
int size;
- size = offsetof(PATH, p[0]) + (sizeof(path->p[0]) * path->npts);
+ size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * path->npts);
result = PALLOC(size);
memmove((char *) result, (char *) path, size);
@@ -1215,7 +1215,7 @@ path_copy(PATH * path)
* O(n^2) iterative edge check.
*/
bool
-path_inter(PATH * p1, PATH * p2)
+path_inter(PATH *p1, PATH *p2)
{
BOX b1,
b2;
@@ -1264,7 +1264,7 @@ path_inter(PATH * p1, PATH * p2)
/* this essentially does a cartesian product of the lsegs in the
two paths, and finds the min distance between any two lsegs */
double *
-path_distance(PATH * p1, PATH * p2)
+path_distance(PATH *p1, PATH *p2)
{
double *min = NULL,
*tmp;
@@ -1307,7 +1307,7 @@ path_distance(PATH * p1, PATH * p2)
*---------------------------------------------------------*/
double *
-path_length(PATH * path)
+path_length(PATH *path)
{
double *result;
int i;
@@ -1324,7 +1324,7 @@ path_length(PATH * path)
#ifdef NOT_USED
double
-path_ln(PATH * path)
+path_ln(PATH *path)
{
double result;
int i;
@@ -1375,7 +1375,7 @@ point_in(char *str)
} /* point_in() */
char *
-point_out(Point * pt)
+point_out(Point *pt)
{
if (!PointerIsValid(pt))
return (NULL);
@@ -1396,7 +1396,7 @@ point_construct(double x, double y)
static Point *
-point_copy(Point * pt)
+point_copy(Point *pt)
{
Point *result;
@@ -1421,43 +1421,43 @@ point_copy(Point * pt)
*---------------------------------------------------------*/
bool
-point_left(Point * pt1, Point * pt2)
+point_left(Point *pt1, Point *pt2)
{
return (FPlt(pt1->x, pt2->x));
}
bool
-point_right(Point * pt1, Point * pt2)
+point_right(Point *pt1, Point *pt2)
{
return (FPgt(pt1->x, pt2->x));
}
bool
-point_above(Point * pt1, Point * pt2)
+point_above(Point *pt1, Point *pt2)
{
return (FPgt(pt1->y, pt2->y));
}
bool
-point_below(Point * pt1, Point * pt2)
+point_below(Point *pt1, Point *pt2)
{
return (FPlt(pt1->y, pt2->y));
}
bool
-point_vert(Point * pt1, Point * pt2)
+point_vert(Point *pt1, Point *pt2)
{
return (FPeq(pt1->x, pt2->x));
}
bool
-point_horiz(Point * pt1, Point * pt2)
+point_horiz(Point *pt1, Point *pt2)
{
return (FPeq(pt1->y, pt2->y));
}
bool
-point_eq(Point * pt1, Point * pt2)
+point_eq(Point *pt1, Point *pt2)
{
return (point_horiz(pt1, pt2) && point_vert(pt1, pt2));
}
@@ -1467,7 +1467,7 @@ point_eq(Point * pt1, Point * pt2)
*---------------------------------------------------------*/
int32
-pointdist(Point * p1, Point * p2)
+pointdist(Point *p1, Point *p2)
{
int32 result;
@@ -1476,7 +1476,7 @@ pointdist(Point * p1, Point * p2)
}
double *
-point_distance(Point * pt1, Point * pt2)
+point_distance(Point *pt1, Point *pt2)
{
double *result = PALLOCTYPE(double);
@@ -1486,13 +1486,13 @@ point_distance(Point * pt1, Point * pt2)
double
-point_dt(Point * pt1, Point * pt2)
+point_dt(Point *pt1, Point *pt2)
{
return (HYPOT(pt1->x - pt2->x, pt1->y - pt2->y));
}
double *
-point_slope(Point * pt1, Point * pt2)
+point_slope(Point *pt1, Point *pt2)
{
double *result = PALLOCTYPE(double);
@@ -1505,7 +1505,7 @@ point_slope(Point * pt1, Point * pt2)
double
-point_sl(Point * pt1, Point * pt2)
+point_sl(Point *pt1, Point *pt2)
{
return (point_vert(pt1, pt2)
? (double) DBL_MAX
@@ -1552,12 +1552,12 @@ lseg_in(char *str)
char *
-lseg_out(LSEG * ls)
+lseg_out(LSEG *ls)
{
if (!PointerIsValid(ls))
return (NULL);
- return (path_encode(FALSE, 2, (Point *) & (ls->p[0])));
+ return (path_encode(FALSE, 2, (Point *) &(ls->p[0])));
} /* lseg_out() */
@@ -1565,7 +1565,7 @@ lseg_out(LSEG * ls)
* form a LSEG from two Points.
*/
LSEG *
-lseg_construct(Point * pt1, Point * pt2)
+lseg_construct(Point *pt1, Point *pt2)
{
LSEG *result = PALLOCTYPE(LSEG);
@@ -1581,7 +1581,7 @@ lseg_construct(Point * pt1, Point * pt2)
/* like lseg_construct, but assume space already allocated */
static void
-statlseg_construct(LSEG * lseg, Point * pt1, Point * pt2)
+statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2)
{
lseg->p[0].x = pt1->x;
lseg->p[0].y = pt1->y;
@@ -1600,7 +1600,7 @@ statlseg_construct(LSEG * lseg, Point * pt1, Point * pt2)
** both segments.
*/
bool
-lseg_intersect(LSEG * l1, LSEG * l2)
+lseg_intersect(LSEG *l1, LSEG *l2)
{
LINE *ln;
Point *interpt;
@@ -1620,7 +1620,7 @@ lseg_intersect(LSEG * l1, LSEG * l2)
}
bool
-lseg_parallel(LSEG * l1, LSEG * l2)
+lseg_parallel(LSEG *l1, LSEG *l2)
{
#if FALSE
return (FPeq(l1->m, l2->m));
@@ -1630,7 +1630,7 @@ lseg_parallel(LSEG * l1, LSEG * l2)
} /* lseg_parallel() */
bool
-lseg_perp(LSEG * l1, LSEG * l2)
+lseg_perp(LSEG *l1, LSEG *l2)
{
double m1,
m2;
@@ -1646,20 +1646,20 @@ lseg_perp(LSEG * l1, LSEG * l2)
} /* lseg_perp() */
bool
-lseg_vertical(LSEG * lseg)
+lseg_vertical(LSEG *lseg)
{
return (FPeq(lseg->p[0].x, lseg->p[1].x));
}
bool
-lseg_horizontal(LSEG * lseg)
+lseg_horizontal(LSEG *lseg)
{
return (FPeq(lseg->p[0].y, lseg->p[1].y));
}
bool
-lseg_eq(LSEG * l1, LSEG * l2)
+lseg_eq(LSEG *l1, LSEG *l2)
{
return (FPeq(l1->p[0].x, l2->p[0].x) &&
FPeq(l1->p[1].y, l2->p[1].y) &&
@@ -1678,7 +1678,7 @@ lseg_eq(LSEG * l1, LSEG * l2)
* segment.
*/
double *
-lseg_distance(LSEG * l1, LSEG * l2)
+lseg_distance(LSEG *l1, LSEG *l2)
{
double *result = PALLOCTYPE(double);
@@ -1689,7 +1689,7 @@ lseg_distance(LSEG * l1, LSEG * l2)
/* distance between l1, l2 */
static double
-lseg_dt(LSEG * l1, LSEG * l2)
+lseg_dt(LSEG *l1, LSEG *l2)
{
double *d,
result;
@@ -1720,7 +1720,7 @@ lseg_dt(LSEG * l1, LSEG * l2)
Point *
-lseg_center(LSEG * lseg)
+lseg_center(LSEG *lseg)
{
Point *result;
@@ -1746,7 +1746,7 @@ lseg_center(LSEG * lseg)
* lsb residue. - tgl 1997-07-09
*/
Point *
-lseg_interpt(LSEG * l1, LSEG * l2)
+lseg_interpt(LSEG *l1, LSEG *l2)
{
Point *result;
LINE *tmp1,
@@ -1806,7 +1806,7 @@ lseg_interpt(LSEG * l1, LSEG * l2)
*-------------------------------------------------------------------*/
double *
-dist_pl(Point * pt, LINE * line)
+dist_pl(Point *pt, LINE *line)
{
double *result = PALLOCTYPE(double);
@@ -1817,7 +1817,7 @@ dist_pl(Point * pt, LINE * line)
}
double *
-dist_ps(Point * pt, LSEG * lseg)
+dist_ps(Point *pt, LSEG *lseg)
{
double m; /* slope of perp. */
LINE *ln;
@@ -1888,7 +1888,7 @@ dist_ps(Point * pt, LSEG * lseg)
** Distance from a point to a path
*/
double *
-dist_ppath(Point * pt, PATH * path)
+dist_ppath(Point *pt, PATH *path)
{
double *result;
double *tmp;
@@ -1928,7 +1928,7 @@ dist_ppath(Point * pt, PATH * path)
}
double *
-dist_pb(Point * pt, BOX *box)
+dist_pb(Point *pt, BOX *box)
{
Point *tmp;
double *result;
@@ -1942,7 +1942,7 @@ dist_pb(Point * pt, BOX *box)
double *
-dist_sl(LSEG * lseg, LINE * line)
+dist_sl(LSEG *lseg, LINE *line)
{
double *result,
*d2;
@@ -1973,7 +1973,7 @@ dist_sl(LSEG * lseg, LINE * line)
double *
-dist_sb(LSEG * lseg, BOX *box)
+dist_sb(LSEG *lseg, BOX *box)
{
Point *tmp;
double *result;
@@ -1995,7 +1995,7 @@ dist_sb(LSEG * lseg, BOX *box)
double *
-dist_lb(LINE * line, BOX *box)
+dist_lb(LINE *line, BOX *box)
{
Point *tmp;
double *result;
@@ -2017,7 +2017,7 @@ dist_lb(LINE * line, BOX *box)
double *
-dist_cpoly(CIRCLE * circle, POLYGON * poly)
+dist_cpoly(CIRCLE *circle, POLYGON *poly)
{
double *result;
int i;
@@ -2080,7 +2080,7 @@ dist_cpoly(CIRCLE * circle, POLYGON * poly)
*-------------------------------------------------------------------*/
static Point *
-interpt_sl(LSEG * lseg, LINE * line)
+interpt_sl(LSEG *lseg, LINE *line)
{
LINE *tmp;
Point *p;
@@ -2127,7 +2127,7 @@ interpt_sl(LSEG * lseg, LINE * line)
* through the point.
*/
Point *
-close_pl(Point * pt, LINE * line)
+close_pl(Point *pt, LINE *line)
{
Point *result;
LINE *tmp;
@@ -2175,7 +2175,7 @@ close_pl(Point * pt, LINE * line)
* point of the segment and its perpendicular through the point.
*/
Point *
-close_ps(Point * pt, LSEG * lseg)
+close_ps(Point *pt, LSEG *lseg)
{
Point *result;
LINE *tmp;
@@ -2227,7 +2227,7 @@ close_ps(Point * pt, LSEG * lseg)
} /* close_ps() */
Point *
-close_pb(Point * pt, BOX *box)
+close_pb(Point *pt, BOX *box)
{
/* think about this one for a while */
elog(WARN, "close_pb not implemented", NULL);
@@ -2236,7 +2236,7 @@ close_pb(Point * pt, BOX *box)
}
Point *
-close_sl(LSEG * lseg, LINE * line)
+close_sl(LSEG *lseg, LINE *line)
{
Point *result;
double *d1,
@@ -2258,7 +2258,7 @@ close_sl(LSEG * lseg, LINE * line)
}
Point *
-close_sb(LSEG * lseg, BOX *box)
+close_sb(LSEG *lseg, BOX *box)
{
/* think about this one for a while */
elog(WARN, "close_sb not implemented", NULL);
@@ -2267,7 +2267,7 @@ close_sb(LSEG * lseg, BOX *box)
}
Point *
-close_lb(LINE * line, BOX *box)
+close_lb(LINE *line, BOX *box)
{
/* think about this one for a while */
elog(WARN, "close_lb not implemented", NULL);
@@ -2284,7 +2284,7 @@ close_lb(LINE * line, BOX *box)
* Does the point satisfy the equation?
*/
bool
-on_pl(Point * pt, LINE * line)
+on_pl(Point *pt, LINE *line)
{
if (!PointerIsValid(pt) || !PointerIsValid(line))
return (FALSE);
@@ -2298,7 +2298,7 @@ on_pl(Point * pt, LINE * line)
* This algorithm seems to behave nicely even with lsb residues - tgl 1997-07-09
*/
bool
-on_ps(Point * pt, LSEG * lseg)
+on_ps(Point *pt, LSEG *lseg)
{
if (!PointerIsValid(pt) || !PointerIsValid(lseg))
return (FALSE);
@@ -2308,7 +2308,7 @@ on_ps(Point * pt, LSEG * lseg)
}
bool
-on_pb(Point * pt, BOX *box)
+on_pb(Point *pt, BOX *box)
{
if (!PointerIsValid(pt) || !PointerIsValid(box))
return (FALSE);
@@ -2331,7 +2331,7 @@ on_pb(Point * pt, BOX *box)
#define NEXT(A) ((A+1) % path->npts) /* cyclic "i+1" */
bool
-on_ppath(Point * pt, PATH * path)
+on_ppath(Point *pt, PATH *path)
{
#if FALSE
int above,
@@ -2424,7 +2424,7 @@ on_ppath(Point * pt, PATH * path)
bool
-on_sl(LSEG * lseg, LINE * line)
+on_sl(LSEG *lseg, LINE *line)
{
if (!PointerIsValid(lseg) || !PointerIsValid(line))
return (FALSE);
@@ -2433,7 +2433,7 @@ on_sl(LSEG * lseg, LINE * line)
} /* on_sl() */
bool
-on_sb(LSEG * lseg, BOX *box)
+on_sb(LSEG *lseg, BOX *box)
{
if (!PointerIsValid(lseg) || !PointerIsValid(box))
return (FALSE);
@@ -2447,7 +2447,7 @@ on_sb(LSEG * lseg, BOX *box)
*-------------------------------------------------------------------*/
bool
-inter_sl(LSEG * lseg, LINE * line)
+inter_sl(LSEG *lseg, LINE *line)
{
Point *tmp;
@@ -2466,7 +2466,7 @@ inter_sl(LSEG * lseg, LINE * line)
/* XXX segment and box should be able to intersect; tgl - 97/01/09 */
bool
-inter_sb(LSEG * lseg, BOX *box)
+inter_sb(LSEG *lseg, BOX *box)
{
return (0);
}
@@ -2474,7 +2474,7 @@ inter_sb(LSEG * lseg, BOX *box)
/* XXX line and box should be able to intersect; tgl - 97/01/09 */
bool
-inter_lb(LINE * line, BOX *box)
+inter_lb(LINE *line, BOX *box)
{
return (0);
}
@@ -2491,7 +2491,7 @@ inter_lb(LINE * line, BOX *box)
* Make the smallest bounding box for the given polygon.
*---------------------------------------------------------------------*/
static void
-make_bound_box(POLYGON * poly)
+make_bound_box(POLYGON *poly)
{
int i;
double x1,
@@ -2546,7 +2546,7 @@ poly_in(char *str)
if ((npts = pair_count(str, ',')) <= 0)
elog(WARN, "Bad polygon external representation '%s'", str);
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * npts);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * npts);
poly = PALLOC(size);
memset((char *) poly, 0, size); /* zero any holes */
@@ -2568,7 +2568,7 @@ poly_in(char *str)
* also support old format "(f8,f8,...,f8,f8)"
*---------------------------------------------------------------*/
char *
-poly_out(POLYGON * poly)
+poly_out(POLYGON *poly)
{
if (!PointerIsValid(poly))
return NULL;
@@ -2583,7 +2583,7 @@ poly_out(POLYGON * poly)
* of B?
*-------------------------------------------------------*/
bool
-poly_left(POLYGON * polya, POLYGON * polyb)
+poly_left(POLYGON *polya, POLYGON *polyb)
{
return (polya->boundbox.high.x < polyb->boundbox.low.x);
}
@@ -2594,7 +2594,7 @@ poly_left(POLYGON * polya, POLYGON * polyb)
* of B?
*-------------------------------------------------------*/
bool
-poly_overleft(POLYGON * polya, POLYGON * polyb)
+poly_overleft(POLYGON *polya, POLYGON *polyb)
{
return (polya->boundbox.low.x <= polyb->boundbox.high.x);
}
@@ -2605,7 +2605,7 @@ poly_overleft(POLYGON * polya, POLYGON * polyb)
* of B?
*-------------------------------------------------------*/
bool
-poly_right(POLYGON * polya, POLYGON * polyb)
+poly_right(POLYGON *polya, POLYGON *polyb)
{
return (polya->boundbox.low.x > polyb->boundbox.high.x);
}
@@ -2616,7 +2616,7 @@ poly_right(POLYGON * polya, POLYGON * polyb)
* of B?
*-------------------------------------------------------*/
bool
-poly_overright(POLYGON * polya, POLYGON * polyb)
+poly_overright(POLYGON *polya, POLYGON *polyb)
{
return (polya->boundbox.high.x > polyb->boundbox.low.x);
}
@@ -2629,7 +2629,7 @@ poly_overright(POLYGON * polya, POLYGON * polyb)
* closed shapes.
*-------------------------------------------------------*/
bool
-poly_same(POLYGON * polya, POLYGON * polyb)
+poly_same(POLYGON *polya, POLYGON *polyb)
{
if (!PointerIsValid(polya) || !PointerIsValid(polyb))
return FALSE;
@@ -2655,7 +2655,7 @@ poly_same(POLYGON * polya, POLYGON * polyb)
* their bounding boxes overlap.
*-----------------------------------------------------------------*/
bool
-poly_overlap(POLYGON * polya, POLYGON * polyb)
+poly_overlap(POLYGON *polya, POLYGON *polyb)
{
return box_overlap(&(polya->boundbox), &(polyb->boundbox));
}
@@ -2667,7 +2667,7 @@ poly_overlap(POLYGON * polya, POLYGON * polyb)
*-----------------------------------------------------------------*/
#if FALSE
bool
-poly_contain(POLYGON * polya, POLYGON * polyb)
+poly_contain(POLYGON *polya, POLYGON *polyb)
{
return box_contain(&(polya->boundbox), &(polyb->boundbox));
}
@@ -2675,7 +2675,7 @@ poly_contain(POLYGON * polya, POLYGON * polyb)
#endif
bool
-poly_contain(POLYGON * polya, POLYGON * polyb)
+poly_contain(POLYGON *polya, POLYGON *polyb)
{
int i;
@@ -2721,7 +2721,7 @@ poly_contain(POLYGON * polya, POLYGON * polyb)
*-----------------------------------------------------------------*/
#if FALSE
bool
-poly_contained(POLYGON * polya, POLYGON * polyb)
+poly_contained(POLYGON *polya, POLYGON *polyb)
{
return (box_contained(&(polya->boundbox), &(polyb->boundbox)));
}
@@ -2729,7 +2729,7 @@ poly_contained(POLYGON * polya, POLYGON * polyb)
#endif
bool
-poly_contained(POLYGON * polya, POLYGON * polyb)
+poly_contained(POLYGON *polya, POLYGON *polyb)
{
return (poly_contain(polyb, polya));
} /* poly_contained() */
@@ -2746,7 +2746,7 @@ poly_contained(POLYGON * polya, POLYGON * polyb)
*/
bool
-poly_contain_pt(POLYGON * poly, Point * p)
+poly_contain_pt(POLYGON *poly, Point *p)
{
if (!PointerIsValid(poly) || !PointerIsValid(p))
return (FALSE);
@@ -2755,7 +2755,7 @@ poly_contain_pt(POLYGON * poly, Point * p)
} /* poly_contain_pt() */
bool
-pt_contained_poly(Point * p, POLYGON * poly)
+pt_contained_poly(Point *p, POLYGON *poly)
{
if (!PointerIsValid(p) || !PointerIsValid(poly))
return (FALSE);
@@ -2765,7 +2765,7 @@ pt_contained_poly(Point * p, POLYGON * poly)
double *
-poly_distance(POLYGON * polya, POLYGON * polyb)
+poly_distance(POLYGON *polya, POLYGON *polyb)
{
double *result;
@@ -2787,7 +2787,7 @@ poly_distance(POLYGON * polya, POLYGON * polyb)
***********************************************************************/
Point *
-point(float8 * x, float8 * y)
+point(float8 *x, float8 *y)
{
if (!(PointerIsValid(x) && PointerIsValid(y)))
return (NULL);
@@ -2797,7 +2797,7 @@ point(float8 * x, float8 * y)
Point *
-point_add(Point * p1, Point * p2)
+point_add(Point *p1, Point *p2)
{
Point *result;
@@ -2813,7 +2813,7 @@ point_add(Point * p1, Point * p2)
} /* point_add() */
Point *
-point_sub(Point * p1, Point * p2)
+point_sub(Point *p1, Point *p2)
{
Point *result;
@@ -2829,7 +2829,7 @@ point_sub(Point * p1, Point * p2)
} /* point_sub() */
Point *
-point_mul(Point * p1, Point * p2)
+point_mul(Point *p1, Point *p2)
{
Point *result;
@@ -2845,7 +2845,7 @@ point_mul(Point * p1, Point * p2)
} /* point_mul() */
Point *
-point_div(Point * p1, Point * p2)
+point_div(Point *p1, Point *p2)
{
Point *result;
double div;
@@ -2874,7 +2874,7 @@ point_div(Point * p1, Point * p2)
***********************************************************************/
BOX *
-box(Point * p1, Point * p2)
+box(Point *p1, Point *p2)
{
BOX *result;
@@ -2887,7 +2887,7 @@ box(Point * p1, Point * p2)
} /* box() */
BOX *
-box_add(BOX *box, Point * p)
+box_add(BOX *box, Point *p)
{
BOX *result;
@@ -2901,7 +2901,7 @@ box_add(BOX *box, Point * p)
} /* box_add() */
BOX *
-box_sub(BOX *box, Point * p)
+box_sub(BOX *box, Point *p)
{
BOX *result;
@@ -2915,7 +2915,7 @@ box_sub(BOX *box, Point * p)
} /* box_sub() */
BOX *
-box_mul(BOX *box, Point * p)
+box_mul(BOX *box, Point *p)
{
BOX *result;
Point *high,
@@ -2935,7 +2935,7 @@ box_mul(BOX *box, Point * p)
} /* box_mul() */
BOX *
-box_div(BOX *box, Point * p)
+box_div(BOX *box, Point *p)
{
BOX *result;
Point *high,
@@ -2975,7 +2975,7 @@ box_div(BOX *box, Point * p)
* Concatenate two paths (only if they are both open).
*/
PATH *
-path_add(PATH * p1, PATH * p2)
+path_add(PATH *p1, PATH *p2)
{
PATH *result;
int size;
@@ -2985,7 +2985,7 @@ path_add(PATH * p1, PATH * p2)
|| p1->closed || p2->closed)
return (NULL);
- size = offsetof(PATH, p[0]) + (sizeof(p1->p[0]) * (p1->npts + p2->npts));
+ size = offsetof(PATH, p[0]) +(sizeof(p1->p[0]) * (p1->npts + p2->npts));
result = PALLOC(size);
result->size = size;
@@ -3010,7 +3010,7 @@ path_add(PATH * p1, PATH * p2)
* Translation operator.
*/
PATH *
-path_add_pt(PATH * path, Point * point)
+path_add_pt(PATH *path, Point *point)
{
PATH *result;
int i;
@@ -3030,7 +3030,7 @@ path_add_pt(PATH * path, Point * point)
} /* path_add_pt() */
PATH *
-path_sub_pt(PATH * path, Point * point)
+path_sub_pt(PATH *path, Point *point)
{
PATH *result;
int i;
@@ -3054,7 +3054,7 @@ path_sub_pt(PATH * path, Point * point)
* Rotation and scaling operators.
*/
PATH *
-path_mul_pt(PATH * path, Point * point)
+path_mul_pt(PATH *path, Point *point)
{
PATH *result;
Point *p;
@@ -3077,7 +3077,7 @@ path_mul_pt(PATH * path, Point * point)
} /* path_mul_pt() */
PATH *
-path_div_pt(PATH * path, Point * point)
+path_div_pt(PATH *path, Point *point)
{
PATH *result;
Point *p;
@@ -3101,7 +3101,7 @@ path_div_pt(PATH * path, Point * point)
bool
-path_contain_pt(PATH * path, Point * p)
+path_contain_pt(PATH *path, Point *p)
{
if (!PointerIsValid(path) || !PointerIsValid(p))
return (FALSE);
@@ -3110,7 +3110,7 @@ path_contain_pt(PATH * path, Point * p)
} /* path_contain_pt() */
bool
-pt_contained_path(Point * p, PATH * path)
+pt_contained_path(Point *p, PATH *path)
{
if (!PointerIsValid(p) || !PointerIsValid(path))
return (FALSE);
@@ -3120,7 +3120,7 @@ pt_contained_path(Point * p, PATH * path)
Point *
-path_center(PATH * path)
+path_center(PATH *path)
{
Point *result;
@@ -3136,7 +3136,7 @@ path_center(PATH * path)
} /* path_center() */
POLYGON *
-path_poly(PATH * path)
+path_poly(PATH *path)
{
POLYGON *poly;
int size;
@@ -3148,7 +3148,7 @@ path_poly(PATH * path)
if (!path->closed)
elog(WARN, "Open path cannot be converted to polygon", NULL);
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * path->npts);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * path->npts);
poly = PALLOC(size);
poly->size = size;
@@ -3174,7 +3174,8 @@ path_poly(PATH * path)
* '[(x1,y1),...]' for open path
*/
PATH
-* upgradepath(PATH * path)
+ *
+upgradepath(PATH *path)
{
PATH *result;
int size,
@@ -3188,7 +3189,7 @@ PATH
elog(WARN, "upgradepath: path already upgraded?", NULL);
npts = (path->npts - 1);
- size = offsetof(PATH, p[0]) + (sizeof(path->p[0]) * npts);
+ size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * npts);
result = PALLOC(size);
memset((char *) result, 0, size);
@@ -3206,7 +3207,7 @@ PATH
} /* upgradepath() */
bool
-isoldpath(PATH * path)
+isoldpath(PATH *path)
{
if (!PointerIsValid(path) || (path->npts < 2))
return (FALSE);
@@ -3222,7 +3223,7 @@ isoldpath(PATH * path)
***********************************************************************/
int4
-poly_npoints(POLYGON * poly)
+poly_npoints(POLYGON *poly)
{
if (!PointerIsValid(poly))
return (0);
@@ -3232,7 +3233,7 @@ poly_npoints(POLYGON * poly)
Point *
-poly_center(POLYGON * poly)
+poly_center(POLYGON *poly)
{
Point *result;
CIRCLE *circle;
@@ -3256,7 +3257,7 @@ poly_center(POLYGON * poly)
BOX *
-poly_box(POLYGON * poly)
+poly_box(POLYGON *poly)
{
BOX *box;
@@ -3282,7 +3283,7 @@ box_poly(BOX *box)
return (NULL);
/* map four corners of the box to a polygon */
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * 4);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * 4);
poly = PALLOC(size);
poly->size = size;
@@ -3304,7 +3305,7 @@ box_poly(BOX *box)
PATH *
-poly_path(POLYGON * poly)
+poly_path(POLYGON *poly)
{
PATH *path;
int size;
@@ -3313,7 +3314,7 @@ poly_path(POLYGON * poly)
if (!PointerIsValid(poly) || (poly->npts < 0))
return (NULL);
- size = offsetof(PATH, p[0]) + (sizeof(path->p[0]) * poly->npts);
+ size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * poly->npts);
path = PALLOC(size);
path->size = size;
@@ -3336,7 +3337,8 @@ poly_path(POLYGON * poly)
* New-style: '(x1,y1,x2,y2,...)'
*/
POLYGON
-* upgradepoly(POLYGON * poly)
+ *
+upgradepoly(POLYGON *poly)
{
POLYGON *result;
int size;
@@ -3347,7 +3349,7 @@ POLYGON
if (!PointerIsValid(poly) || (poly->npts < 1))
return (NULL);
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * poly->npts);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts);
result = PALLOC(size);
memset((char *) result, 0, size);
@@ -3382,7 +3384,8 @@ POLYGON
* Reverse effect of upgradepoly().
*/
POLYGON
-* revertpoly(POLYGON * poly)
+ *
+revertpoly(POLYGON *poly)
{
POLYGON *result;
int size;
@@ -3393,7 +3396,7 @@ POLYGON
if (!PointerIsValid(poly) || (poly->npts < 1))
return (NULL);
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * poly->npts);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts);
result = PALLOC(size);
memset((char *) result, 0, size);
@@ -3506,7 +3509,7 @@ circle_in(char *str)
/* circle_out - convert a circle to external form.
*/
char *
-circle_out(CIRCLE * circle)
+circle_out(CIRCLE *circle)
{
char *result;
char *cp;
@@ -3544,7 +3547,7 @@ circle_out(CIRCLE * circle)
/* circles identical?
*/
bool
-circle_same(CIRCLE * circle1, CIRCLE * circle2)
+circle_same(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPeq(circle1->radius, circle2->radius)
&& FPeq(circle1->center.x, circle2->center.x)
@@ -3554,7 +3557,7 @@ circle_same(CIRCLE * circle1, CIRCLE * circle2)
/* circle_overlap - does circle1 overlap circle2?
*/
bool
-circle_overlap(CIRCLE * circle1, CIRCLE * circle2)
+circle_overlap(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle(point_dt(&circle1->center, &circle2->center), (circle1->radius + circle2->radius)));
}
@@ -3563,7 +3566,7 @@ circle_overlap(CIRCLE * circle1, CIRCLE * circle2)
* the right edge of circle2?
*/
bool
-circle_overleft(CIRCLE * circle1, CIRCLE * circle2)
+circle_overleft(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle((circle1->center.x + circle1->radius), (circle2->center.x + circle2->radius)));
}
@@ -3571,7 +3574,7 @@ circle_overleft(CIRCLE * circle1, CIRCLE * circle2)
/* circle_left - is circle1 strictly left of circle2?
*/
bool
-circle_left(CIRCLE * circle1, CIRCLE * circle2)
+circle_left(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle((circle1->center.x + circle1->radius), (circle2->center.x - circle2->radius)));
}
@@ -3579,7 +3582,7 @@ circle_left(CIRCLE * circle1, CIRCLE * circle2)
/* circle_right - is circle1 strictly right of circle2?
*/
bool
-circle_right(CIRCLE * circle1, CIRCLE * circle2)
+circle_right(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPge((circle1->center.x - circle1->radius), (circle2->center.x + circle2->radius)));
}
@@ -3588,7 +3591,7 @@ circle_right(CIRCLE * circle1, CIRCLE * circle2)
* the left edge of circle2?
*/
bool
-circle_overright(CIRCLE * circle1, CIRCLE * circle2)
+circle_overright(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPge((circle1->center.x - circle1->radius), (circle2->center.x - circle2->radius)));
}
@@ -3596,7 +3599,7 @@ circle_overright(CIRCLE * circle1, CIRCLE * circle2)
/* circle_contained - is circle1 contained by circle2?
*/
bool
-circle_contained(CIRCLE * circle1, CIRCLE * circle2)
+circle_contained(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle((point_dt(&circle1->center, &circle2->center) + circle1->radius), circle2->radius));
}
@@ -3604,7 +3607,7 @@ circle_contained(CIRCLE * circle1, CIRCLE * circle2)
/* circle_contain - does circle1 contain circle2?
*/
bool
-circle_contain(CIRCLE * circle1, CIRCLE * circle2)
+circle_contain(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle((point_dt(&circle1->center, &circle2->center) + circle2->radius), circle1->radius));
}
@@ -3614,13 +3617,13 @@ circle_contain(CIRCLE * circle1, CIRCLE * circle2)
* is circle1 entirely {above,below} circle2?
*/
bool
-circle_below(CIRCLE * circle1, CIRCLE * circle2)
+circle_below(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle((circle1->center.y + circle1->radius), (circle2->center.y - circle2->radius)));
}
bool
-circle_above(CIRCLE * circle1, CIRCLE * circle2)
+circle_above(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPge((circle1->center.y - circle1->radius), (circle2->center.y + circle2->radius)));
}
@@ -3630,37 +3633,37 @@ circle_above(CIRCLE * circle1, CIRCLE * circle2)
* our accuracy constraint?
*/
bool
-circle_eq(CIRCLE * circle1, CIRCLE * circle2)
+circle_eq(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPeq(circle_ar(circle1), circle_ar(circle2)));
} /* circle_eq() */
bool
-circle_ne(CIRCLE * circle1, CIRCLE * circle2)
+circle_ne(CIRCLE *circle1, CIRCLE *circle2)
{
return (!circle_eq(circle1, circle2));
} /* circle_ne() */
bool
-circle_lt(CIRCLE * circle1, CIRCLE * circle2)
+circle_lt(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPlt(circle_ar(circle1), circle_ar(circle2)));
} /* circle_lt() */
bool
-circle_gt(CIRCLE * circle1, CIRCLE * circle2)
+circle_gt(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPgt(circle_ar(circle1), circle_ar(circle2)));
} /* circle_gt() */
bool
-circle_le(CIRCLE * circle1, CIRCLE * circle2)
+circle_le(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPle(circle_ar(circle1), circle_ar(circle2)));
} /* circle_le() */
bool
-circle_ge(CIRCLE * circle1, CIRCLE * circle2)
+circle_ge(CIRCLE *circle1, CIRCLE *circle2)
{
return (FPge(circle_ar(circle1), circle_ar(circle2)));
} /* circle_ge() */
@@ -3675,7 +3678,7 @@ circle_ge(CIRCLE * circle1, CIRCLE * circle2)
*---------------------------------------------------------*/
static CIRCLE *
-circle_copy(CIRCLE * circle)
+circle_copy(CIRCLE *circle)
{
CIRCLE *result;
@@ -3693,7 +3696,7 @@ circle_copy(CIRCLE * circle)
* Translation operator.
*/
CIRCLE *
-circle_add_pt(CIRCLE * circle, Point * point)
+circle_add_pt(CIRCLE *circle, Point *point)
{
CIRCLE *result;
@@ -3709,7 +3712,7 @@ circle_add_pt(CIRCLE * circle, Point * point)
} /* circle_add_pt() */
CIRCLE *
-circle_sub_pt(CIRCLE * circle, Point * point)
+circle_sub_pt(CIRCLE *circle, Point *point)
{
CIRCLE *result;
@@ -3729,7 +3732,7 @@ circle_sub_pt(CIRCLE * circle, Point * point)
* Rotation and scaling operators.
*/
CIRCLE *
-circle_mul_pt(CIRCLE * circle, Point * point)
+circle_mul_pt(CIRCLE *circle, Point *point)
{
CIRCLE *result;
Point *p;
@@ -3749,7 +3752,7 @@ circle_mul_pt(CIRCLE * circle, Point * point)
} /* circle_mul_pt() */
CIRCLE *
-circle_div_pt(CIRCLE * circle, Point * point)
+circle_div_pt(CIRCLE *circle, Point *point)
{
CIRCLE *result;
Point *p;
@@ -3772,7 +3775,7 @@ circle_div_pt(CIRCLE * circle, Point * point)
/* circle_area - returns the area of the circle.
*/
double *
-circle_area(CIRCLE * circle)
+circle_area(CIRCLE *circle)
{
double *result;
@@ -3786,7 +3789,7 @@ circle_area(CIRCLE * circle)
/* circle_diameter - returns the diameter of the circle.
*/
double *
-circle_diameter(CIRCLE * circle)
+circle_diameter(CIRCLE *circle)
{
double *result;
@@ -3800,7 +3803,7 @@ circle_diameter(CIRCLE * circle)
/* circle_radius - returns the radius of the circle.
*/
double *
-circle_radius(CIRCLE * circle)
+circle_radius(CIRCLE *circle)
{
double *result;
@@ -3815,7 +3818,7 @@ circle_radius(CIRCLE * circle)
* two circles.
*/
double *
-circle_distance(CIRCLE * circle1, CIRCLE * circle2)
+circle_distance(CIRCLE *circle1, CIRCLE *circle2)
{
double *result;
@@ -3830,7 +3833,7 @@ circle_distance(CIRCLE * circle1, CIRCLE * circle2)
bool
-circle_contain_pt(CIRCLE * circle, Point * point)
+circle_contain_pt(CIRCLE *circle, Point *point)
{
bool within;
double *d;
@@ -3847,7 +3850,7 @@ circle_contain_pt(CIRCLE * circle, Point * point)
bool
-pt_contained_circle(Point * point, CIRCLE * circle)
+pt_contained_circle(Point *point, CIRCLE *circle)
{
return (circle_contain_pt(circle, point));
} /* circle_contain_pt() */
@@ -3857,7 +3860,7 @@ pt_contained_circle(Point * point, CIRCLE * circle)
* a point and a circle.
*/
double *
-dist_pc(Point * point, CIRCLE * circle)
+dist_pc(Point *point, CIRCLE *circle)
{
double *result;
@@ -3874,7 +3877,7 @@ dist_pc(Point * point, CIRCLE * circle)
/* circle_center - returns the center point of the circle.
*/
Point *
-circle_center(CIRCLE * circle)
+circle_center(CIRCLE *circle)
{
Point *result;
@@ -3889,7 +3892,7 @@ circle_center(CIRCLE * circle)
/* circle_ar - returns the area of the circle.
*/
static double
-circle_ar(CIRCLE * circle)
+circle_ar(CIRCLE *circle)
{
return (PI * (circle->radius * circle->radius));
}
@@ -3900,7 +3903,7 @@ circle_ar(CIRCLE * circle)
*/
#ifdef NOT_USED
double
-circle_dt(CIRCLE * circle1, CIRCLE * circle2)
+circle_dt(CIRCLE *circle1, CIRCLE *circle2)
{
double result;
@@ -3916,7 +3919,7 @@ circle_dt(CIRCLE * circle1, CIRCLE * circle2)
*---------------------------------------------------------*/
CIRCLE *
-circle(Point * center, float8 * radius)
+circle(Point *center, float8 *radius)
{
CIRCLE *result;
@@ -3934,7 +3937,7 @@ circle(Point * center, float8 * radius)
BOX *
-circle_box(CIRCLE * circle)
+circle_box(CIRCLE *circle)
{
BOX *box;
double delta;
@@ -3977,7 +3980,7 @@ box_circle(BOX *box)
POLYGON *
-circle_poly(int npts, CIRCLE * circle)
+circle_poly(int npts, CIRCLE *circle)
{
POLYGON *poly;
int size;
@@ -3990,7 +3993,7 @@ circle_poly(int npts, CIRCLE * circle)
if (FPzero(circle->radius) || (npts < 2))
elog(WARN, "Unable to convert circle to polygon", NULL);
- size = offsetof(POLYGON, p[0]) + (sizeof(poly->p[0]) * npts);
+ size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * npts);
poly = PALLOC(size);
memset((char *) poly, 0, size); /* zero any holes */
@@ -4015,7 +4018,7 @@ circle_poly(int npts, CIRCLE * circle)
* rather than straight average values of points - tgl 97/01/21.
*/
CIRCLE *
-poly_circle(POLYGON * poly)
+poly_circle(POLYGON *poly)
{
CIRCLE *circle;
int i;
@@ -4062,7 +4065,7 @@ poly_circle(POLYGON * poly)
#define HIT_IT INT_MAX
static int
-point_inside(Point * p, int npts, Point plist[])
+point_inside(Point *p, int npts, Point plist[])
{
double x0,
y0;
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 1eaededbf2dd2572a3ae6b49956b7050cd2045f7..a086f00c73ed9d3e4571b09a49d9b42524cf4bc5 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.7 1997/09/08 20:57:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.8 1997/09/08 21:48:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,12 +69,12 @@ int2out(int16 sh)
int16 *
int28in(char *shs)
{
- register int16(*result)[];
+ register int16 (*result)[];
int nums;
if (shs == NULL)
return (NULL);
- result = (int16(*)[]) palloc(sizeof(int16[8]));
+ result = (int16 (*)[]) palloc(sizeof(int16[8]));
if ((nums = sscanf(shs, "%hd%hd%hd%hd%hd%hd%hd%hd",
*result,
*result + 1,
@@ -96,7 +96,7 @@ int28in(char *shs)
* int28out - converts internal form to "num num ..."
*/
char *
-int28out(int16(*shs)[])
+int28out(int16 (*shs)[])
{
register int num;
register int16 *sp;
@@ -389,7 +389,7 @@ int42ge(int32 arg1, int32 arg2)
bool
-keyfirsteq(int16 * arg1, int16 arg2)
+keyfirsteq(int16 *arg1, int16 arg2)
{
return (*arg1 == arg2);
}
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 5e9c0e7ebbee4fe0a95c3941092c4c8f39454157..4a758b0ba28005bdb1b63eb4f1f336e0c8429e0d 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -122,7 +122,7 @@ char16nlike(char *s, struct varlena * p)
}
bool
-namelike(NameData * n, struct varlena * p)
+namelike(NameData *n, struct varlena * p)
{
if (!n)
return FALSE;
@@ -130,7 +130,7 @@ namelike(NameData * n, struct varlena * p)
}
bool
-namenlike(NameData * s, struct varlena * p)
+namenlike(NameData *s, struct varlena * p)
{
return (!namelike(s, p));
}
@@ -150,7 +150,7 @@ textnlike(struct varlena * s, struct varlena * p)
}
-/* $Revision: 1.8 $
+/* $Revision: 1.9 $
** "like.c" A first attempt at a LIKE operator for Postgres95.
**
** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
@@ -189,7 +189,7 @@ DoMatch(register char *text, register char *p)
{
register int matched;
- for (; *p; text++, p++)
+ for (; *p; text ++, p++)
{
if (*text == '\0' && *p != '%')
return LIKE_ABORT;
@@ -200,7 +200,7 @@ DoMatch(register char *text, register char *p)
p++;
/* FALLTHROUGH */
default:
- if (*text != *p)
+ if (*text !=*p)
return LIKE_FALSE;
continue;
case '_':
@@ -214,7 +214,7 @@ DoMatch(register char *text, register char *p)
/* Trailing percent matches everything. */
return LIKE_TRUE;
while (*text)
- if ((matched = DoMatch(text++, p)) != LIKE_FALSE)
+ if ((matched = DoMatch(text ++, p)) != LIKE_FALSE)
return matched;
return LIKE_ABORT;
}
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 90d9c0289e378eafcd3b79d67f99ec08544560ff..06bc79374f9f71a50242c3a6b1f645f1426aaf30 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.9 1997/09/08 02:30:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.10 1997/09/08 21:48:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,7 +25,7 @@
* Check if data is Null
*/
bool
-nullvalue(Datum value, bool * isNull)
+nullvalue(Datum value, bool *isNull)
{
if (*isNull)
{
@@ -40,7 +40,7 @@ nullvalue(Datum value, bool * isNull)
* check if data is not Null *
*--------------------------------------------------------------------- */
bool
-nonnullvalue(Datum value, bool * isNull)
+nonnullvalue(Datum value, bool *isNull)
{
if (*isNull)
{
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 9e929c579c57aa0c4dc555392cce14f70fe35dbc..eb1c8eff2b7c19995e7885906795ce4a906e1b43 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.33 1997/09/08 02:30:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.34 1997/09/08 21:48:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -132,11 +132,11 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn)
#ifdef USE_POSIX_TIME
if (tzp != NULL)
{
- tx = localtime((time_t *) & time);
+ tx = localtime((time_t *) &time);
}
else
{
- tx = gmtime((time_t *) & time);
+ tx = gmtime((time_t *) &time);
};
#else
#endif
@@ -487,7 +487,7 @@ abstimege(AbsoluteTime t1, AbsoluteTime t2)
* Convert datetime to abstime.
*/
AbsoluteTime
-datetime_abstime(DateTime * datetime)
+datetime_abstime(DateTime *datetime)
{
AbsoluteTime result;
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 1c8f4563f7bdae8ed0cdb94d53d767fb79ea2004..977360cc954fda1dd1a10d4bed88f2ca881df779 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.8 1997/09/08 02:30:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.9 1997/09/08 21:48:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ namein(char *s)
* nameout - converts internal reprsentation to "..."
*/
char *
-nameout(NameData * s)
+nameout(NameData *s)
{
if (s == NULL)
return "-";
@@ -77,7 +77,7 @@ nameout(NameData * s)
*
*/
bool
-nameeq(NameData * arg1, NameData * arg2)
+nameeq(NameData *arg1, NameData *arg2)
{
if (!arg1 || !arg2)
return 0;
@@ -86,7 +86,7 @@ nameeq(NameData * arg1, NameData * arg2)
}
bool
-namene(NameData * arg1, NameData * arg2)
+namene(NameData *arg1, NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return ((bool) 0);
@@ -94,7 +94,7 @@ namene(NameData * arg1, NameData * arg2)
}
bool
-namelt(NameData * arg1, NameData * arg2)
+namelt(NameData *arg1, NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return ((bool) 0);
@@ -102,7 +102,7 @@ namelt(NameData * arg1, NameData * arg2)
}
bool
-namele(NameData * arg1, NameData * arg2)
+namele(NameData *arg1, NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return ((bool) 0);
@@ -110,7 +110,7 @@ namele(NameData * arg1, NameData * arg2)
}
bool
-namegt(NameData * arg1, NameData * arg2)
+namegt(NameData *arg1, NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return ((bool) 0);
@@ -119,7 +119,7 @@ namegt(NameData * arg1, NameData * arg2)
}
bool
-namege(NameData * arg1, NameData * arg2)
+namege(NameData *arg1, NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return ((bool) 0);
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 0e064b44a3893815770aa782a868a8290910dc8b..77c2e9a112f6b62cd5616885e48da61b6511c4e3 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.10 1997/09/08 02:30:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.11 1997/09/08 21:48:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,12 +31,12 @@
Oid *
oid8in(char *oidString)
{
- register Oid(*result)[];
+ register Oid (*result)[];
int nums;
if (oidString == NULL)
return (NULL);
- result = (Oid(*)[]) palloc(sizeof(Oid[8]));
+ result = (Oid (*)[]) palloc(sizeof(Oid[8]));
if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d",
&(*result)[0],
&(*result)[1],
@@ -58,7 +58,7 @@ oid8in(char *oidString)
* oid8out - converts internal form to "num num ..."
*/
char *
-oid8out(Oid(*oidArray)[])
+oid8out(Oid (*oidArray)[])
{
register int num;
register Oid *sp;
diff --git a/src/backend/utils/adt/oidint2.c b/src/backend/utils/adt/oidint2.c
index d40dae7a6cc52a3f7b5adb0f9a77b1651742531c..25e034aaecb8f357312861bc35b53f766e86c516 100644
--- a/src/backend/utils/adt/oidint2.c
+++ b/src/backend/utils/adt/oidint2.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint2.c,v 1.3 1997/09/08 02:30:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint2.c,v 1.4 1997/09/08 21:48:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,8 +60,8 @@ bool
oidint2lt(OidInt2 o1, OidInt2 o2)
{
return
- ((bool) (o1->oi_oid < o2->oi_oid ||
- (o1->oi_oid == o2->oi_oid && o1->oi_int2 < o2->oi_int2)));
+ ((bool) (o1->oi_oid < o2->oi_oid ||
+ (o1->oi_oid == o2->oi_oid && o1->oi_int2 < o2->oi_int2)));
}
bool
diff --git a/src/backend/utils/adt/oidint4.c b/src/backend/utils/adt/oidint4.c
index 18931efc69a6fbe83fe66af06faaba5c8f7418ce..c8c7c3de4bdcfe4043f226552089ccc80cb048cb 100644
--- a/src/backend/utils/adt/oidint4.c
+++ b/src/backend/utils/adt/oidint4.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint4.c,v 1.3 1997/09/08 02:30:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint4.c,v 1.4 1997/09/08 21:48:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,8 +60,8 @@ bool
oidint4lt(OidInt4 o1, OidInt4 o2)
{
return
- ((bool) (o1->oi_oid < o2->oi_oid ||
- (o1->oi_oid == o2->oi_oid && o1->oi_int4 < o2->oi_int4)));
+ ((bool) (o1->oi_oid < o2->oi_oid ||
+ (o1->oi_oid == o2->oi_oid && o1->oi_int4 < o2->oi_int4)));
}
bool
diff --git a/src/backend/utils/adt/oidname.c b/src/backend/utils/adt/oidname.c
index 915b953ae4977cf402965529db0b632f5a81e6ed..a6ff8e1a305a70d2deb4058b79b697da611224fa 100644
--- a/src/backend/utils/adt/oidname.c
+++ b/src/backend/utils/adt/oidname.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.6 1997/09/08 02:30:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.7 1997/09/08 21:48:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,32 +61,32 @@ bool
oidnamelt(OidName o1, OidName o2)
{
return (bool)
- (o1->id < o2->id ||
- (o1->id == o2->id && namecmp(&o1->name, &o2->name) < 0));
+ (o1->id < o2->id ||
+ (o1->id == o2->id && namecmp(&o1->name, &o2->name) < 0));
}
bool
oidnamele(OidName o1, OidName o2)
{
return (bool)
- (o1->id < o2->id ||
- (o1->id == o2->id && namecmp(&o1->name, &o2->name) <= 0));
+ (o1->id < o2->id ||
+ (o1->id == o2->id && namecmp(&o1->name, &o2->name) <= 0));
}
bool
oidnameeq(OidName o1, OidName o2)
{
return (bool)
- (o1->id == o2->id &&
- (namecmp(&o1->name, &o2->name) == 0));
+ (o1->id == o2->id &&
+ (namecmp(&o1->name, &o2->name) == 0));
}
bool
oidnamene(OidName o1, OidName o2)
{
return (bool)
- (o1->id != o2->id ||
- (namecmp(&o1->name, &o2->name) != 0));
+ (o1->id != o2->id ||
+ (namecmp(&o1->name, &o2->name) != 0));
}
bool
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index fb8a512ed79329d8f96e34417a83e1fb7172f65a..27216ab3d805d9f3966152bb858026e7cc2ef8c8 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
/*
* Edmund Mergl <E.Mergl@bawue.de>
*
- * $Id: oracle_compat.c,v 1.9 1997/09/08 02:30:57 momjian Exp $
+ * $Id: oracle_compat.c,v 1.10 1997/09/08 21:48:39 momjian Exp $
*
*/
@@ -10,16 +10,16 @@
#include "postgres.h"
-text *lower(text * string);
-text *upper(text * string);
-text *initcap(text * string);
-text *lpad(text * string1, int4 len, text * string2);
-text *rpad(text * string1, int4 len, text * string2);
-text *btrim(text * string, text * set);
-text *ltrim(text * string, text * set);
-text *rtrim(text * string, text * set);
-text *substr(text * string, int4 m, int4 n);
-text *translate(text * string, char from, char to);
+text *lower(text *string);
+text *upper(text *string);
+text *initcap(text *string);
+text *lpad(text *string1, int4 len, text *string2);
+text *rpad(text *string1, int4 len, text *string2);
+text *btrim(text *string, text *set);
+text *ltrim(text *string, text *set);
+text *rtrim(text *string, text *set);
+text *substr(text *string, int4 m, int4 n);
+text *translate(text *string, char from, char to);
/********************************************************************
@@ -37,7 +37,7 @@ text *translate(text * string, char from, char to);
********************************************************************/
text *
-lower(text * string)
+lower(text *string)
{
text *ret;
char *ptr,
@@ -77,7 +77,7 @@ lower(text * string)
********************************************************************/
text *
-upper(text * string)
+upper(text *string)
{
text *ret;
char *ptr,
@@ -119,7 +119,7 @@ upper(text * string)
********************************************************************/
text *
-initcap(text * string)
+initcap(text *string)
{
text *ret;
char *ptr,
@@ -170,7 +170,7 @@ initcap(text * string)
********************************************************************/
text *
-lpad(text * string1, int4 len, text * string2)
+lpad(text *string1, int4 len, text *string2)
{
text *ret;
char *ptr1,
@@ -226,7 +226,7 @@ lpad(text * string1, int4 len, text * string2)
********************************************************************/
text *
-rpad(text * string1, int4 len, text * string2)
+rpad(text *string1, int4 len, text *string2)
{
text *ret;
char *ptr1,
@@ -282,7 +282,7 @@ rpad(text * string1, int4 len, text * string2)
********************************************************************/
text *
-btrim(text * string, text * set)
+btrim(text *string, text *set)
{
text *ret;
char *ptr,
@@ -368,7 +368,7 @@ btrim(text * string, text * set)
********************************************************************/
text *
-ltrim(text * string, text * set)
+ltrim(text *string, text *set)
{
text *ret;
char *ptr,
@@ -431,7 +431,7 @@ ltrim(text * string, text * set)
********************************************************************/
text *
-rtrim(text * string, text * set)
+rtrim(text *string, text *set)
{
text *ret;
char *ptr,
@@ -503,7 +503,7 @@ rtrim(text * string, text * set)
********************************************************************/
text *
-substr(text * string, int4 m, int4 n)
+substr(text *string, int4 m, int4 n)
{
text *ret;
char *ptr,
@@ -549,7 +549,7 @@ substr(text * string, int4 m, int4 n)
********************************************************************/
text *
-translate(text * string, char from, char to)
+translate(text *string, char from, char to)
{
text *ret;
char *ptr,
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 5c94ca8bb8dd1be5efbd27a21bdd7e762422eaf8..b172cc6b486c75c9c16ad30ae6a8ebef9a72711d 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.9 1997/09/08 02:30:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.10 1997/09/08 21:48:40 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -256,7 +256,7 @@ char16regexne(char *s, struct varlena * p)
}
bool
-nameregexeq(NameData * n, struct varlena * p)
+nameregexeq(NameData *n, struct varlena * p)
{
if (!n)
return FALSE;
@@ -264,7 +264,7 @@ nameregexeq(NameData * n, struct varlena * p)
}
bool
-nameregexne(NameData * s, struct varlena * p)
+nameregexne(NameData *s, struct varlena * p)
{
return (!nameregexeq(s, p));
}
@@ -357,7 +357,7 @@ texticregexne(struct varlena * s, struct varlena * p)
}
bool
-nameicregexeq(NameData * n, struct varlena * p)
+nameicregexeq(NameData *n, struct varlena * p)
{
if (!n)
return FALSE;
@@ -366,7 +366,7 @@ nameicregexeq(NameData * n, struct varlena * p)
}
bool
-nameicregexne(NameData * s, struct varlena * p)
+nameicregexne(NameData *s, struct varlena * p)
{
return (!nameicregexeq(s, p));
}
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 09fabfe72a0eae7f669732ebdbc0c9ebfdf9623b..4e66ea4cb3cb252f49b9e1d8bbf97da51e45dea5 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -209,7 +209,7 @@ timestamp_datetime(time_t timestamp)
if (!PointerIsValid(result = PALLOCTYPE(DateTime)))
elog(WARN, "Memory allocation failed, can't convert timestamp to datetime", NULL);
- tm = localtime((time_t *) & timestamp);
+ tm = localtime((time_t *) ×tamp);
tm->tm_year += 1900;
tm->tm_mon += 1;
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index ccd4b9c0acd28d416f3442dc0e5a6f028a61ef1b..e149cc1a4bbecb3cc2ef3c75fb36935228242a2d 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.20 1997/09/08 02:31:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.21 1997/09/08 21:48:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -212,7 +212,7 @@ textout(struct varlena * vlena)
*/
#ifdef NOT_USED
int
-textlen(text * t)
+textlen(text *t)
{
int i = 0;
int max = VARSIZE(t) - VARHDRSZ;
@@ -239,7 +239,7 @@ textlen(text * t)
*/
text *
-textcat(text * t1, text * t2)
+textcat(text *t1, text *t2)
{
int len1,
len2,
@@ -281,7 +281,7 @@ textcat(text * t1, text * t2)
*/
int32
-textpos(text * t1, text * t2)
+textpos(text *t1, text *t2)
{
int pos;
int px,
@@ -348,7 +348,7 @@ texteq(struct varlena * arg1, struct varlena * arg2)
bool
textne(struct varlena * arg1, struct varlena * arg2)
{
- return ((bool) ! texteq(arg1, arg2));
+ return ((bool) !texteq(arg1, arg2));
}
/* text_lt()
@@ -466,13 +466,13 @@ text_le(struct varlena * arg1, struct varlena * arg2)
bool
text_gt(struct varlena * arg1, struct varlena * arg2)
{
- return ((bool) ! text_le(arg1, arg2));
+ return ((bool) !text_le(arg1, arg2));
}
bool
text_ge(struct varlena * arg1, struct varlena * arg2)
{
- return ((bool) ! text_lt(arg1, arg2));
+ return ((bool) !text_lt(arg1, arg2));
}
/*-------------------------------------------------------------
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c1510f0ecc4e8b04de475c00697f59d3712b88da..960385d88ebaadf286c9b8ae1c601718316c8ac7 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.12 1997/09/08 02:31:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.13 1997/09/08 21:48:45 momjian Exp $
*
* Notes:
* XXX This needs to use exception.h to handle recovery when
@@ -34,7 +34,7 @@
#include "catalog/pg_type.h" /* for OID of int28 type */
#include "lib/dllist.h"
-static void CatCacheRemoveCTup(CatCache * cache, Dlelem * e);
+static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
static Index
CatalogCacheComputeTupleHashIndex(struct catcache * cacheInOutP,
@@ -213,7 +213,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
EQPROC(tupdesc->attrs[cache->cc_key[i] - 1]->atttypid);
fmgr_info(cache->cc_skey[i].sk_procedure,
- (func_ptr *) & cache->cc_skey[i].sk_func,
+ (func_ptr *) &cache->cc_skey[i].sk_func,
(int *) &cache->cc_skey[i].sk_nargs);
CACHE5_elog(DEBUG, "CatalogCacheInit %16s %d %d %x",
@@ -268,7 +268,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
*/
#ifdef NOT_USED
void
-CatalogCacheSetId(CatCache * cacheInOutP, int id)
+CatalogCacheSetId(CatCache *cacheInOutP, int id)
{
Assert(id == InvalidCatalogCacheId || id >= 0);
cacheInOutP->id = id;
@@ -439,7 +439,7 @@ CatalogCacheComputeTupleHashIndex(struct catcache * cacheInOutP,
* --------------------------------
*/
static void
-CatCacheRemoveCTup(CatCache * cache, Dlelem * elt)
+CatCacheRemoveCTup(CatCache *cache, Dlelem *elt)
{
CatCTup *ct;
CatCTup *other_ct;
@@ -651,7 +651,7 @@ InitSysCache(char *relname,
int id,
int nkeys,
int key[],
- HeapTuple(*iScanfuncP) ())
+ HeapTuple (*iScanfuncP) ())
{
CatCache *cp;
register int i;
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 96c0102c1cfdcda08d1c5531b894c5cbc71c8b20..7bfa62e564b8c4450f15f7fb4378ce0e58a3af88 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.6 1997/09/08 02:31:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.7 1997/09/08 21:48:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,12 +35,12 @@
#include <string.h>
#endif
-static Oid GetDynamicFuncArgType(Var * arg, ExprContext * econtext);
+static Oid GetDynamicFuncArgType(Var *arg, ExprContext *econtext);
static FunctionCachePtr
init_fcache(Oid foid,
bool use_syscache,
- List * argList,
- ExprContext * econtext);
+ List *argList,
+ ExprContext *econtext);
/*-----------------------------------------------------------------
*
@@ -56,7 +56,7 @@ init_fcache(Oid foid,
(IsA(arg,Var) && ((Var*)arg)->varattno == InvalidAttrNumber)
static Oid
-GetDynamicFuncArgType(Var * arg, ExprContext * econtext)
+GetDynamicFuncArgType(Var *arg, ExprContext *econtext)
{
char *relname;
int rtid;
@@ -80,8 +80,8 @@ GetDynamicFuncArgType(Var * arg, ExprContext * econtext)
static FunctionCachePtr
init_fcache(Oid foid,
bool use_syscache,
- List * argList,
- ExprContext * econtext)
+ List *argList,
+ ExprContext *econtext)
{
HeapTuple procedureTuple;
HeapTuple typeTuple;
@@ -291,7 +291,7 @@ init_fcache(Oid foid,
}
void
-setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext)
+setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext)
{
Func *fnode;
Oper *onode;
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index bd76c639d291346556030109ef03ed73d8235927..b1017fe4f3ab5b1d9670096b7fb9027a528bdab0 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.7 1997/09/08 20:57:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.8 1997/09/08 21:48:50 momjian Exp $
*
* Note - this code is real crufty...
*
@@ -48,13 +48,13 @@ typedef struct CatalogInvalidationData
Index cacheId;
Index hashIndex;
ItemPointerData pointerData;
-} CatalogInvalidationData;
+} CatalogInvalidationData;
typedef struct RelationInvalidationData
{
Oid relationId;
Oid objectId;
-} RelationInvalidationData;
+} RelationInvalidationData;
typedef union AnyInvalidation
{
@@ -66,7 +66,7 @@ typedef struct InvalidationMessageData
{
char kind;
AnyInvalidation any;
-} InvalidationMessageData;
+} InvalidationMessageData;
typedef InvalidationMessageData *InvalidationMessage;
@@ -103,7 +103,7 @@ InvalidationEntryAllocate(uint16 size)
entryDataP = (InvalidationEntryData *)
malloc(sizeof(char *) + size); /* XXX alignment */
entryDataP->nextP = NULL;
- return ((Pointer) & entryDataP->userData);
+ return ((Pointer) &entryDataP->userData);
}
/* --------------------------------
@@ -137,11 +137,11 @@ LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ())
while (PointerIsValid(invalid))
{
entryDataP = (InvalidationEntryData *)
- & ((InvalidationUserData *) invalid)->dataP[-1];
+ &((InvalidationUserData *) invalid)->dataP[-1];
if (PointerIsValid(function))
{
- (*function) ((Pointer) & entryDataP->userData);
+ (*function) ((Pointer) &entryDataP->userData);
}
invalid = (Pointer) entryDataP->nextP;
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 123e7c1462cd5466bb5eef2c942a55806a46ea68..060a7b2a89679190d3060f1273f5835e2921c123 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.5 1997/09/08 02:31:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.6 1997/09/08 21:48:51 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -216,7 +216,7 @@ get_opname(Oid opno)
*
*/
bool
-op_mergesortable(Oid opno, Oid ltype, Oid rtype, Oid * leftOp, Oid * rightOp)
+op_mergesortable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
{
FormData_pg_operator optup;
diff --git a/src/backend/utils/cache/rel.c b/src/backend/utils/cache/rel.c
index 4e45138037c7cd2a07f2192d2a0772aa4053ea23..7b74fd08b7333b2da178e654f823ad7f43a0fe67 100644
--- a/src/backend/utils/cache/rel.c
+++ b/src/backend/utils/cache/rel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.2 1997/09/07 04:53:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.3 1997/09/08 21:48:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -66,7 +66,7 @@ RelationGetIndexStrategy(Relation relation)
void
RelationSetIndexSupport(Relation relation,
IndexStrategy strategy,
- RegProcedure * support)
+ RegProcedure *support)
{
Assert(PointerIsValid(relation));
Assert(IndexStrategyIsValid(strategy));
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 4b1f5e251c6b10be5f6ec149d267dca9cc3dbaf1..8369b81381c75b2936cbf29e850e10310b4725af 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.22 1997/09/08 02:31:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.23 1997/09/08 21:48:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -88,7 +88,7 @@
#include "fmgr.h"
static void
-RelationFlushRelation(Relation * relationPtr,
+RelationFlushRelation(Relation *relationPtr,
bool onlyFlushReferenceCountZero);
static Relation RelationNameCacheGetRelation(char *relationName);
static void init_irels(void);
@@ -145,19 +145,19 @@ typedef struct RelationBuildDescInfo
Oid info_id; /* relation object id */
char *info_name; /* relation name */
} i;
-} RelationBuildDescInfo;
+} RelationBuildDescInfo;
typedef struct relidcacheent
{
Oid reloid;
Relation reldesc;
-} RelIdCacheEnt;
+} RelIdCacheEnt;
typedef struct relnamecacheent
{
NameData relname;
Relation reldesc;
-} RelNameCacheEnt;
+} RelNameCacheEnt;
/* -----------------
* macros to manipulate name cache and id cache
@@ -251,7 +251,7 @@ formrdesc(char *relationName, u_int natts,
FormData_pg_attribute att[]);
#if 0 /* See comments at line 1304 */
-static void RelationFlushIndexes(Relation * r, Oid accessMethodId);
+static void RelationFlushIndexes(Relation *r, Oid accessMethodId);
#endif
@@ -1329,7 +1329,7 @@ RelationClose(Relation relation)
* --------------------------------
*/
static void
-RelationFlushRelation(Relation * relationPtr,
+RelationFlushRelation(Relation *relationPtr,
bool onlyFlushReferenceCountZero)
{
MemoryContext oldcxt;
@@ -1459,7 +1459,7 @@ RelationIdInvalidateRelationCacheByRelationId(Oid relationId)
* --------------------------------
*/
static void
-RelationFlushIndexes(Relation * r,
+RelationFlushIndexes(Relation *r,
Oid accessMethodId)
{
Relation relation = *r;
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 75bd7bfcb43c4b7727c23b7934bcf3ec4d56d322..8a07d88c32fd335744fdfcf050b9fd359b98d231 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.6 1997/09/08 02:31:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.7 1997/09/08 21:48:56 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
@@ -57,7 +57,7 @@ extern bool AMI_OVERRIDE; /* XXX style */
#include "utils/syscache.h"
#include "catalog/indexing.h"
-typedef HeapTuple(*ScanFunc) ();
+typedef HeapTuple (*ScanFunc) ();
/* ----------------
* Warning: cacheinfo[] below is changed, then be sure and
@@ -179,7 +179,7 @@ static struct cachedesc cacheinfo[] = {
0,
0,
0},
- offsetof(TypeTupleFormData, typalign) + sizeof(char),
+ offsetof(TypeTupleFormData, typalign) +sizeof(char),
TypeNameIndex,
TypeNameIndexScan},
{TypeRelationName, /* TYPOID */
@@ -383,7 +383,7 @@ InitCatalogCache()
* XXX The tuple that is returned is NOT supposed to be pfree'd!
*/
HeapTuple
-SearchSysCacheTuple(int cacheId, /* cache selection code */
+SearchSysCacheTuple(int cacheId,/* cache selection code */
Datum key1,
Datum key2,
Datum key3,
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 1e3276fe5cf4d76a8d6bdd792ebd38860d084af4..b9da443df05b88a278566e92d4e03a8e60f048f3 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.6 1997/09/08 02:31:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.7 1997/09/08 21:48:58 momjian Exp $
*
* NOTE
* This should eventually work with elog(), dlog(), etc.
@@ -23,7 +23,7 @@
int
ExceptionalCondition(char *conditionName,
- Exception * exceptionP,
+ Exception *exceptionP,
char *detail,
char *fileName,
int lineNumber)
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index cfa0176440dc9877ec271e832721f4dd553a2637..8a899354308e454ad6cd787e3aa94fe714729fb5 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.17 1997/09/08 02:31:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.18 1997/09/08 21:49:00 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -25,10 +25,10 @@
#include "storage/ipc.h"
static void
-ExcUnCaught(Exception * excP, ExcDetail detail, ExcData data,
+ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data,
ExcMessage message);
static void
-ExcPrint(Exception * excP, ExcDetail detail, ExcData data,
+ExcPrint(Exception *excP, ExcDetail detail, ExcData data,
ExcMessage message);
/*
@@ -98,7 +98,7 @@ EnableExceptionHandling(bool on)
}
static void
-ExcPrint(Exception * excP,
+ExcPrint(Exception *excP,
ExcDetail detail,
ExcData data,
ExcMessage message)
@@ -151,7 +151,7 @@ ExcGetUnCaught(void)
#ifdef NOT_USED
ExcProc *
-ExcSetUnCaught(ExcProc * newP)
+ExcSetUnCaught(ExcProc *newP)
{
ExcProc *oldP = ExcUnCaughtP;
@@ -163,7 +163,7 @@ ExcSetUnCaught(ExcProc * newP)
#endif
static void
-ExcUnCaught(Exception * excP,
+ExcUnCaught(Exception *excP,
ExcDetail detail,
ExcData data,
ExcMessage message)
@@ -174,7 +174,7 @@ ExcUnCaught(Exception * excP,
}
void
-ExcRaise(Exception * excP,
+ExcRaise(Exception *excP,
ExcDetail detail,
ExcData data,
ExcMessage message)
diff --git a/src/backend/utils/error/excabort.c b/src/backend/utils/error/excabort.c
index 3240f326496e1565375b59e78bd49842b7e588b6..d87d57f2fef153a441743cde3ed6fab3a6a519ff 100644
--- a/src/backend/utils/error/excabort.c
+++ b/src/backend/utils/error/excabort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.3 1997/09/07 04:53:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.4 1997/09/08 21:49:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
#include "utils/exc.h" /* where function declarations go */
void
-ExcAbort(const Exception * excP,
+ExcAbort(const Exception *excP,
ExcDetail detail,
ExcData data,
ExcMessage message)
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 73238f0e15a7637e2ac3ceb8559d76e105e22882..939341a3ded4eb535dc35618aaf55a759f4b362f 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.5 1997/09/08 02:31:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.6 1997/09/08 21:49:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,8 +33,8 @@ char *
fmgr_c(func_ptr user_fn,
Oid func_id,
int n_arguments,
- FmgrValues * values,
- bool * isNull)
+ FmgrValues *values,
+ bool *isNull)
{
char *returnValue = (char *) NULL;
@@ -115,7 +115,7 @@ fmgr_c(func_ptr user_fn,
}
void
-fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
+fmgr_info(Oid procedureId, func_ptr *function, int *nargs)
{
func_ptr user_fn = NULL;
FmgrCall *fcp;
@@ -252,7 +252,7 @@ fmgr_ptr(func_ptr user_fn, Oid func_id,...)
* to fmgr_c().
*/
char *
-fmgr_array_args(Oid procedureId, int nargs, char *args[], bool * isNull)
+fmgr_array_args(Oid procedureId, int nargs, char *args[], bool *isNull)
{
func_ptr user_fn;
int true_arguments;
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 8f306ff9a80695d442a62a8d63fc3b83f98e1be1..5ea36ca943c6fc43471349a7fb4cc9ddedebc6af 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.9 1997/09/08 02:31:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.10 1997/09/08 21:49:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -66,10 +66,10 @@
*/
static long *DynaHashAlloc(unsigned int size);
static void DynaHashFree(Pointer ptr);
-static uint32 call_hash(HTAB * hashp, char *k, int len);
-static SEG_OFFSET seg_alloc(HTAB * hashp);
-static int bucket_alloc(HTAB * hashp);
-static int dir_realloc(HTAB * hashp);
+static uint32 call_hash(HTAB *hashp, char *k, int len);
+static SEG_OFFSET seg_alloc(HTAB *hashp);
+static int bucket_alloc(HTAB *hashp);
+static int dir_realloc(HTAB *hashp);
typedef long *((*dhalloc_ptr) ());
@@ -122,9 +122,9 @@ DynaHashFree(Pointer ptr)
* ----------------
*/
-static int expand_table(HTAB * hashp);
-static int hdefault(HTAB * hashp);
-static int init_htab(HTAB * hashp, int nelem);
+static int expand_table(HTAB *hashp);
+static int hdefault(HTAB *hashp);
+static int init_htab(HTAB *hashp, int nelem);
/*
@@ -155,7 +155,7 @@ static long hash_accesses,
/************************** CREATE ROUTINES **********************/
HTAB *
-hash_create(int nelem, HASHCTL * info, int flags)
+hash_create(int nelem, HASHCTL *info, int flags)
{
register HHDR *hctl;
HTAB *hashp;
@@ -267,7 +267,7 @@ hash_create(int nelem, HASHCTL * info, int flags)
Allocate and initialize an HTAB structure
*/
static int
-hdefault(HTAB * hashp)
+hdefault(HTAB *hashp)
{
HHDR *hctl;
@@ -300,7 +300,7 @@ hdefault(HTAB * hashp)
static int
-init_htab(HTAB * hashp, int nelem)
+init_htab(HTAB *hashp, int nelem)
{
register SEG_OFFSET *segp;
register int nbuckets;
@@ -380,7 +380,7 @@ init_htab(HTAB * hashp, int nelem)
/********************** DESTROY ROUTINES ************************/
void
-hash_destroy(HTAB * hashp)
+hash_destroy(HTAB *hashp)
{
/* cannot destroy a shared memory hash table */
Assert(!hashp->segbase);
@@ -419,7 +419,7 @@ hash_destroy(HTAB * hashp)
}
void
-hash_stats(char *where, HTAB * hashp)
+hash_stats(char *where, HTAB *hashp)
{
#if HASH_STATISTICS
@@ -441,7 +441,7 @@ hash_stats(char *where, HTAB * hashp)
/*******************************SEARCH ROUTINES *****************************/
static uint32
-call_hash(HTAB * hashp, char *k, int len)
+call_hash(HTAB *hashp, char *k, int len)
{
long hash_val,
bucket;
@@ -470,11 +470,11 @@ call_hash(HTAB * hashp, char *k, int len)
* (FALSE if we entered one).
*/
long *
-hash_search(HTAB * hashp,
+hash_search(HTAB *hashp,
char *keyPtr,
HASHACTION action, /* HASH_FIND / HASH_ENTER / HASH_REMOVE
* HASH_FIND_SAVE / HASH_REMOVE_SAVED */
- bool * foundPtr)
+ bool *foundPtr)
{
uint32 bucket;
long segment_num;
@@ -654,7 +654,7 @@ hash_search(HTAB * hashp,
*
*/
long *
-hash_seq(HTAB * hashp)
+hash_seq(HTAB *hashp)
{
static uint32 curBucket = 0;
static BUCKET_INDEX curIndex;
@@ -721,7 +721,7 @@ hash_seq(HTAB * hashp)
/********************************* UTILITIES ************************/
static int
-expand_table(HTAB * hashp)
+expand_table(HTAB *hashp)
{
HHDR *hctl;
SEGMENT old_seg,
@@ -809,7 +809,7 @@ expand_table(HTAB * hashp)
static int
-dir_realloc(HTAB * hashp)
+dir_realloc(HTAB *hashp)
{
register char *p;
char **p_ptr;
@@ -841,7 +841,7 @@ dir_realloc(HTAB * hashp)
static SEG_OFFSET
-seg_alloc(HTAB * hashp)
+seg_alloc(HTAB *hashp)
{
SEGMENT segp;
SEG_OFFSET segOffset;
@@ -866,7 +866,7 @@ seg_alloc(HTAB * hashp)
* allocate some new buckets and link them into the free list
*/
static int
-bucket_alloc(HTAB * hashp)
+bucket_alloc(HTAB *hashp)
{
int i;
ELEMENT *tmpBucket;
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 61cf729fa8b27f1691a30e7a4201b748981dccae..b2fc83e5f714814e7fb2563040e546c675118923 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.5 1997/09/08 02:32:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.6 1997/09/08 21:49:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -121,7 +121,7 @@ static struct GlobalMemory TopGlobalMemoryData = {
* allocate something here, you are expected to clean it up when
* appropriate.
*/
-MemoryContext TopMemoryContext = (MemoryContext) & TopGlobalMemoryData;
+MemoryContext TopMemoryContext = (MemoryContext) &TopGlobalMemoryData;
@@ -367,7 +367,7 @@ MemoryContextSwitchTo(MemoryContext context)
* BadArg if name is invalid.
*/
GlobalMemory
-CreateGlobalMemory(char *name) /* XXX MemoryContextName */
+CreateGlobalMemory(char *name) /* XXX MemoryContextName */
{
GlobalMemory context;
MemoryContext savecxt;
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index 7def05f565683ae5a4f374d2645dfa26e1960e6a..cca16b7457a46f4d322cd6596bd206baa67d0f50 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.5 1997/09/08 02:32:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.6 1997/09/08 21:49:29 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
@@ -42,9 +42,9 @@ OrderedElemGetBase(OrderedElem elem)
void
OrderedSetInit(OrderedSet set, Offset offset)
{
- set->head = (OrderedElem) & set->dummy;
+ set->head = (OrderedElem) &set->dummy;
set->dummy = NULL;
- set->tail = (OrderedElem) & set->head;
+ set->tail = (OrderedElem) &set->head;
set->offset = offset;
}
@@ -163,7 +163,7 @@ static void
OrderedElemPushHead(OrderedElem elem)
{
elem->next = elem->set->head;
- elem->prev = (OrderedElem) & elem->set->head;
+ elem->prev = (OrderedElem) &elem->set->head;
elem->next->prev = elem;
elem->prev->next = elem;
}
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 0cdd54d35bcd053070ca9beee9595597fb4fe473..b56690320f000278be766e0dede102cd3635ff07 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.7 1997/09/08 02:32:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.8 1997/09/08 21:49:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,7 +91,7 @@
#include "utils/portal.h"
-static void CollectNamedPortals(Portal * portalP, int destroy);
+static void CollectNamedPortals(Portal *portalP, int destroy);
static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);
static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context);
static void PortalResetHeapMemory(Portal portal);
@@ -118,7 +118,7 @@ typedef struct portalhashent
{
char portalname[MAX_PORTALNAME_LEN];
Portal portal;
-} PortalHashEnt;
+} PortalHashEnt;
#define PortalManagerEnabled (PortalManagerEnableCount >= 1)
@@ -174,7 +174,7 @@ typedef struct HeapMemoryBlockData
{
AllocSetData setData;
FixedItemData itemData;
-} HeapMemoryBlockData;
+} HeapMemoryBlockData;
typedef HeapMemoryBlockData *HeapMemoryBlock;
@@ -379,14 +379,14 @@ CreateNewBlankPortal()
/*
* initialize portal variable context
*/
- NodeSetTag((Node *) & portal->variable, T_PortalVariableMemory);
+ NodeSetTag((Node *) &portal->variable, T_PortalVariableMemory);
AllocSetInit(&portal->variable.setData, DynamicAllocMode, (Size) 0);
portal->variable.method = &PortalVariableContextMethodsData;
/*
* initialize portal heap context
*/
- NodeSetTag((Node *) & portal->heap, T_PortalHeapMemory);
+ NodeSetTag((Node *) &portal->heap, T_PortalHeapMemory);
portal->heap.block = NULL;
FixedStackInit(&portal->heap.stackData,
offsetof(HeapMemoryBlockData, itemData));
@@ -426,7 +426,7 @@ PortalNameIsSpecial(char *pname)
* and screws up the sequential walk of the table). -mer 17 Aug 1992
*/
static void
-CollectNamedPortals(Portal * portalP, int destroy)
+CollectNamedPortals(Portal *portalP, int destroy)
{
static Portal *portalList = (Portal *) NULL;
static int listIndex = 0;
@@ -479,7 +479,7 @@ AtEOXact_portals()
*/
#ifdef NOT_USED
static void
-PortalDump(Portal * thisP)
+PortalDump(Portal *thisP)
{
/* XXX state/argument checking here */
@@ -640,7 +640,7 @@ BlankPortalAssignName(char *name) /* XXX PortalName */
*/
length = 1 + strlen(name);
portal->name = (char *)
- MemoryContextAlloc((MemoryContext) & portal->variable, length);
+ MemoryContextAlloc((MemoryContext) &portal->variable, length);
strncpy(portal->name, name, length);
@@ -664,9 +664,9 @@ BlankPortalAssignName(char *name) /* XXX PortalName */
*/
void
PortalSetQuery(Portal portal,
- QueryDesc * queryDesc,
+ QueryDesc *queryDesc,
TupleDesc attinfo,
- EState * state,
+ EState *state,
void (*cleanup) (Portal portal))
{
AssertState(PortalManagerEnabled);
@@ -747,12 +747,12 @@ CreatePortal(char *name) /* XXX PortalName */
MemoryContextAlloc((MemoryContext) PortalMemory, sizeof *portal);
/* initialize portal variable context */
- NodeSetTag((Node *) & portal->variable, T_PortalVariableMemory);
+ NodeSetTag((Node *) &portal->variable, T_PortalVariableMemory);
AllocSetInit(&portal->variable.setData, DynamicAllocMode, (Size) 0);
portal->variable.method = &PortalVariableContextMethodsData;
/* initialize portal heap context */
- NodeSetTag((Node *) & portal->heap, T_PortalHeapMemory);
+ NodeSetTag((Node *) &portal->heap, T_PortalHeapMemory);
portal->heap.block = NULL;
FixedStackInit(&portal->heap.stackData,
offsetof(HeapMemoryBlockData, itemData));
@@ -761,7 +761,7 @@ CreatePortal(char *name) /* XXX PortalName */
/* initialize portal name */
length = 1 + strlen(name);
portal->name = (char *)
- MemoryContextAlloc((MemoryContext) & portal->variable, length);
+ MemoryContextAlloc((MemoryContext) &portal->variable, length);
strncpy(portal->name, name, length);
/* initialize portal query */
@@ -786,7 +786,7 @@ CreatePortal(char *name) /* XXX PortalName */
* BadArg if portal is invalid.
*/
void
-PortalDestroy(Portal * portalP)
+PortalDestroy(Portal *portalP)
{
Portal portal = *portalP;
@@ -802,7 +802,7 @@ PortalDestroy(Portal * portalP)
(*portal->cleanup) (portal);
PortalResetHeapMemory(portal);
- MemoryContextFree((MemoryContext) & portal->variable,
+ MemoryContextFree((MemoryContext) &portal->variable,
(Pointer) portal->name);
AllocSetReset(&portal->variable.setData); /* XXX log */
@@ -989,7 +989,7 @@ PortalVariableMemoryGetHeapMemory(PortalVariableMemory context)
{
return ((PortalHeapMemory) ((char *) context
- offsetof(PortalD, variable)
- + offsetof(PortalD, heap)));
+ +offsetof(PortalD, heap)));
}
#endif
@@ -1007,5 +1007,5 @@ PortalHeapMemoryGetVariableMemory(PortalHeapMemory context)
{
return ((PortalVariableMemory) ((char *) context
- offsetof(PortalD, heap)
- + offsetof(PortalD, variable)));
+ +offsetof(PortalD, variable)));
}
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index a84dabd1c761eaeb788fff95e40fecbd365493ec..b7e66235aad9b2b957ef78c7e26b8bb264bdb42e 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.20 1997/09/08 02:32:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.21 1997/09/08 21:49:33 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -64,14 +64,14 @@
#include "miscadmin.h"
#include "storage/fd.h"
-static bool createrun(Sort * node, FILE * file, bool * empty);
-static void destroytape(FILE * file);
-static void dumptuples(FILE * file, Sort * node);
+static bool createrun(Sort *node, FILE *file, bool *empty);
+static void destroytape(FILE *file);
+static void dumptuples(FILE *file, Sort *node);
static FILE *gettape(void);
-static void initialrun(Sort * node, bool * empty);
-static void inittapes(Sort * node);
-static void merge(Sort * node, struct tape * dest);
-static FILE *mergeruns(Sort * node);
+static void initialrun(Sort *node, bool *empty);
+static void inittapes(Sort *node);
+static void merge(Sort *node, struct tape * dest);
+static FILE *mergeruns(Sort *node);
static HeapTuple tuplecopy(HeapTuple tup);
@@ -123,7 +123,7 @@ static long shortzero = 0; /* used to delimit runs */
* Allocates and initializes sort node's psort state.
*/
bool
-psort_begin(Sort * node, int nkeys, ScanKey key)
+psort_begin(Sort *node, int nkeys, ScanKey key)
{
bool empty; /* to answer: is child node empty? */
@@ -170,7 +170,7 @@ psort_begin(Sort * node, int nkeys, ScanKey key)
* number of allocated tapes
*/
static void
-inittapes(Sort * node)
+inittapes(Sort *node)
{
register int i;
register struct tape *tp;
@@ -268,7 +268,7 @@ inittapes(Sort * node)
* Also, perhaps allocate tapes when needed. Split into 2 funcs.
*/
static void
-initialrun(Sort * node, bool * empty)
+initialrun(Sort *node, bool *empty)
{
/* register struct tuple *tup; */
register struct tape *tp;
@@ -350,7 +350,7 @@ initialrun(Sort * node, bool * empty)
* Tuples contains the tuples for the following run upon exit
*/
static bool
-createrun(Sort * node, FILE * file, bool * empty)
+createrun(Sort *node, FILE *file, bool *empty)
{
register HeapTuple lasttuple;
register HeapTuple tup;
@@ -437,7 +437,7 @@ createrun(Sort * node, FILE * file, bool * empty)
/* if we did not see any tuples, mark empty */
*empty = (cr_tuples > 0) ? false : true;
- return ((bool) ! foundeor); /* XXX - works iff bool is {0,1} */
+ return ((bool) !foundeor); /* XXX - works iff bool is {0,1} */
}
/*
@@ -468,7 +468,7 @@ tuplecopy(HeapTuple tup)
* file of tuples in order
*/
static FILE *
-mergeruns(Sort * node)
+mergeruns(Sort *node)
{
register struct tape *tp;
@@ -495,7 +495,7 @@ mergeruns(Sort * node)
* (polyphase merge Alg.D(D5)--Knuth, Vol.3, p271)
*/
static void
-merge(Sort * node, struct tape * dest)
+merge(Sort *node, struct tape * dest)
{
register HeapTuple tup;
register struct tape *lasttp; /* (TAPE[P]) */
@@ -602,7 +602,7 @@ merge(Sort * node, struct tape * dest)
* dumptuples - stores all the tuples in tree into file
*/
static void
-dumptuples(FILE * file, Sort * node)
+dumptuples(FILE *file, Sort *node)
{
register struct leftist *tp;
register struct leftist *newp;
@@ -648,7 +648,7 @@ dumptuples(FILE * file, Sort * node)
* a NULL indicating the last tuple has been processed.
*/
HeapTuple
-psort_grabtuple(Sort * node)
+psort_grabtuple(Sort *node)
{
register HeapTuple tup;
long tuplen;
@@ -690,7 +690,7 @@ psort_grabtuple(Sort * node)
* psort_markpos - saves current position in the merged sort file
*/
void
-psort_markpos(Sort * node)
+psort_markpos(Sort *node)
{
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
@@ -703,7 +703,7 @@ psort_markpos(Sort * node)
* last saved position
*/
void
-psort_restorepos(Sort * node)
+psort_restorepos(Sort *node)
{
Assert(node != (Sort *) NULL);
Assert(PS(node) != (Psortstate *) NULL);
@@ -718,7 +718,7 @@ psort_restorepos(Sort * node)
* called unless psort_grabtuple has returned a NULL.
*/
void
-psort_end(Sort * node)
+psort_end(Sort *node)
{
register struct tape *tp;
@@ -819,7 +819,7 @@ gettape()
*/
#ifdef NOT_USED
static void
-resettape(FILE * file)
+resettape(FILE *file)
{
register struct tapelst *tp;
register int fd;
@@ -851,7 +851,7 @@ resettape(FILE * file)
* Exits instead of returning status, if given invalid tape.
*/
static void
-destroytape(FILE * file)
+destroytape(FILE *file)
{
register struct tapelst *tp,
*tq;
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index e291e9c3441d2dda2dbf5e0a05e8d96f5a410566..366bcf0431e176bf38929ddde65b09c4acf7432a 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.6 1997/09/08 02:32:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.7 1997/09/08 21:49:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,12 +58,12 @@ typedef struct TimeQualData
AbsoluteTime start;
AbsoluteTime end;
TimeQualMode mode;
-} TimeQualData;
+} TimeQualData;
typedef TimeQualData *InternalTimeQual;
static TimeQualData SelfTimeQualData;
-TimeQual SelfTimeQual = (Pointer) & SelfTimeQualData;
+TimeQual SelfTimeQual = (Pointer) &SelfTimeQualData;
extern bool PostgresIsInitialized;
@@ -172,7 +172,7 @@ TimeQualIsValid(TimeQual qual)
}
if (hasStartTime)
{
- return ((bool) ! AbsoluteTimeIsBefore(
+ return ((bool) !AbsoluteTimeIsBefore(
((InternalTimeQual) qual)->end,
((InternalTimeQual) qual)->start));
}
@@ -322,7 +322,7 @@ TimeQualIsSnapshot(TimeQual qual)
return (false);
}
- return ((bool) ! !(((InternalTimeQual) qual)->mode & TimeQualAt));
+ return ((bool) !!(((InternalTimeQual) qual)->mode & TimeQualAt));
}
/*
@@ -342,7 +342,7 @@ TimeQualIsRanged(TimeQual qual)
return (false);
}
- return ((bool) ! (((InternalTimeQual) qual)->mode & TimeQualAt));
+ return ((bool) !(((InternalTimeQual) qual)->mode & TimeQualAt));
}
/*
@@ -911,7 +911,7 @@ HeapTupleSatisfiesUpperUnboundedInternalTimeQual(HeapTuple tuple,
Assert(TransactionIdIsCurrentTransactionId((TransactionId) tuple->t_xmax));
- return ((bool) ! CommandIdGEScanCommandId(tuple->t_cmax));
+ return ((bool) !CommandIdGEScanCommandId(tuple->t_cmax));
}
if (!TransactionIdDidCommit((TransactionId) tuple->t_xmin))
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 61d0879e315cb47cb589ddc9a9bffefa58c9a604..7eeeeac1e793d7f98eb3c271b03b6e756293d4c8 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.15 1997/09/08 02:32:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.16 1997/09/08 21:49:50 momjian Exp $
*
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
*
@@ -36,14 +36,14 @@
#include "pg_dump.h"
static char **
-findParentsByOid(TableInfo * tbinfo, int numTables,
- InhInfo * inhinfo, int numInherits,
+findParentsByOid(TableInfo *tbinfo, int numTables,
+ InhInfo *inhinfo, int numInherits,
const char *oid,
int *numParents);
-static int findTableByOid(TableInfo * tbinfo, int numTables, const char *oid);
+static int findTableByOid(TableInfo *tbinfo, int numTables, const char *oid);
static void
-flagInhAttrs(TableInfo * tbinfo, int numTables,
- InhInfo * inhinfo, int numInherits);
+flagInhAttrs(TableInfo *tbinfo, int numTables,
+ InhInfo *inhinfo, int numInherits);
static int strInArray(const char *pattern, char **arr, int arr_size);
/*
@@ -56,7 +56,7 @@ static int strInArray(const char *pattern, char **arr, int arr_size);
*/
char *
-findTypeByOid(TypeInfo * tinfo, int numTypes, const char *oid)
+findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid)
{
int i;
@@ -84,7 +84,7 @@ findTypeByOid(TypeInfo * tinfo, int numTypes, const char *oid)
*
*/
char *
-findOprByOid(OprInfo * oprinfo, int numOprs, const char *oid)
+findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid)
{
int i;
@@ -111,8 +111,8 @@ findOprByOid(OprInfo * oprinfo, int numOprs, const char *oid)
*/
static char **
-findParentsByOid(TableInfo * tblinfo, int numTables,
- InhInfo * inhinfo, int numInherits, const char *oid,
+findParentsByOid(TableInfo *tblinfo, int numTables,
+ InhInfo *inhinfo, int numInherits, const char *oid,
int *numParentsPtr)
{
int i,
@@ -221,7 +221,7 @@ strInArray(const char *pattern, char **arr, int arr_size)
*/
TableInfo *
-dumpSchema(FILE * fout,
+dumpSchema(FILE *fout,
int *numTablesPtr,
const char *tablename,
const bool acls)
@@ -336,8 +336,8 @@ dumpSchema(FILE * fout,
*/
extern void
-dumpSchemaIdx(FILE * fout, int *numTablesPtr, const char *tablename,
- TableInfo * tblinfo, int numTables)
+dumpSchemaIdx(FILE *fout, int *numTablesPtr, const char *tablename,
+ TableInfo *tblinfo, int numTables)
{
int numIndices;
IndInfo *indinfo;
@@ -367,8 +367,8 @@ dumpSchemaIdx(FILE * fout, int *numTablesPtr, const char *tablename,
*
*/
static void
-flagInhAttrs(TableInfo * tblinfo, int numTables,
- InhInfo * inhinfo, int numInherits)
+flagInhAttrs(TableInfo *tblinfo, int numTables,
+ InhInfo *inhinfo, int numInherits)
{
int i,
j,
@@ -413,7 +413,7 @@ flagInhAttrs(TableInfo * tblinfo, int numTables,
*/
int
-findTableByName(TableInfo * tblinfo, int numTables, const char *relname)
+findTableByName(TableInfo *tblinfo, int numTables, const char *relname)
{
int i;
@@ -434,7 +434,7 @@ findTableByName(TableInfo * tblinfo, int numTables, const char *relname)
*/
static int
-findTableByOid(TableInfo * tblinfo, int numTables, const char *oid)
+findTableByOid(TableInfo *tblinfo, int numTables, const char *oid)
{
int i;
@@ -456,7 +456,7 @@ findTableByOid(TableInfo * tblinfo, int numTables, const char *oid)
*/
int
-findFuncByName(FuncInfo * finfo, int numFuncs, const char *name)
+findFuncByName(FuncInfo *finfo, int numFuncs, const char *name)
{
int i;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 82b0f71bea466ffece251bc834c16006b4223f15..38ebfd49dc747044908c1739a276dafa489079b9 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.43 1997/09/08 20:57:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.44 1997/09/08 21:49:57 momjian Exp $
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
@@ -67,15 +67,15 @@
#include "pg_dump.h"
-static void dumpSequence(FILE * fout, TableInfo tbinfo);
+static void dumpSequence(FILE *fout, TableInfo tbinfo);
static char *checkForQuote(const char *s);
static void clearTableInfo(TableInfo *, int);
static void
-dumpOneFunc(FILE * fout, FuncInfo * finfo, int i,
- TypeInfo * tinfo, int numTypes);
+dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
+ TypeInfo *tinfo, int numTypes);
static int findLastBuiltinOid(void);
static bool isViewRule(char *relname);
-static void setMaxOid(FILE * fout);
+static void setMaxOid(FILE *fout);
extern char *optarg;
extern int optind,
@@ -137,7 +137,7 @@ usage(const char *progname)
}
static void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
@@ -189,7 +189,7 @@ isViewRule(char *relname)
static void
-dumpClasses_nodumpData(FILE * fout, const char *classname, const bool oids)
+dumpClasses_nodumpData(FILE *fout, const char *classname, const bool oids)
{
PGresult *res;
@@ -282,7 +282,7 @@ dumpClasses_nodumpData(FILE * fout, const char *classname, const bool oids)
static void
-dumpClasses_dumpData(FILE * fout, const char *classname,
+dumpClasses_dumpData(FILE *fout, const char *classname,
const TableInfo tblinfo, bool oids)
{
@@ -389,7 +389,7 @@ dumpClasses_dumpData(FILE * fout, const char *classname,
* dump the contents of all the classes.
*/
static void
-dumpClasses(const TableInfo tblinfo[], const int numTables, FILE * fout,
+dumpClasses(const TableInfo tblinfo[], const int numTables, FILE *fout,
const char *onlytable, const bool oids)
{
@@ -816,7 +816,7 @@ getOperators(int *numOprs)
}
void
-clearTypeInfo(TypeInfo * tp, int numTypes)
+clearTypeInfo(TypeInfo *tp, int numTypes)
{
int i;
@@ -855,7 +855,7 @@ clearTypeInfo(TypeInfo * tp, int numTypes)
}
void
-clearFuncInfo(FuncInfo * fun, int numFuncs)
+clearFuncInfo(FuncInfo *fun, int numFuncs)
{
int i,
a;
@@ -884,7 +884,7 @@ clearFuncInfo(FuncInfo * fun, int numFuncs)
}
static void
-clearTableInfo(TableInfo * tblinfo, int numTables)
+clearTableInfo(TableInfo *tblinfo, int numTables)
{
int i,
j;
@@ -938,7 +938,7 @@ clearTableInfo(TableInfo * tblinfo, int numTables)
}
void
-clearInhInfo(InhInfo * inh, int numInherits)
+clearInhInfo(InhInfo *inh, int numInherits)
{
int i;
@@ -955,7 +955,7 @@ clearInhInfo(InhInfo * inh, int numInherits)
}
void
-clearOprInfo(OprInfo * opr, int numOprs)
+clearOprInfo(OprInfo *opr, int numOprs)
{
int i;
@@ -996,7 +996,7 @@ clearOprInfo(OprInfo * opr, int numOprs)
}
void
-clearIndInfo(IndInfo * ind, int numIndices)
+clearIndInfo(IndInfo *ind, int numIndices)
{
int i,
a;
@@ -1416,7 +1416,7 @@ getInherits(int *numInherits)
* modifies tblinfo
*/
void
-getTableAttrs(TableInfo * tblinfo, int numTables)
+getTableAttrs(TableInfo *tblinfo, int numTables)
{
int i,
j;
@@ -1596,8 +1596,8 @@ getIndices(int *numIndices)
*
*/
void
-dumpTypes(FILE * fout, FuncInfo * finfo, int numFuncs,
- TypeInfo * tinfo, int numTypes)
+dumpTypes(FILE *fout, FuncInfo *finfo, int numFuncs,
+ TypeInfo *tinfo, int numTypes)
{
int i;
char q[MAXQUERYLEN];
@@ -1670,8 +1670,8 @@ dumpTypes(FILE * fout, FuncInfo * finfo, int numFuncs,
*
*/
void
-dumpFuncs(FILE * fout, FuncInfo * finfo, int numFuncs,
- TypeInfo * tinfo, int numTypes)
+dumpFuncs(FILE *fout, FuncInfo *finfo, int numFuncs,
+ TypeInfo *tinfo, int numTypes)
{
int i;
@@ -1689,8 +1689,8 @@ dumpFuncs(FILE * fout, FuncInfo * finfo, int numFuncs,
*/
static void
-dumpOneFunc(FILE * fout, FuncInfo * finfo, int i,
- TypeInfo * tinfo, int numTypes)
+dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
+ TypeInfo *tinfo, int numTypes)
{
char q[MAXQUERYLEN];
int j;
@@ -1730,8 +1730,8 @@ dumpOneFunc(FILE * fout, FuncInfo * finfo, int i,
*
*/
void
-dumpOprs(FILE * fout, OprInfo * oprinfo, int numOperators,
- TypeInfo * tinfo, int numTypes)
+dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
+ TypeInfo *tinfo, int numTypes)
{
int i;
char q[MAXQUERYLEN];
@@ -1837,8 +1837,8 @@ dumpOprs(FILE * fout, OprInfo * oprinfo, int numOperators,
*
*/
void
-dumpAggs(FILE * fout, AggInfo *agginfo, int numAggs,
- TypeInfo * tinfo, int numTypes)
+dumpAggs(FILE *fout, AggInfo *agginfo, int numAggs,
+ TypeInfo *tinfo, int numTypes)
{
int i;
char q[MAXQUERYLEN];
@@ -1924,9 +1924,9 @@ dumpAggs(FILE * fout, AggInfo *agginfo, int numAggs,
*/
void
-dumpTables(FILE * fout, TableInfo * tblinfo, int numTables,
- InhInfo * inhinfo, int numInherits,
- TypeInfo * tinfo, int numTypes, const char *tablename,
+dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
+ InhInfo *inhinfo, int numInherits,
+ TypeInfo *tinfo, int numTypes, const char *tablename,
const bool acls)
{
int i,
@@ -2064,8 +2064,8 @@ dumpTables(FILE * fout, TableInfo * tblinfo, int numTables,
* write out to fout all the user-define indices
*/
void
-dumpIndices(FILE * fout, IndInfo * indinfo, int numIndices,
- TableInfo * tblinfo, int numTables, const char *tablename)
+dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
+ TableInfo *tblinfo, int numTables, const char *tablename)
{
int i,
k;
@@ -2212,7 +2212,7 @@ dumpIndices(FILE * fout, IndInfo * indinfo, int numIndices,
*/
#ifdef NOT_USED
void
-dumpTuples(PGresult * res, FILE * fout, int *attrmap)
+dumpTuples(PGresult *res, FILE *fout, int *attrmap)
{
int j,
k;
@@ -2271,7 +2271,7 @@ dumpTuples(PGresult * res, FILE * fout, int *attrmap)
*/
static void
-setMaxOid(FILE * fout)
+setMaxOid(FILE *fout)
{
PGresult *res;
Oid max_oid;
@@ -2387,7 +2387,7 @@ checkForQuote(const char *s)
static void
-dumpSequence(FILE * fout, TableInfo tbinfo)
+dumpSequence(FILE *fout, TableInfo tbinfo)
{
PGresult *res;
int4 last,
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index ba5da2dc6de7c31e376ce68b26719389052a4d1e..63180d6c26d5f2698a02ceeb8c73850146af898b 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_dump.h,v 1.22 1997/09/08 20:57:56 momjian Exp $
+ * $Id: pg_dump.h,v 1.23 1997/09/08 21:49:59 momjian Exp $
*
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
*
@@ -42,7 +42,7 @@ typedef struct _typeInfo
char *usename;
int passedbyvalue;
int isArray;
-} TypeInfo;
+} TypeInfo;
typedef struct _funcInfo
{
@@ -60,7 +60,7 @@ typedef struct _funcInfo
char *probin;
char *usename;
int dumped; /* 1 if already dumped */
-} FuncInfo;
+} FuncInfo;
typedef struct _tableInfo
{
@@ -89,13 +89,13 @@ typedef struct _tableInfo
int *attlen; /* attribute lengths */
char *usename;
-} TableInfo;
+} TableInfo;
typedef struct _inhInfo
{
char *inhrel;
char *inhparent;
-} InhInfo;
+} InhInfo;
typedef struct _indInfo
{
@@ -109,7 +109,7 @@ typedef struct _indInfo
* attributes */
char *indclass[INDEX_MAX_KEYS]; /* opclass of the keys */
char *indisunique; /* is this index unique? */
-} IndInfo;
+} IndInfo;
typedef struct _aggInfo
{
@@ -146,7 +146,7 @@ typedef struct _oprInfo
* operators */
char *oprrsortop;
char *usename;
-} OprInfo;
+} OprInfo;
/* global decls */
@@ -170,21 +170,21 @@ extern char g_opaque_type[10]; /* name for the opaque type */
*/
extern TableInfo *
-dumpSchema(FILE * fout,
+dumpSchema(FILE *fout,
int *numTablesPtr,
const char *tablename,
const bool acls);
extern void
-dumpSchemaIdx(FILE * fout,
+dumpSchemaIdx(FILE *fout,
int *numTablesPtr,
const char *tablename,
- TableInfo * tblinfo,
+ TableInfo *tblinfo,
int numTables);
-extern char *findTypeByOid(TypeInfo * tinfo, int numTypes, const char *oid);
-extern char *findOprByOid(OprInfo * oprinfo, int numOprs, const char *oid);
-extern int findFuncByName(FuncInfo * finfo, int numFuncs, const char *name);
-extern int findTableByName(TableInfo * tbinfo, int numTables, const char *relname);
+extern char *findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid);
+extern char *findOprByOid(OprInfo *oprinfo, int numOprs, const char *oid);
+extern int findFuncByName(FuncInfo *finfo, int numFuncs, const char *name);
+extern int findTableByName(TableInfo *tbinfo, int numTables, const char *relname);
extern void check_conn_and_db(void);
extern void parseArgTypes(char **argtypes, const char *str);
@@ -207,28 +207,28 @@ extern void clearTypeInfo(TypeInfo *, int);
extern OprInfo *getOperators(int *numOperators);
extern TableInfo *getTables(int *numTables);
extern InhInfo *getInherits(int *numInherits);
-extern void getTableAttrs(TableInfo * tbinfo, int numTables);
+extern void getTableAttrs(TableInfo *tbinfo, int numTables);
extern IndInfo *getIndices(int *numIndices);
extern void
-dumpTypes(FILE * fout, FuncInfo * finfo, int numFuncs,
- TypeInfo * tinfo, int numTypes);
+dumpTypes(FILE *fout, FuncInfo *finfo, int numFuncs,
+ TypeInfo *tinfo, int numTypes);
extern void
-dumpFuncs(FILE * fout, FuncInfo * finfo, int numFuncs,
- TypeInfo * tinfo, int numTypes);
+dumpFuncs(FILE *fout, FuncInfo *finfo, int numFuncs,
+ TypeInfo *tinfo, int numTypes);
extern void
-dumpAggs(FILE * fout, AggInfo *agginfo, int numAggregates,
- TypeInfo * tinfo, int numTypes);
+dumpAggs(FILE *fout, AggInfo *agginfo, int numAggregates,
+ TypeInfo *tinfo, int numTypes);
extern void
-dumpOprs(FILE * fout, OprInfo * agginfo, int numOperators,
- TypeInfo * tinfo, int numTypes);
+dumpOprs(FILE *fout, OprInfo *agginfo, int numOperators,
+ TypeInfo *tinfo, int numTypes);
extern void
-dumpTables(FILE * fout, TableInfo * tbinfo, int numTables,
- InhInfo * inhinfo, int numInherits,
- TypeInfo * tinfo, int numTypes, const char *tablename,
+dumpTables(FILE *fout, TableInfo *tbinfo, int numTables,
+ InhInfo *inhinfo, int numInherits,
+ TypeInfo *tinfo, int numTypes, const char *tablename,
const bool acls);
extern void
-dumpIndices(FILE * fout, IndInfo * indinfo, int numIndices,
- TableInfo * tbinfo, int numTables, const char *tablename);
+dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
+ TableInfo *tbinfo, int numTables, const char *tablename);
/* largest query string size */
#define MAXQUERYLEN 5000
diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c
index 4394f83e7cc054f199f914bfeceb63b24979b284..a4fd49782d929880a5f20f8121cb95c3e5683696 100644
--- a/src/bin/pg_passwd/pg_passwd.c
+++ b/src/bin/pg_passwd/pg_passwd.c
@@ -24,7 +24,7 @@ extern char *crypt(const char *, const char *);
#endif
char *comname;
-void usage(FILE * stream);
+void usage(FILE *stream);
void read_pwd_file(char *filename);
void write_pwd_file(char *filename, char *bkname);
void encrypt_pwd(char key[9], char salt[3], char passwd[14]);
@@ -33,7 +33,7 @@ void prompt_for_username(char *username);
void prompt_for_password(char *prompt, char *password);
void
-usage(FILE * stream)
+usage(FILE *stream)
{
fprintf(stream, "Usage: %s <password file>\n", comname);
}
@@ -43,7 +43,7 @@ typedef struct
char *uname;
char *pwd;
char *rest;
-} pg_pwd;
+} pg_pwd;
#define MAXPWDS 1024
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index fa6bd9608e6582b94e43ca862e3200d78b077ec2..f2ab13da5dab37329cb60f8b27101bd0b65a0775 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.92 1997/09/08 02:33:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.93 1997/09/08 21:50:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -94,44 +94,44 @@ typedef struct _psqlSettings
bool useReadline; /* use libreadline routines */
bool getPassword; /* prompt the user for a username and
* password */
-} PsqlSettings;
+} PsqlSettings;
/* declarations for functions in this file */
static void usage(char *progname);
static void slashUsage();
-static void handleCopyOut(PGresult * res, bool quiet, FILE * copystream);
+static void handleCopyOut(PGresult *res, bool quiet, FILE *copystream);
static void
-handleCopyIn(PGresult * res, const bool mustprompt,
- FILE * copystream);
-static int tableList(PsqlSettings * ps, bool deep_tablelist, char info_type);
-static int tableDesc(PsqlSettings * ps, char *table);
-static int rightsList(PsqlSettings * ps);
+handleCopyIn(PGresult *res, const bool mustprompt,
+ FILE *copystream);
+static int tableList(PsqlSettings *ps, bool deep_tablelist, char info_type);
+static int tableDesc(PsqlSettings *ps, char *table);
+static int rightsList(PsqlSettings *ps);
static void prompt_for_password(char *username, char *password);
static char *
make_connect_string(char *host, char *port, char *dbname,
char *username, char *password);
-static char *gets_noreadline(char *prompt, FILE * source);
-static char *gets_readline(char *prompt, FILE * source);
-static char *gets_fromFile(char *prompt, FILE * source);
-static int listAllDbs(PsqlSettings * settings);
+static char *gets_noreadline(char *prompt, FILE *source);
+static char *gets_readline(char *prompt, FILE *source);
+static char *gets_fromFile(char *prompt, FILE *source);
+static int listAllDbs(PsqlSettings *settings);
static void
-SendQuery(bool * success_p, PsqlSettings * settings, const char *query,
- const bool copy_in, const bool copy_out, FILE * copystream);
+SendQuery(bool *success_p, PsqlSettings *settings, const char *query,
+ const bool copy_in, const bool copy_out, FILE *copystream);
static int
-HandleSlashCmds(PsqlSettings * settings,
+HandleSlashCmds(PsqlSettings *settings,
char *line,
char *query);
-static int MainLoop(PsqlSettings * settings, FILE * source);
+static int MainLoop(PsqlSettings *settings, FILE *source);
/* probably should move this into libpq */
void
-PQprint(FILE * fp,
- PGresult * res,
- PQprintOpt * po
+PQprint(FILE *fp,
+ PGresult *res,
+ PQprintOpt *po
);
-static FILE *setFout(PsqlSettings * ps, char *fname);
+static FILE *setFout(PsqlSettings *ps, char *fname);
/*
* usage print out usage for command line arguments
@@ -175,7 +175,7 @@ on(bool f)
}
static void
-slashUsage(PsqlSettings * ps)
+slashUsage(PsqlSettings *ps)
{
int usePipe = 0;
char *pagerenv;
@@ -228,7 +228,7 @@ slashUsage(PsqlSettings * ps)
}
static PGresult *
-PSQLexec(PsqlSettings * ps, char *query)
+PSQLexec(PsqlSettings *ps, char *query)
{
PGresult *res;
@@ -256,7 +256,7 @@ PSQLexec(PsqlSettings * ps, char *query)
*/
static int
-listAllDbs(PsqlSettings * ps)
+listAllDbs(PsqlSettings *ps)
{
PGresult *results;
char *query = "select * from pg_database;";
@@ -278,7 +278,7 @@ listAllDbs(PsqlSettings * ps)
*
*/
int
-tableList(PsqlSettings * ps, bool deep_tablelist, char info_type)
+tableList(PsqlSettings *ps, bool deep_tablelist, char info_type)
{
char listbuf[256];
int nColumns;
@@ -405,7 +405,7 @@ tableList(PsqlSettings * ps, bool deep_tablelist, char info_type)
*
*/
int
-rightsList(PsqlSettings * ps)
+rightsList(PsqlSettings *ps)
{
char listbuf[256];
int nColumns;
@@ -460,7 +460,7 @@ rightsList(PsqlSettings * ps)
*
*/
int
-tableDesc(PsqlSettings * ps, char *table)
+tableDesc(PsqlSettings *ps, char *table)
{
char descbuf[256];
int nColumns;
@@ -558,14 +558,14 @@ tableDesc(PsqlSettings * ps, char *table)
}
}
-typedef char *(*READ_ROUTINE) (char *prompt, FILE * source);
+typedef char *(*READ_ROUTINE) (char *prompt, FILE *source);
/*
* gets_noreadline prompt source gets a line of input without calling
* readline, the source is ignored
*/
static char *
-gets_noreadline(char *prompt, FILE * source)
+gets_noreadline(char *prompt, FILE *source)
{
fputs(prompt, stdout);
fflush(stdout);
@@ -577,7 +577,7 @@ gets_noreadline(char *prompt, FILE * source)
* the source is ignored the prompt argument is used as the prompting string
*/
static char *
-gets_readline(char *prompt, FILE * source)
+gets_readline(char *prompt, FILE *source)
{
char *s;
@@ -601,7 +601,7 @@ gets_readline(char *prompt, FILE * source)
* argument is a FILE *
*/
static char *
-gets_fromFile(char *prompt, FILE * source)
+gets_fromFile(char *prompt, FILE *source)
{
char *line;
int len;
@@ -630,8 +630,8 @@ gets_fromFile(char *prompt, FILE * source)
* the query executed successfully returns *success_p = 0 otherwise
*/
static void
-SendQuery(bool * success_p, PsqlSettings * settings, const char *query,
- const bool copy_in, const bool copy_out, FILE * copystream)
+SendQuery(bool *success_p, PsqlSettings *settings, const char *query,
+ const bool copy_in, const bool copy_out, FILE *copystream)
{
PGresult *results;
@@ -781,7 +781,7 @@ editFile(char *fname)
}
static bool
-toggle(PsqlSettings * settings, bool * sw, char *msg)
+toggle(PsqlSettings *settings, bool *sw, char *msg)
{
*sw = !*sw;
if (!settings->quiet)
@@ -853,7 +853,7 @@ unescape(char *dest, const char *source)
static void
parse_slash_copy(const char *args, char *table, const int table_len,
char *file, const int file_len,
- bool * from_p, bool * error_p)
+ bool *from_p, bool *error_p)
{
char work_args[200];
@@ -931,7 +931,7 @@ parse_slash_copy(const char *args, char *table, const int table_len,
static void
-do_copy(const char *args, PsqlSettings * settings)
+do_copy(const char *args, PsqlSettings *settings)
{
/*---------------------------------------------------------------------------
Execute a \copy command (frontend copy). We have to open a file, then
@@ -1005,7 +1005,7 @@ do_copy(const char *args, PsqlSettings * settings)
static void
do_connect(const char *new_dbname,
const char *new_user,
- PsqlSettings * settings)
+ PsqlSettings *settings)
{
if (!new_dbname)
fprintf(stderr, "\\connect must be followed by a database name\n");
@@ -1155,7 +1155,7 @@ do_edit(const char *filename_arg, char *query, int *status_p)
static void
-do_help(PsqlSettings * ps, const char *topic)
+do_help(PsqlSettings *ps, const char *topic)
{
if (!topic)
@@ -1282,7 +1282,7 @@ do_shell(const char *command)
* 3 - new query supplied by edit
*/
static int
-HandleSlashCmds(PsqlSettings * settings,
+HandleSlashCmds(PsqlSettings *settings,
char *line,
char *query)
{
@@ -1620,7 +1620,7 @@ HandleSlashCmds(PsqlSettings * settings,
*/
static int
-MainLoop(PsqlSettings * settings, FILE * source)
+MainLoop(PsqlSettings *settings, FILE *source)
{
char *line; /* line of input */
char *xcomment; /* start of extended comment */
@@ -2156,7 +2156,7 @@ main(int argc, char **argv)
#define COPYBUFSIZ 8192
static void
-handleCopyOut(PGresult * res, bool quiet, FILE * copystream)
+handleCopyOut(PGresult *res, bool quiet, FILE *copystream)
{
bool copydone;
char copybuf[COPYBUFSIZ];
@@ -2197,7 +2197,7 @@ handleCopyOut(PGresult * res, bool quiet, FILE * copystream)
static void
-handleCopyIn(PGresult * res, const bool mustprompt, FILE * copystream)
+handleCopyIn(PGresult *res, const bool mustprompt, FILE *copystream)
{
bool copydone = false;
bool firstload;
@@ -2261,7 +2261,7 @@ handleCopyIn(PGresult * res, const bool mustprompt, FILE * copystream)
*/
static FILE *
-setFout(PsqlSettings * ps, char *fname)
+setFout(PsqlSettings *ps, char *fname)
{
if (ps->queryFout && ps->queryFout != stdout)
{
diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h
index 9bd92e3a77717129ade270712dbf5454d23cc7d7..a996bb4738ef48fbb339178547b2011f0a4a04eb 100644
--- a/src/include/access/funcindex.h
+++ b/src/include/access/funcindex.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: funcindex.h,v 1.4 1997/09/08 02:34:03 momjian Exp $
+ * $Id: funcindex.h,v 1.5 1997/09/08 21:50:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@ typedef struct
Oid arglist[8];
Oid procOid;
NameData funcName;
-} FuncIndexInfo;
+} FuncIndexInfo;
typedef FuncIndexInfo *FuncIndexInfoPtr;
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 0bdf32bdc845e949516d2491031cb296ea01e5dd..6bf54c84df1dbadc452b205c2f885b8671e322f9 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: genam.h,v 1.9 1997/09/08 02:34:04 momjian Exp $
+ * $Id: genam.h,v 1.10 1997/09/08 21:50:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,30 +25,30 @@
extern Relation index_open(Oid relationId);
extern Relation index_openr(char *relationName);
extern void index_close(Relation relation);
-extern InsertIndexResult
+extern InsertIndexResult
index_insert(Relation relation,
- Datum * datum, char *nulls,
+ Datum *datum, char *nulls,
ItemPointer heap_t_ctid,
Relation heapRel);
extern void index_delete(Relation relation, ItemPointer indexItem);
-extern IndexScanDesc
+extern IndexScanDesc
index_beginscan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key);
extern void index_endscan(IndexScanDesc scan);
-extern RetrieveIndexResult
+extern RetrieveIndexResult
index_getnext(IndexScanDesc scan,
ScanDirection direction);
-extern RegProcedure
+extern RegProcedure
index_getprocid(Relation irel, AttrNumber attnum,
uint16 procnum);
-extern Datum
+extern Datum
GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
- int attOff, AttrNumber attrNums[], FuncIndexInfo * fInfo,
- bool * attNull, Buffer buffer);
+ int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo,
+ bool *attNull, Buffer buffer);
/* in genam.c */
-extern IndexScanDesc
+extern IndexScanDesc
RelationGetIndexScan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void IndexScanMarkPosition(IndexScanDesc scan);
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 5c04951aa4a47e97983312f9ecaa19b543e87bac..d6519cd132c0f31905e8f80f72f313150453547c 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -52,7 +52,7 @@
typedef struct GISTPageOpaqueData
{
uint32 flags;
-} GISTPageOpaqueData;
+} GISTPageOpaqueData;
typedef GISTPageOpaqueData *GISTPageOpaque;
@@ -67,7 +67,7 @@ typedef struct GISTSTACK
struct GISTSTACK *gs_parent;
OffsetNumber gs_child;
BlockNumber gs_blk;
-} GISTSTACK;
+} GISTSTACK;
typedef struct GISTSTATE
{
@@ -80,7 +80,7 @@ typedef struct GISTSTATE
func_ptr equalFn;
bool haskeytype;
bool keytypbyval;
-} GISTSTATE;
+} GISTSTATE;
/*
@@ -94,7 +94,7 @@ typedef struct GISTScanOpaqueData
struct GISTSTACK *s_markstk;
uint16 s_flags;
struct GISTSTATE *giststate;
-} GISTScanOpaqueData;
+} GISTScanOpaqueData;
typedef GISTScanOpaqueData *GISTScanOpaque;
@@ -134,7 +134,7 @@ typedef struct GIST_SPLITVEC
OffsetNumber *spl_right; /* array of entries that go right */
int spl_nright; /* size of the array */
char *spl_rdatum; /* Union of keys in spl_right */
-} GIST_SPLITVEC;
+} GIST_SPLITVEC;
/*
** An entry on a GiST node. Contains the key (pred), as well as
@@ -150,7 +150,7 @@ typedef struct GISTENTRY
OffsetNumber offset;
int bytes;
bool leafkey;
-} GISTENTRY;
+} GISTENTRY;
/*
** macro to initialize a GISTENTRY
@@ -172,7 +172,7 @@ typedef struct txtrange
int32 vl_len;
int32 flag;
char bytes[2];
-} TXTRANGE;
+} TXTRANGE;
typedef struct intrange
{
@@ -184,23 +184,23 @@ typedef struct intrange
* upper is positive infinity. 0 means that both are numbers.
*/
int flag;
-} INTRANGE;
+} INTRANGE;
extern void
gistbuild(Relation heap,
Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat,
- uint16 pint, Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo);
-extern InsertIndexResult
-gistinsert(Relation r, Datum * datum,
+ uint16 pint, Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo);
+extern InsertIndexResult
+gistinsert(Relation r, Datum *datum,
char *nulls, ItemPointer ht_ctid, Relation heapRel);
extern void _gistdump(Relation r);
-extern void gistfreestack(GISTSTACK * s);
-extern void initGISTstate(GISTSTATE * giststate, Relation index);
+extern void gistfreestack(GISTSTACK *s);
+extern void initGISTstate(GISTSTATE *giststate, Relation index);
extern void
-gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr,
+gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
Relation r, Page pg, OffsetNumber o, int b, bool l);
extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure);
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index a5a5f7821986fbde464ca954bafea232d35ec712..071238bd17328012f7241cdcac2759c256a69085 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -16,7 +16,7 @@
#include <storage/block.h>
#include <utils/rel.h>
-extern IndexScanDesc
+extern IndexScanDesc
gistbeginscan(Relation r, bool fromEnd,
uint16 nkeys, ScanKey key);
extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 42bdf847aefc7643569f27b4aa7ebaae92aa028d..1007dd3ec2623eb398b9261fd362f5f2930c8f24 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -15,7 +15,7 @@
#include <access/strat.h>
#include <utils/rel.h>
-extern StrategyNumber
+extern StrategyNumber
RelationGetGISTStrategy(Relation r,
AttrNumber attnum, RegProcedure proc);
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 7d45a7e5b920aa0916f1772cff86d2913ff242de..43d188245d6154a7644e1a6b83c482b5f1c21f73 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hash.h,v 1.10 1997/09/08 20:58:02 momjian Exp $
+ * $Id: hash.h,v 1.11 1997/09/08 21:50:44 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -82,7 +82,7 @@ typedef struct HashPageOpaqueData
OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */
BlockNumber hasho_nextblkno;/* next ovfl blkno */
BlockNumber hasho_prevblkno;/* previous ovfl (or bucket) blkno */
-} HashPageOpaqueData;
+} HashPageOpaqueData;
typedef HashPageOpaqueData *HashPageOpaque;
@@ -98,7 +98,7 @@ typedef struct HashScanOpaqueData
{
Buffer hashso_curbuf;
Buffer hashso_mrkbuf;
-} HashScanOpaqueData;
+} HashScanOpaqueData;
typedef HashScanOpaqueData *HashScanOpaque;
@@ -160,7 +160,7 @@ typedef struct HashMetaPageData
* splitpoints */
BlockNumber hashm_mapp[NCACHED]; /* blknumbers of ovfl page maps */
RegProcedure hashm_procid; /* hash procedure id from pg_proc */
-} HashMetaPageData;
+} HashMetaPageData;
typedef HashMetaPageData *HashMetaPage;
@@ -180,7 +180,7 @@ extern bool BuildingHash;
typedef struct HashItemData
{
IndexTupleData hash_itup;
-} HashItemData;
+} HashItemData;
typedef HashItemData *HashItem;
@@ -251,9 +251,9 @@ typedef HashItemData *HashItem;
extern void
hashbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
- Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern InsertIndexResult
-hashinsert(Relation rel, Datum * datum, char *nulls,
+ Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
+extern InsertIndexResult
+hashinsert(Relation rel, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
extern char *
@@ -277,7 +277,7 @@ extern uint32 hashchar4(uint32 intkey);
extern uint32 hashchar8(char *key);
extern uint32 hashchar16(char *key);
extern uint32 hashtext(struct varlena * key);
-extern uint32 hashname(NameData * n);
+extern uint32 hashname(NameData *n);
/* private routines */
@@ -288,7 +288,7 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
/* hashovfl.c */
extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf);
extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf);
-extern int32
+extern int32
_hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
int32 nbits, int32 ndx);
extern void
@@ -302,7 +302,7 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
extern void _hash_relbuf(Relation rel, Buffer buf, int access);
extern void _hash_wrtbuf(Relation rel, Buffer buf);
extern void _hash_wrtnorelbuf(Relation rel, Buffer buf);
-extern Page
+extern Page
_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
int to_access);
extern void _hash_pageinit(Page page, Size size);
@@ -322,13 +322,13 @@ _hash_search(Relation rel, int keysz, ScanKey scankey,
Buffer *bufP, HashMetaPage metap);
extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
-extern bool
+extern bool
_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
Buffer metabuf);
/* hashutil.c */
-extern ScanKey
+extern ScanKey
_hash_mkscankey(Relation rel, IndexTuple itup,
HashMetaPage metap);
extern void _hash_freeskey(ScanKey skey);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index d3e2ae5bbe8bc3bbd991ad4a667cc06f6766fe28..c30e4405bfa9dd68b407c5f6ab075d9a412371f0 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.14 1997/09/08 20:58:03 momjian Exp $
+ * $Id: heapam.h,v 1.15 1997/09/08 21:50:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -72,7 +72,7 @@ typedef struct HeapAccessStatisticsData
int local_heapgettup;
int local_RelationPutHeapTuple;
int local_RelationPutLongHeapTuple;
-} HeapAccessStatisticsData;
+} HeapAccessStatisticsData;
typedef HeapAccessStatisticsData *HeapAccessStatistics;
@@ -117,13 +117,13 @@ extern void doinsert(Relation relation, HeapTuple tup);
extern Relation heap_open(Oid relationId);
extern Relation heap_openr(char *relationName);
extern void heap_close(Relation relation);
-extern HeapScanDesc
+extern HeapScanDesc
heap_beginscan(Relation relation, int atend,
TimeQual timeQual, unsigned nkeys, ScanKey key);
extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key);
extern void heap_endscan(HeapScanDesc sdesc);
extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
-extern HeapTuple
+extern HeapTuple
heap_fetch(Relation relation, TimeQual timeQual,
ItemPointer tid, Buffer *b);
extern Oid heap_insert(Relation relation, HeapTuple tup);
@@ -139,19 +139,19 @@ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
extern void
DataFill(char *data, TupleDesc tupleDesc,
Datum value[], char nulls[], char *infomask,
- bits8 * bit);
+ bits8 *bit);
extern int heap_attisnull(HeapTuple tup, int attnum);
extern int heap_sysattrlen(AttrNumber attno);
extern bool heap_sysattrbyval(AttrNumber attno);
extern char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
extern char *
fastgetattr(HeapTuple tup, int attnum,
- TupleDesc att, bool * isnull);
+ TupleDesc att, bool *isnull);
extern HeapTuple heap_copytuple(HeapTuple tuple);
-extern HeapTuple
+extern HeapTuple
heap_formtuple(TupleDesc tupleDescriptor,
Datum value[], char nulls[]);
-extern HeapTuple
+extern HeapTuple
heap_modifytuple(HeapTuple tuple, Buffer buffer,
Relation relation, Datum replValue[], char replNull[], char repl[]);
HeapTuple heap_addheader(uint32 natts, int structlen, char *structure);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 3b6b32b98f9e3d56bb9aa2330d35fbd42a8b66d7..0b6653f3865a584ef97218930bac7deb3bd9d270 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: htup.h,v 1.5 1997/09/08 02:34:12 momjian Exp $
+ * $Id: htup.h,v 1.6 1997/09/08 21:50:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,7 +58,7 @@ typedef struct HeapTupleData
/* bit map of domains */
/* MORE DATA FOLLOWS AT END OF STRUCT */
-} HeapTupleData;
+} HeapTupleData;
typedef HeapTupleData *HeapTuple;
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 6b1bc08dce14b2d453360526e6b0df86935326b8..5e96f7950583fed975c3e9dea3532e9e261124c3 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ibit.h,v 1.6 1997/09/08 02:34:13 momjian Exp $
+ * $Id: ibit.h,v 1.7 1997/09/08 21:50:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@ typedef struct IndexAttributeBitMapData
{
char bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
/ MaxBitsPerByte];
-} IndexAttributeBitMapData;
+} IndexAttributeBitMapData;
typedef IndexAttributeBitMapData *IndexAttributeBitMap;
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index 20fc9ecee3ef5ef57ff0e021a98e031dc41851f6..eb9a68193fb98c17fd212a8559fc521488608b57 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: iqual.h,v 1.6 1997/09/08 02:34:14 momjian Exp $
+ * $Id: iqual.h,v 1.7 1997/09/08 21:50:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
extern int NIndexTupleProcessed;
-extern bool
+extern bool
index_keytest(IndexTuple tuple, TupleDesc tupdesc,
int scanKeySize, ScanKey key);
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index fa1ea6396f646bf0bdfb2175cd21d61612679e10..55363a268db1f2f4a531a64049e7322b9cb45b70 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: istrat.h,v 1.7 1997/09/08 02:34:15 momjian Exp $
+ * $Id: istrat.h,v 1.8 1997/09/08 21:50:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,24 +47,24 @@
*/
#define IndexStrategyIsValid(s) PointerIsValid(s)
-extern StrategyMap
+extern StrategyMap
IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
StrategyNumber maxStrategyNum, AttrNumber attrNum);
-extern Size
+extern Size
AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
StrategyNumber maxStrategyNumber);
-extern StrategyNumber
+extern StrategyNumber
RelationGetStrategy(Relation relation,
AttrNumber attributeNumber, StrategyEvaluation evaluation,
RegProcedure procedure);
-extern bool
+extern bool
RelationInvokeStrategy(Relation relation,
StrategyEvaluation evaluation, AttrNumber attributeNumber,
StrategyNumber strategy, Datum left, Datum right);
extern void
IndexSupportInitialize(IndexStrategy indexStrategy,
- RegProcedure * indexSupport, Oid indexObjectId,
+ RegProcedure *indexSupport, Oid indexObjectId,
Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber);
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 0924982251854cb5aa56f614254c37e0007374ea..a1581133bfed9772ffdbfbd6cc204c10bf56fff8 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: itup.h,v 1.7 1997/09/08 02:34:16 momjian Exp $
+ * $Id: itup.h,v 1.8 1997/09/08 21:50:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@ typedef struct IndexTupleData
* IndexInfoFindDataOffset() for the reason.
*/
-} IndexTupleData; /* MORE DATA FOLLOWS AT END OF STRUCT */
+} IndexTupleData; /* MORE DATA FOLLOWS AT END OF STRUCT */
typedef IndexTupleData *IndexTuple;
@@ -45,7 +45,7 @@ typedef IndexTupleData *IndexTuple;
typedef struct InsertIndexResultData
{
ItemPointerData pointerData;
-} InsertIndexResultData;
+} InsertIndexResultData;
typedef InsertIndexResultData *InsertIndexResult;
@@ -54,7 +54,7 @@ typedef struct RetrieveIndexResultData
{
ItemPointerData index_iptr;
ItemPointerData heap_iptr;
-} RetrieveIndexResultData;
+} RetrieveIndexResultData;
typedef RetrieveIndexResultData *RetrieveIndexResult;
@@ -68,7 +68,7 @@ typedef struct PredInfo
{
Node *pred;
Node *oldPred;
-} PredInfo;
+} PredInfo;
/* ----------------
@@ -89,16 +89,16 @@ typedef struct PredInfo
/* indextuple.h */
-extern IndexTuple
+extern IndexTuple
index_formtuple(TupleDesc tupleDescriptor,
Datum value[], char null[]);
-extern Datum
+extern Datum
index_getattr(IndexTuple tuple, AttrNumber attNum,
- TupleDesc tupDesc, bool * isNullOutP);
-extern RetrieveIndexResult
+ TupleDesc tupDesc, bool *isNullOutP);
+extern RetrieveIndexResult
FormRetrieveIndexResult(ItemPointer indexItemPointer,
ItemPointer heapItemPointer);
-extern void CopyIndexTuple(IndexTuple source, IndexTuple * target);
+extern void CopyIndexTuple(IndexTuple source, IndexTuple *target);
#endif /* ITUP_H */
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index e902bbf228b6b4705069a0441f6827e89df2e2f5..83388819610987b2c19a2df89e31a10efedf8314 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nbtree.h,v 1.17 1997/09/08 20:58:09 momjian Exp $
+ * $Id: nbtree.h,v 1.18 1997/09/08 21:50:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -213,12 +213,12 @@ typedef struct BTPageState
/*
* prototypes for functions in nbtinsert.c
*/
-extern InsertIndexResult
+extern InsertIndexResult
_bt_doinsert(Relation rel, BTItem btitem,
bool index_is_unique, Relation heapRel);
/* default is to allow duplicates */
-extern bool
+extern bool
_bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2,
StrategyNumber strat);
@@ -244,9 +244,9 @@ extern bool BuildingBtree; /* in nbtree.c */
extern void
btbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
- Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
-extern InsertIndexResult
-btinsert(Relation rel, Datum * datum, char *nulls,
+ Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
+extern InsertIndexResult
+btinsert(Relation rel, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *btgettuple(IndexScanDesc scan, ScanDirection dir);
extern char *
@@ -276,10 +276,10 @@ _bt_search(Relation rel, int keysz, ScanKey scankey,
extern Buffer
_bt_moveright(Relation rel, Buffer buf, int keysz,
ScanKey scankey, int access);
-extern bool
+extern bool
_bt_skeycmp(Relation rel, Size keysz, ScanKey scankey,
Page page, ItemId itemid, StrategyNumber strat);
-extern OffsetNumber
+extern OffsetNumber
_bt_binsrch(Relation rel, Buffer buf, int keysz,
ScanKey scankey, int srchtype);
extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir);
@@ -289,10 +289,10 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
/*
* prototypes for functions in nbtstrat.c
*/
-extern StrategyNumber
+extern StrategyNumber
_bt_getstrat(Relation rel, AttrNumber attno,
RegProcedure proc);
-extern bool
+extern bool
_bt_invokestrat(Relation rel, AttrNumber attno,
StrategyNumber strat, Datum left, Datum right);
@@ -303,7 +303,7 @@ extern ScanKey _bt_mkscankey(Relation rel, IndexTuple itup);
extern void _bt_freeskey(ScanKey skey);
extern void _bt_freestack(BTStack stack);
extern void _bt_orderkeys(Relation relation, BTScanOpaque so);
-extern bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size * keysok);
+extern bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok);
extern BTItem _bt_formitem(IndexTuple itup);
/*
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index c4270c433ed0d4bb0dbe63a74354a0dcd0cb4b6f..8b2eb5ed0d0914fe2e6d0e888056a8c34e5f1e38 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: relscan.h,v 1.7 1997/09/08 02:34:22 momjian Exp $
+ * $Id: relscan.h,v 1.8 1997/09/08 21:50:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@ typedef struct HeapScanDescData
uint16 rs_cdelta; /* current delta in chain */
uint16 rs_nkeys; /* number of attributes in keys */
ScanKey rs_key; /* key descriptors */
-} HeapScanDescData;
+} HeapScanDescData;
typedef HeapScanDescData *HeapScanDesc;
@@ -55,7 +55,7 @@ typedef struct IndexScanDescData
bool scanFromEnd; /* restart scan at end? */
uint16 numberOfKeys; /* number of key attributes */
ScanKey keyData; /* key descriptor */
-} IndexScanDescData;
+} IndexScanDescData;
typedef IndexScanDescData *IndexScanDesc;
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 57ceffd03cde3bbb9bdc9496a4acbd746c4b57a6..a6998aff4fa3146606ca64bc77b17ba47132fbc9 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rtree.h,v 1.9 1997/09/08 20:58:11 momjian Exp $
+ * $Id: rtree.h,v 1.10 1997/09/08 21:50:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,7 +43,7 @@
typedef struct RTreePageOpaqueData
{
uint32 flags;
-} RTreePageOpaqueData;
+} RTreePageOpaqueData;
typedef RTreePageOpaqueData *RTreePageOpaque;
@@ -56,7 +56,7 @@ typedef struct RTSTACK
struct RTSTACK *rts_parent;
OffsetNumber rts_child;
BlockNumber rts_blk;
-} RTSTACK;
+} RTSTACK;
/*
* When we're doing a scan, we need to keep track of the parent stack
@@ -75,7 +75,7 @@ typedef struct RTreeScanOpaqueData
uint16 s_flags;
uint16 s_internalNKey;
ScanKey s_internalKey;
-} RTreeScanOpaqueData;
+} RTreeScanOpaqueData;
typedef RTreeScanOpaqueData *RTreeScanOpaque;
@@ -105,7 +105,7 @@ typedef RTreeScanOpaqueData *RTreeScanOpaque;
#define RTOP_SPLIT 1
/* defined in rtree.c */
-extern void freestack(RTSTACK * s);
+extern void freestack(RTSTACK *s);
/* rget.c */
extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
@@ -114,13 +114,13 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
* RTree code.
* Defined in access/index-rtree/
*/
-extern InsertIndexResult
-rtinsert(Relation r, Datum * datum, char *nulls,
+extern InsertIndexResult
+rtinsert(Relation r, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *rtdelete(Relation r, ItemPointer tid);
extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
-extern IndexScanDesc
+extern IndexScanDesc
rtbeginscan(Relation r, bool fromEnd, uint16 nkeys,
ScanKey key);
@@ -131,7 +131,7 @@ extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
extern void
rtbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
- Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo);
+ Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
extern void _rtdump(Relation r);
/* rtscan.c */
@@ -140,7 +140,7 @@ rtadjscans(Relation r, int op, BlockNumber blkno,
OffsetNumber offnum);
/* rtstrat.h */
-extern RegProcedure
+extern RegProcedure
RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index e03cc42acbaa3308e04cc792088d68a2ddf8683e..2036ffd6ecdfebf679e3952cf5c6e7eb66619a7e 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,13 +6,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rtstrat.h,v 1.3 1997/09/08 02:34:25 momjian Exp $
+ * $Id: rtstrat.h,v 1.4 1997/09/08 21:50:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef RTSTRAT_H
-extern RegProcedure
+extern RegProcedure
RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 3de53f899647b473998efd66986f3137845e4118..f40efc1e5b4472942aaf5298ec93ff5920a7315c 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: skey.h,v 1.5 1997/09/08 02:34:26 momjian Exp $
+ * $Id: skey.h,v 1.6 1997/09/08 21:51:01 momjian Exp $
*
*
* Note:
@@ -26,7 +26,7 @@ typedef struct ScanKeyData
func_ptr sk_func;
int32 sk_nargs;
Datum sk_argument; /* data to compare */
-} ScanKeyData;
+} ScanKeyData;
typedef ScanKeyData *ScanKey;
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index be8436790ab856b2a5d55aabc61f7758265b94c4..0ad737b36ce005289aa9b6937c80f24b1aeaca47 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: strat.h,v 1.7 1997/09/08 20:58:12 momjian Exp $
+ * $Id: strat.h,v 1.8 1997/09/08 21:51:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,11 +23,12 @@ typedef uint16 StrategyNumber;
typedef struct StrategyTransformMapData
{
StrategyNumber strategy[1]; /* VARIABLE LENGTH ARRAY */
-} StrategyTransformMapData; /* VARIABLE LENGTH
+} StrategyTransformMapData; /* VARIABLE LENGTH
- *
- *
- * STRUCTURE */
+ *
+ *
+ *
+ * STRUCTURE */
typedef StrategyTransformMapData *StrategyTransformMap;
@@ -35,7 +36,7 @@ typedef struct StrategyOperatorData
{
StrategyNumber strategy;
bits16 flags; /* scan qualification flags h/skey.h */
-} StrategyOperatorData;
+} StrategyOperatorData;
typedef StrategyOperatorData *StrategyOperator;
@@ -43,14 +44,14 @@ typedef struct StrategyTermData
{ /* conjunctive term */
uint16 degree;
StrategyOperatorData operatorData[1]; /* VARIABLE LENGTH */
-} StrategyTermData; /* VARIABLE LENGTH STRUCTURE */
+} StrategyTermData; /* VARIABLE LENGTH STRUCTURE */
typedef StrategyTermData *StrategyTerm;
typedef struct StrategyExpressionData
{ /* disjunctive normal form */
StrategyTerm term[1]; /* VARIABLE LENGTH ARRAY */
-} StrategyExpressionData; /* VARIABLE LENGTH STRUCTURE */
+} StrategyExpressionData; /* VARIABLE LENGTH STRUCTURE */
typedef StrategyExpressionData *StrategyExpression;
@@ -61,7 +62,7 @@ typedef struct StrategyEvaluationData
StrategyTransformMap commuteTransform;
StrategyTransformMap negateCommuteTransform;
StrategyExpression expression[12]; /* XXX VARIABLE LENGTH */
-} StrategyEvaluationData; /* VARIABLE LENGTH STRUCTURE */
+} StrategyEvaluationData; /* VARIABLE LENGTH STRUCTURE */
typedef StrategyEvaluationData *StrategyEvaluation;
@@ -81,14 +82,14 @@ typedef StrategyEvaluationData *StrategyEvaluation;
typedef struct StrategyMapData
{
ScanKeyData entry[1]; /* VARIABLE LENGTH ARRAY */
-} StrategyMapData; /* VARIABLE LENGTH STRUCTURE */
+} StrategyMapData; /* VARIABLE LENGTH STRUCTURE */
typedef StrategyMapData *StrategyMap;
typedef struct IndexStrategyData
{
StrategyMapData strategyMapData[1]; /* VARIABLE LENGTH ARRAY */
-} IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */
+} IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */
typedef IndexStrategyData *IndexStrategy;
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index db95804e16e072cb902dcf2d259cb12f4597c387..efb6e824a7ab82cb942775c35bc96e33c47d510e 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: transam.h,v 1.10 1997/09/08 20:58:12 momjian Exp $
+ * $Id: transam.h,v 1.11 1997/09/08 21:51:03 momjian Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -86,7 +86,7 @@ typedef unsigned char XidStatus;/* (2 bits) */
typedef struct LogRelationContentsData
{
int TransSystemVersion;
-} LogRelationContentsData;
+} LogRelationContentsData;
typedef LogRelationContentsData *LogRelationContents;
@@ -105,7 +105,7 @@ typedef LogRelationContentsData *LogRelationContents;
typedef struct TimeRelationContentsData
{
int TransSystemVersion;
-} TimeRelationContentsData;
+} TimeRelationContentsData;
typedef TimeRelationContentsData *TimeRelationContents;
@@ -131,7 +131,7 @@ typedef struct VariableRelationContentsData
TransactionId nextXidData;
TransactionId lastXidData;
Oid nextOid;
-} VariableRelationContentsData;
+} VariableRelationContentsData;
typedef VariableRelationContentsData *VariableRelationContents;
@@ -155,26 +155,26 @@ extern void AmiTransactionOverride(bool flag);
extern void
TransComputeBlockNumber(Relation relation,
TransactionId transactionId, BlockNumber *blockNumberOutP);
-extern XidStatus
+extern XidStatus
TransBlockNumberGetXidStatus(Relation relation,
- BlockNumber blockNumber, TransactionId xid, bool * failP);
+ BlockNumber blockNumber, TransactionId xid, bool *failP);
extern void
TransBlockNumberSetXidStatus(Relation relation,
BlockNumber blockNumber, TransactionId xid, XidStatus xstatus,
- bool * failP);
+ bool *failP);
extern AbsoluteTime
TransBlockNumberGetCommitTime(Relation relation,
- BlockNumber blockNumber, TransactionId xid, bool * failP);
+ BlockNumber blockNumber, TransactionId xid, bool *failP);
extern void
TransBlockNumberSetCommitTime(Relation relation,
BlockNumber blockNumber, TransactionId xid, AbsoluteTime xtime,
- bool * failP);
+ bool *failP);
/* in transam/varsup.c */
extern void VariableRelationPutNextXid(TransactionId xid);
-extern void GetNewTransactionId(TransactionId * xid);
+extern void GetNewTransactionId(TransactionId *xid);
extern void UpdateLastCommittedXid(TransactionId xid);
-extern void GetNewObjectId(Oid * oid_return);
+extern void GetNewObjectId(Oid *oid_return);
extern void CheckMaxObjectId(Oid assigned_oid);
/* ----------------
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index fe7939119c96da78b792f8caeee8241b640353ca..3b13dcde9105533c78292d50b95fd5894bcce331 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupdesc.h,v 1.11 1997/09/08 20:58:13 momjian Exp $
+ * $Id: tupdesc.h,v 1.12 1997/09/08 21:51:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@ typedef struct constrCheck
char *ccname;
char *ccbin;
char *ccsrc;
-} ConstrCheck;
+} ConstrCheck;
/* This structure contains constraints of a tuple */
typedef struct tupleConstr
@@ -40,7 +40,7 @@ typedef struct tupleConstr
uint16 num_defval;
uint16 num_check;
bool has_not_null;
-} TupleConstr;
+} TupleConstr;
/*
* This structure contains all information (i.e. from Classes
@@ -65,7 +65,7 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc);
extern void FreeTupleDesc(TupleDesc tupdesc);
-extern bool
+extern bool
TupleDescInitEntry(TupleDesc desc,
AttrNumber attributeNumber,
char *attributeName,
@@ -73,6 +73,6 @@ TupleDescInitEntry(TupleDesc desc,
int attdim,
bool attisset);
-extern TupleDesc BuildDescForRelation(List * schema, char *relname);
+extern TupleDesc BuildDescForRelation(List *schema, char *relname);
#endif /* TUPDESC_H */
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 58d1eb56429607fbab8e0508e27dd0cbddf4026d..7b047d66d689a5954da8df992f23984bac713679 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: valid.h,v 1.6 1997/09/08 02:34:32 momjian Exp $
+ * $Id: valid.h,v 1.7 1997/09/08 21:51:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,11 +22,11 @@
* ----------------
*/
-extern bool
+extern bool
heap_keytest(HeapTuple t, TupleDesc tupdesc,
int nkeys, ScanKey keys);
-extern HeapTuple
+extern HeapTuple
heap_tuple_satisfies(ItemId itemId, Relation relation,
Buffer buffer, PageHeader disk_page,
TimeQual qual, int nKeys,
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 69aea57ff11a8f7d4df1ffbcefecd9f90d9dc9d5..67f594253617c2af6316c65847efa716443db5c0 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: xact.h,v 1.8 1997/09/08 02:34:33 momjian Exp $
+ * $Id: xact.h,v 1.9 1997/09/08 21:51:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@ typedef struct TransactionStateData
AbsoluteTime startTime;
int state;
int blockState;
-} TransactionStateData;
+} TransactionStateData;
/* ----------------
* transaction states
@@ -89,12 +89,12 @@ extern TransactionId xidin(char *representation);
extern char *xidout(TransactionId transactionId);
extern bool xideq(TransactionId xid1, TransactionId xid2);
extern bool TransactionIdIsValid(TransactionId transactionId);
-extern void StoreInvalidTransactionId(TransactionId * destination);
+extern void StoreInvalidTransactionId(TransactionId *destination);
extern void
TransactionIdStore(TransactionId transactionId,
- TransactionId * destination);
+ TransactionId *destination);
extern bool TransactionIdEquals(TransactionId id1, TransactionId id2);
extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
-extern void TransactionIdAdd(TransactionId * xid, int value);
+extern void TransactionIdAdd(TransactionId *xid, int value);
#endif /* XACT_H */
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 463709ed228cd0eddac60764ff60458ab19bf65d..f025c4db03a7ab5b7e814a61e1358903d6d3c67e 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bootstrap.h,v 1.8 1997/09/08 20:58:15 momjian Exp $
+ * $Id: bootstrap.h,v 1.9 1997/09/08 21:51:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@ typedef struct hashnode
{
int strnum; /* Index into string table */
struct hashnode *next;
-} hashnode;
+} hashnode;
#define EMITPROMPT printf("> ")
@@ -39,9 +39,9 @@ index_register(char *heap,
int natts,
AttrNumber *attnos,
uint16 nparams,
- Datum * params,
- FuncIndexInfo * finfo,
- PredInfo * predInfo);
+ Datum *params,
+ FuncIndexInfo *finfo,
+ PredInfo *predInfo);
extern void err_out(void);
extern void InsertOneTuple(Oid objectid);
diff --git a/src/include/c.h b/src/include/c.h
index bb5ec57db3cf18f624e0746b345b5c9580e72932..05c3cc5e923876b09ecb492eba3ee7b59d16f5cb 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.18 1997/09/08 02:33:49 momjian Exp $
+ * $Id: c.h,v 1.19 1997/09/08 21:50:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -277,7 +277,7 @@ typedef unsigned int Index;
typedef struct
{
int indx[MAXDIM];
-} IntArray;
+} IntArray;
/*
* Offset --
@@ -568,7 +568,7 @@ typedef char *ExcMessage;
typedef struct Exception
{
ExcMessage message;
-} Exception;
+} Exception;
/*
* NO_ASSERT_CHECKING, if defined, turns off all the assertions.
@@ -704,7 +704,7 @@ extern Exception BadState;
/* in utils/error/assert.c */
extern int
ExceptionalCondition(char *conditionName,
- Exception * exceptionP, char *details,
+ Exception *exceptionP, char *details,
char *fileName, int lineNumber);
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index c16ec918dde4c5097e688ba9d5eff6f012f9464c..d96a75a0e61d0d08f4228c84d8bc7cb2ebb52b3d 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heap.h,v 1.6 1997/09/08 02:34:50 momjian Exp $
+ * $Id: heap.h,v 1.7 1997/09/08 21:51:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
extern Relation heap_creatr(char *relname, unsigned smgr, TupleDesc att);
-extern Oid
+extern Oid
heap_create(char relname[],
char *typename,
int arch,
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index d85e30535ec01218d3440eff5e98864b73d8cead..d176a72ded02b906a4811d29324d2f374c75e92d 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: index.h,v 1.7 1997/09/08 02:34:52 momjian Exp $
+ * $Id: index.h,v 1.8 1997/09/08 21:51:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,11 +18,11 @@
#include <access/itup.h>
#include <access/funcindex.h>
-extern Form_pg_am
+extern Form_pg_am
AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
extern void
- UpdateIndexPredicate(Oid indexoid, Node * oldPred, Node * predicate);
+ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate);
extern void
InitIndexStrategy(int numatts,
@@ -32,15 +32,15 @@ InitIndexStrategy(int numatts,
extern void
index_create(char *heapRelationName,
char *indexRelationName,
- FuncIndexInfo * funcInfo,
- List * attributeList,
+ FuncIndexInfo *funcInfo,
+ List *attributeList,
Oid accessMethodObjectId,
int numatts,
AttrNumber attNums[],
Oid classObjectId[],
uint16 parameterCount,
- Datum * parameter,
- Node * predicate,
+ Datum *parameter,
+ Node *predicate,
bool islossy,
bool unique);
@@ -49,20 +49,20 @@ extern void index_destroy(Oid indexId);
extern void
FormIndexDatum(int numberOfAttributes,
AttrNumber attributeNumber[], HeapTuple heapTuple,
- TupleDesc heapDescriptor, Buffer buffer, Datum * datum,
+ TupleDesc heapDescriptor, Buffer buffer, Datum *datum,
char *nullv, FuncIndexInfoPtr fInfo);
extern void UpdateStats(Oid relid, long reltuples, bool hasindex);
extern void
-FillDummyExprContext(ExprContext * econtext, TupleTableSlot * slot,
+FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot,
TupleDesc tupdesc, Buffer buffer);
extern void
index_build(Relation heapRelation, Relation indexRelation,
int numberOfAttributes, AttrNumber attributeNumber[],
- uint16 parameterCount, Datum * parameter, FuncIndexInfo * funcInfo,
- PredInfo * predInfo);
+ uint16 parameterCount, Datum *parameter, FuncIndexInfo *funcInfo,
+ PredInfo *predInfo);
extern bool IndexIsUnique(Oid indexId);
extern bool IndexIsUniqueNoCache(Oid indexId);
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 664249ccbcb509a7e773b19c060baed0699eb5ef..7897d570e9e719221002da2a2dd5cc4d576beb4a 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: indexing.h,v 1.6 1997/09/08 02:34:53 momjian Exp $
+ * $Id: indexing.h,v 1.7 1997/09/08 21:51:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -62,28 +62,28 @@ extern char *IndexedCatalogNames[];
* Functions for each index to perform the necessary scan on a cache miss.
*/
extern void CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]);
-extern void CatalogCloseIndices(int nIndices, Relation * idescs);
+extern void CatalogCloseIndices(int nIndices, Relation *idescs);
extern void
-CatalogIndexInsert(Relation * idescs,
+CatalogIndexInsert(Relation *idescs,
int nIndices,
Relation heapRelation,
HeapTuple heapTuple);
extern bool CatalogHasIndex(char *catName, Oid catId);
-extern HeapTuple
+extern HeapTuple
AttributeNameIndexScan(Relation heapRelation,
Oid relid,
char *attname);
-extern HeapTuple
+extern HeapTuple
AttributeNumIndexScan(Relation heapRelation,
Oid relid,
AttrNumber attnum);
extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId);
-extern HeapTuple
+extern HeapTuple
ProcedureNameIndexScan(Relation heapRelation,
- char *procName, int nargs, Oid * argTypes);
-extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text * procSrc);
+ char *procName, int nargs, Oid *argTypes);
+extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text *procSrc);
extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId);
extern HeapTuple TypeNameIndexScan(Relation heapRelation, char *typeName);
extern HeapTuple ClassNameIndexScan(Relation heapRelation, char *relName);
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 60b8cc423025d72900f5a8f605282ca0ca311b5f..c95e24663f48523fd364d28a2d9a4815f2def039 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_aggregate.h,v 1.10 1997/09/08 02:34:54 momjian Exp $
+ * $Id: pg_aggregate.h,v 1.11 1997/09/08 21:51:27 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -141,6 +141,6 @@ AggregateCreate(char *aggName,
char *agginitval2);
extern char *
AggNameGetInitVal(char *aggName, Oid basetype,
- int xfuncno, bool * isNull);
+ int xfuncno, bool *isNull);
#endif /* PG_AGGREGATE_H */
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 2d08131cf22b29d3521ffa5e2588591ebb9079c6..7cfe1d027e7c1520d591e2727fc8ab2696f066c9 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.29 1997/09/08 02:35:23 momjian Exp $
+ * $Id: pg_proc.h,v 1.30 1997/09/08 21:51:29 momjian Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -1103,7 +1103,7 @@ DATA(insert OID = 1319 ( currval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 fo
/*
* prototypes for functions pg_proc.c
*/
-extern Oid
+extern Oid
ProcedureCreate(char *procedureName,
bool returnsSet,
char *returnTypeName,
@@ -1116,7 +1116,7 @@ ProcedureCreate(char *procedureName,
int32 perbyte_cpu,
int32 percall_cpu,
int32 outin_ratio,
- List * argList,
+ List *argList,
CommandDest dest);
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 650c1955fdcf154fab614b685616020335cfcd30..bbddb4da8ae97d6413a61359f3f16f0da0eb9905 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_type.h,v 1.18 1997/09/08 02:35:32 momjian Exp $
+ * $Id: pg_type.h,v 1.19 1997/09/08 21:51:31 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -326,9 +326,9 @@ DATA(insert OID = 1296 ( timestamp PGUID 4 19 t b t \054 0 0 timestamp_in time
/*
* prototypes for functions in pg_type.c
*/
-extern Oid TypeGet(char *typeName, bool * defined);
+extern Oid TypeGet(char *typeName, bool *defined);
extern Oid TypeShellMake(char *typeName);
-extern Oid
+extern Oid
TypeCreate(char *typeName,
Oid relationOid,
int16 internalSize,
diff --git a/src/include/commands/command.h b/src/include/commands/command.h
index 57b2ff6c783f2cd0b318435a6a1776ceb544fe7a..09b9b8bd573aa3d65e1824a30f53ddae0fa1e4f1 100644
--- a/src/include/commands/command.h
+++ b/src/include/commands/command.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: command.h,v 1.6 1997/09/08 02:35:42 momjian Exp $
+ * $Id: command.h,v 1.7 1997/09/08 21:51:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,6 +44,6 @@ extern void PortalCleanup(Portal portal);
*/
extern void
PerformAddAttribute(char *relationName, char *userName,
- bool inh, ColumnDef * colDef);
+ bool inh, ColumnDef *colDef);
#endif /* COMMAND_H */
diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h
index 11364a48627bf27653ea82430c9e090b179f0017..7d57290019dea11c68ce0122cf85b52f763c47f5 100644
--- a/src/include/commands/creatinh.h
+++ b/src/include/commands/creatinh.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: creatinh.h,v 1.3 1997/09/08 02:35:44 momjian Exp $
+ * $Id: creatinh.h,v 1.4 1997/09/08 21:51:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef CREATINH_H
#define CREATINH_H
-extern void DefineRelation(CreateStmt * stmt);
+extern void DefineRelation(CreateStmt *stmt);
extern void RemoveRelation(char *name);
extern char *MakeArchiveName(Oid relid);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 88003629d1d7073682e4c14652195f5f230edef4..1f6242444b0ab1c3894c2b8ba7c9178d28d08746 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: defrem.h,v 1.9 1997/09/08 02:35:47 momjian Exp $
+ * $Id: defrem.h,v 1.10 1997/09/08 21:51:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,30 +23,30 @@ extern void
DefineIndex(char *heapRelationName,
char *indexRelationName,
char *accessMethodName,
- List * attributeList,
- List * parameterList,
+ List *attributeList,
+ List *parameterList,
bool unique,
- Expr * predicate,
- List * rangetable);
+ Expr *predicate,
+ List *rangetable);
extern void
ExtendIndex(char *indexRelationName,
- Expr * predicate,
- List * rangetable);
+ Expr *predicate,
+ List *rangetable);
extern void RemoveIndex(char *name);
/*
* prototypes in define.c
*/
-extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest);
-extern void DefineOperator(char *name, List * parameters);
-extern void DefineAggregate(char *name, List * parameters);
-extern void DefineType(char *name, List * parameters);
-extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest);
+extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest);
+extern void DefineOperator(char *name, List *parameters);
+extern void DefineAggregate(char *name, List *parameters);
+extern void DefineType(char *name, List *parameters);
+extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest);
/*
* prototypes in remove.c
*/
-extern void RemoveFunction(char *functionName, int nargs, List * argNameList);
+extern void RemoveFunction(char *functionName, int nargs, List *argNameList);
extern void
RemoveOperator(char *operatorName,
char *typeName1, char *typeName2);
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 42aa7fd8d956a8a60141eb0a4ae0e9a85a01a979..b2880868cd2bdbf1a3bfb102dafa317f5f2dd865 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -5,13 +5,13 @@
*
* Copyright (c) 1994-5, Regents of the University of California
*
- * $Id: explain.h,v 1.4 1997/09/08 02:35:52 momjian Exp $
+ * $Id: explain.h,v 1.5 1997/09/08 21:51:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef EXPLAIN_H
#define EXPLAIN_H
-extern void ExplainQuery(Query * query, bool verbose, CommandDest dest);
+extern void ExplainQuery(Query *query, bool verbose, CommandDest dest);
#endif /* EXPLAIN_H */
diff --git a/src/include/commands/purge.h b/src/include/commands/purge.h
index de3f9c62a41c80c84ffba0fc3b834da762c0e0c6..aa63313c9e0b096a9b941e81a000889dad4bbfa3 100644
--- a/src/include/commands/purge.h
+++ b/src/include/commands/purge.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: purge.h,v 1.3 1997/09/08 02:35:53 momjian Exp $
+ * $Id: purge.h,v 1.4 1997/09/08 21:51:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PURGE_H
#define PURGE_H
-extern int32
+extern int32
RelationPurge(char *relationName,
char *absoluteTimeString,
char *relativeTimeString);
diff --git a/src/include/commands/recipe.h b/src/include/commands/recipe.h
index 5e0d5286eb9cb04e00fbbdc51651401ace966fec..246cf4eaca8b01ec6be7b273ba90e7a7cdee03af 100644
--- a/src/include/commands/recipe.h
+++ b/src/include/commands/recipe.h
@@ -5,13 +5,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: recipe.h,v 1.3 1997/09/08 02:35:56 momjian Exp $
+ * $Id: recipe.h,v 1.4 1997/09/08 21:51:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef RECIPE_H
#define RECIPE_H
-extern void beginRecipe(RecipeStmt * stmt);
+extern void beginRecipe(RecipeStmt *stmt);
#endif /* RECIPE_H */
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 54f0ecd6c27fd110c3967bf60be0c3cd92261b88..92dbd14a8e0067462623bcc107f9ab82e63b8928 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -25,7 +25,7 @@
#define SEQ_COL_FIRSTCOL SEQ_COL_NAME
#define SEQ_COL_LASTCOL SEQ_COL_CALLED
-extern void DefineSequence(CreateSeqStmt * stmt);
+extern void DefineSequence(CreateSeqStmt *stmt);
extern int4 nextval(struct varlena * seqname);
extern int4 currval(struct varlena * seqname);
extern void CloseSequences(void);
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 6ba0394fdf7a78fe38b00d6b409e5ffc682efcd7..55340d36d42c580c21356ec3f8ff87800e9a0eb6 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -22,7 +22,7 @@ typedef struct TriggerData
HeapTuple tg_trigtuple;
HeapTuple tg_newtuple;
Trigger *tg_trigger;
-} TriggerData;
+} TriggerData;
extern TriggerData *CurrentTriggerData;
@@ -58,8 +58,8 @@ extern TriggerData *CurrentTriggerData;
(!TRIGGER_FIRED_BEFORE (event))
-extern void CreateTrigger(CreateTrigStmt * stmt);
-extern void DropTrigger(DropTrigStmt * stmt);
+extern void CreateTrigger(CreateTrigStmt *stmt);
+extern void DropTrigger(DropTrigStmt *stmt);
extern void RelationRemoveTriggers(Relation rel);
extern HeapTuple ExecBRInsertTriggers(Relation rel, HeapTuple tuple);
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index d2a4565688a30d4d61eaf6791b53bf88c017007e..9068751d7ebfad3c51cbeff000401b1f09a2b4be 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: vacuum.h,v 1.9 1997/09/08 02:36:05 momjian Exp $
+ * $Id: vacuum.h,v 1.10 1997/09/08 21:51:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,7 @@ typedef struct VAttListData
{
int val_dummy;
struct VAttListData *val_next;
-} VAttListData;
+} VAttListData;
typedef VAttListData *VAttList;
@@ -31,7 +31,7 @@ typedef struct VPageDescrData
uint16 vpd_nusd; /* Number of OffNums used by vacuum */
uint16 vpd_noff; /* Number of OffNums free or to be free */
OffsetNumber vpd_voff[1]; /* Array of its OffNums */
-} VPageDescrData;
+} VPageDescrData;
typedef VPageDescrData *VPageDescr;
@@ -40,7 +40,7 @@ typedef struct VPageListData
int vpl_nemend; /* Number of "empty" end-pages */
int vpl_npages; /* Number of pages in vpl_pgdesc */
VPageDescr *vpl_pgdesc; /* Descriptions of pages */
-} VPageListData;
+} VPageListData;
typedef VPageListData *VPageList;
@@ -50,7 +50,7 @@ typedef struct
FuncIndexInfo *finfoP;
IndexTupleForm tform;
int natts;
-} IndDesc;
+} IndDesc;
typedef struct
{
@@ -78,13 +78,13 @@ typedef struct
f_cmpgt;
regproc outfunc;
bool initialized;
-} VacAttrStats;
+} VacAttrStats;
typedef struct VRelListData
{
Oid vrl_relid;
struct VRelListData *vrl_next;
-} VRelListData;
+} VRelListData;
typedef VRelListData *VRelList;
@@ -98,12 +98,12 @@ typedef struct VRelStats
bool hasindex;
int va_natts; /* number of attrs being analyzed */
VacAttrStats *vacattrstats;
-} VRelStats;
+} VRelStats;
extern bool VacuumRunning;
extern void vc_abort(void);
-extern void vacuum(char *vacrel, bool verbose, bool analyze, List * va_spec);
+extern void vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec);
#define ATTNVALS_SCALE 1000000000 /* XXX so it can act as a float4 */
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index f4190c1f0be8d8d501f4c853dfae80a9d2f6993d..2fc1bb3b8d3907950308e0f671e3c787ee300c99 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: view.h,v 1.3 1997/09/08 02:36:05 momjian Exp $
+ * $Id: view.h,v 1.4 1997/09/08 21:51:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define VIEW_H
extern char *MakeRetrieveViewRuleName(char *view_name);
-extern void DefineView(char *view_name, Query * view_parse);
+extern void DefineView(char *view_name, Query *view_parse);
extern void RemoveView(char *view_name);
#endif /* VIEW_H */
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index 3682f6319b59ba6984c11edda3a8bb6c540749e6..8dc8236e22e42f2fabe190b9bd760e4109c24163 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execFlatten.h,v 1.4 1997/09/08 02:36:08 momjian Exp $
+ * $Id: execFlatten.h,v 1.5 1997/09/08 21:51:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef EXECFLATTEN_H
#define EXECFLATTEN_H
-extern Datum ExecEvalIter(Iter * iterNode, ExprContext * econtext, bool * resultIsNull, bool * iterIsDone);
+extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone);
-extern void ExecEvalFjoin(TargetEntry * tlist, ExprContext * econtext, bool * isNullVect, bool * fj_isDone);
+extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone);
#endif /* EXECFLATTEN_H */
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index f97e196f4fe3c5b6aaa4103ba444397cfc37a8e1..b0c55737b9d173cbc989e683c79cd949fc7c8dad 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execdesc.h,v 1.5 1997/09/08 02:36:16 momjian Exp $
+ * $Id: execdesc.h,v 1.6 1997/09/08 21:51:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,11 +30,11 @@ typedef struct QueryDesc
Query *parsetree;
Plan *plantree;
CommandDest dest; /* the destination output of the execution */
-} QueryDesc;
+} QueryDesc;
/* in pquery.c */
extern QueryDesc *
-CreateQueryDesc(Query * parsetree, Plan * plantree,
+CreateQueryDesc(Query *parsetree, Plan *plantree,
CommandDest dest);
#endif /* EXECDESC_H */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index efa8dc3f01d60100fe2a0effc7a1054d3aecec7f..219984f17b8fc0d3db256fb4f64cfa92cfee2530 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: executor.h,v 1.12 1997/09/08 02:36:17 momjian Exp $
+ * $Id: executor.h,v 1.13 1997/09/08 21:51:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,41 +29,41 @@
extern void
ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
ScanDirection dir, TimeQual timeRange,
- Relation * returnRelation, Pointer * returnScanDesc);
-extern void ExecCloseR(Plan * node);
-extern void ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent);
-extern HeapScanDesc
+ Relation *returnRelation, Pointer *returnScanDesc);
+extern void ExecCloseR(Plan *node);
+extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent);
+extern HeapScanDesc
ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
ScanDirection direction, int nkeys, ScanKey skeys);
-extern void ExecMarkPos(Plan * node);
-extern void ExecRestrPos(Plan * node);
+extern void ExecMarkPos(Plan *node);
+extern void ExecRestrPos(Plan *node);
extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
/*
* prototypes from functions in execJunk.c
*/
-extern JunkFilter *ExecInitJunkFilter(List * targetList);
-extern bool
-ExecGetJunkAttribute(JunkFilter * junkfilter, TupleTableSlot * slot,
- char *attrName, Datum * value, bool * isNull);
-extern HeapTuple ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot);
+extern JunkFilter *ExecInitJunkFilter(List *targetList);
+extern bool
+ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
+ char *attrName, Datum *value, bool *isNull);
+extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
/*
* prototypes from functions in execMain.c
*/
-extern TupleDesc ExecutorStart(QueryDesc * queryDesc, EState * estate);
-extern TupleTableSlot *ExecutorRun(QueryDesc * queryDesc, EState * estate, int feature, int count);
-extern void ExecutorEnd(QueryDesc * queryDesc, EState * estate);
+extern TupleDesc ExecutorStart(QueryDesc *queryDesc, EState *estate);
+extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count);
+extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate);
extern HeapTuple ExecConstraints(char *caller, Relation rel, HeapTuple tuple);
/*
* prototypes from functions in execProcnode.c
*/
-extern bool ExecInitNode(Plan * node, EState * estate, Plan * parent);
-extern TupleTableSlot *ExecProcNode(Plan * node, Plan * parent);
-extern int ExecCountSlotsNode(Plan * node);
-extern void ExecEndNode(Plan * node, Plan * parent);
+extern bool ExecInitNode(Plan *node, EState *estate, Plan *parent);
+extern TupleTableSlot *ExecProcNode(Plan *node, Plan *parent);
+extern int ExecCountSlotsNode(Plan *node);
+extern void ExecEndNode(Plan *node, Plan *parent);
/*
* prototypes from functions in execQual.c
@@ -71,28 +71,28 @@ extern void ExecEndNode(Plan * node, Plan * parent);
extern bool execConstByVal;
extern int execConstLen;
-extern Datum
-ExecExtractResult(TupleTableSlot * slot, AttrNumber attnum,
- bool * isNull);
-extern Datum
-ExecEvalParam(Param * expression, ExprContext * econtext,
- bool * isNull);
+extern Datum
+ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
+ bool *isNull);
+extern Datum
+ExecEvalParam(Param *expression, ExprContext *econtext,
+ bool *isNull);
/* stop here */
extern char *
-GetAttributeByName(TupleTableSlot * slot, char *attname,
- bool * isNull);
-extern Datum
-ExecEvalExpr(Node * expression, ExprContext * econtext, bool * isNull,
- bool * isDone);
-extern bool ExecQual(List * qual, ExprContext * econtext);
-extern int ExecTargetListLength(List * targetlist);
-extern TupleTableSlot *ExecProject(ProjectionInfo * projInfo, bool * isDone);
+GetAttributeByName(TupleTableSlot *slot, char *attname,
+ bool *isNull);
+extern Datum
+ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
+ bool *isDone);
+extern bool ExecQual(List *qual, ExprContext *econtext);
+extern int ExecTargetListLength(List *targetlist);
+extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, bool *isDone);
/*
* prototypes from functions in execScan.c
*/
-extern TupleTableSlot *ExecScan(Scan * node, TupleTableSlot * (*accessMtd) ());
+extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
/*
* prototypes from functions in execTuples.c
@@ -102,65 +102,65 @@ extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree);
extern TupleTableSlot *ExecAllocTableSlot(TupleTable table);
extern TupleTableSlot *
ExecStoreTuple(HeapTuple tuple,
- TupleTableSlot * slot,
+ TupleTableSlot *slot,
Buffer buffer,
bool shouldFree);
-extern TupleTableSlot *ExecClearTuple(TupleTableSlot * slot);
-extern bool ExecSetSlotPolicy(TupleTableSlot * slot, bool shouldFree);
-extern TupleDesc
-ExecSetSlotDescriptor(TupleTableSlot * slot,
+extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
+extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
+extern TupleDesc
+ExecSetSlotDescriptor(TupleTableSlot *slot,
TupleDesc tupdesc);
-extern void ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, bool isNew);
-extern void ExecIncrSlotBufferRefcnt(TupleTableSlot * slot);
-extern bool TupIsNull(TupleTableSlot * slot);
-extern void ExecInitResultTupleSlot(EState * estate, CommonState * commonstate);
+extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
+extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot);
+extern bool TupIsNull(TupleTableSlot *slot);
+extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
extern void
-ExecInitScanTupleSlot(EState * estate,
- CommonScanState * commonscanstate);
-extern void ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate);
-extern void ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate);
+ExecInitScanTupleSlot(EState *estate,
+ CommonScanState *commonscanstate);
+extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
+extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
-extern TupleDesc ExecGetTupType(Plan * node);
-extern TupleDesc ExecTypeFromTL(List * targetList);
+extern TupleDesc ExecGetTupType(Plan *node);
+extern TupleDesc ExecTypeFromTL(List *targetList);
/*
* prototypes from functions in execTuples.c
*/
extern void ResetTupleCount(void);
extern void
-ExecAssignNodeBaseInfo(EState * estate, CommonState * basenode,
- Plan * parent);
-extern void ExecAssignExprContext(EState * estate, CommonState * commonstate);
+ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
+ Plan *parent);
+extern void ExecAssignExprContext(EState *estate, CommonState *commonstate);
extern void
-ExecAssignResultType(CommonState * commonstate,
+ExecAssignResultType(CommonState *commonstate,
TupleDesc tupDesc);
extern void
-ExecAssignResultTypeFromOuterPlan(Plan * node,
- CommonState * commonstate);
-extern void ExecAssignResultTypeFromTL(Plan * node, CommonState * commonstate);
-extern TupleDesc ExecGetResultType(CommonState * commonstate);
-extern void ExecAssignProjectionInfo(Plan * node, CommonState * commonstate);
-extern void ExecFreeProjectionInfo(CommonState * commonstate);
-extern TupleDesc ExecGetScanType(CommonScanState * csstate);
+ExecAssignResultTypeFromOuterPlan(Plan *node,
+ CommonState *commonstate);
+extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate);
+extern TupleDesc ExecGetResultType(CommonState *commonstate);
+extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate);
+extern void ExecFreeProjectionInfo(CommonState *commonstate);
+extern TupleDesc ExecGetScanType(CommonScanState *csstate);
extern void
-ExecAssignScanType(CommonScanState * csstate,
+ExecAssignScanType(CommonScanState *csstate,
TupleDesc tupDesc);
extern void
-ExecAssignScanTypeFromOuterPlan(Plan * node,
- CommonScanState * csstate);
+ExecAssignScanTypeFromOuterPlan(Plan *node,
+ CommonScanState *csstate);
extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
extern void
ExecOpenIndices(Oid resultRelationOid,
- RelationInfo * resultRelationInfo);
-extern void ExecCloseIndices(RelationInfo * resultRelationInfo);
+ RelationInfo *resultRelationInfo);
+extern void ExecCloseIndices(RelationInfo *resultRelationInfo);
extern void
-ExecInsertIndexTuples(TupleTableSlot * slot, ItemPointer tupleid,
- EState * estate, bool is_update);
+ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
+ EState *estate, bool is_update);
extern void resetVarAttrLenForCreateTable(TupleDesc tupType);
extern void
setVarAttrLenForCreateTable(TupleDesc tupType,
- List * targetList, List * rangeTable);
+ List *targetList, List *rangeTable);
/* ----------------------------------------------------------------
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 72b399663cab11fe938bb70223e76c78ecd33dde..a1bed2a7385b76cb54c53612765e3485c69b4163 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,19 +6,19 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: functions.h,v 1.3 1997/09/08 02:36:18 momjian Exp $
+ * $Id: functions.h,v 1.4 1997/09/08 21:51:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef FUNCTIONS_H
#define FUNCTIONS_H
-extern Datum
-ProjectAttribute(TupleDesc TD, TargetEntry * tlist,
- HeapTuple tup, bool * isnullP);
+extern Datum
+ProjectAttribute(TupleDesc TD, TargetEntry *tlist,
+ HeapTuple tup, bool *isnullP);
-extern Datum
-postquel_function(Func * funcNode, char **args,
- bool * isNull, bool * isDone);
+extern Datum
+postquel_function(Func *funcNode, char **args,
+ bool *isNull, bool *isDone);
#endif /* FUNCTIONS_H */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 6950bb25bdef28efc7e87c2d8ad788f98b8f9953..e6f0766b72016b3a869f00e99984bab957ae7fbe 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hashjoin.h,v 1.5 1997/09/08 02:36:20 momjian Exp $
+ * $Id: hashjoin.h,v 1.6 1997/09/08 21:52:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ typedef struct HashTableData
int curbatch;
int nprocess;
int pcount;
-} HashTableData; /* real hash table follows here */
+} HashTableData; /* real hash table follows here */
typedef HashTableData *HashJoinTable;
@@ -65,7 +65,7 @@ typedef struct OverflowTupleData
{
RelativeAddr tuple; /* HeapTuple */
RelativeAddr next; /* struct OverflowTupleData * */
-} OverflowTupleData; /* real tuple follows here */
+} OverflowTupleData; /* real tuple follows here */
typedef OverflowTupleData *OverflowTuple;
@@ -75,7 +75,7 @@ typedef struct HashBucketData
RelativeAddr bottom; /* HeapTuple */
RelativeAddr firstotuple; /* OverflowTuple */
RelativeAddr lastotuple; /* OverflowTuple */
-} HashBucketData; /* real bucket follows here */
+} HashBucketData; /* real bucket follows here */
typedef HashBucketData *HashBucket;
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 35c7e7fb5c7ddbf3656d4bfc140c2b626c9c550a..c752c6ce176b7243fba67661d43f8da2e98fe72a 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeAgg.h,v 1.4 1997/09/08 20:58:17 momjian Exp $
+ * $Id: nodeAgg.h,v 1.5 1997/09/08 21:52:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define NODEAGG_H
extern TupleTableSlot *ExecAgg(Agg *node);
-extern bool ExecInitAgg(Agg *node, EState * estate, Plan * parent);
+extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent);
extern int ExecCountSlotsAgg(Agg *node);
extern void ExecEndAgg(Agg *node);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index e546503910e13ad7c1bd633ae7c72a50ababb097..c0aa2d1c753de7eb24fe818d38384341ef186e79 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeAppend.h,v 1.5 1997/09/08 20:58:19 momjian Exp $
+ * $Id: nodeAppend.h,v 1.6 1997/09/08 21:52:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEAPPEND_H
#define NODEAPPEND_H
-extern bool ExecInitAppend(Append *node, EState * estate, Plan * parent);
+extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent);
extern int ExecCountSlotsAppend(Append *node);
extern TupleTableSlot *ExecProcAppend(Append *node);
extern void ExecEndAppend(Append *node);
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index 26d398d8bb50d08605cc7386e3c46d0c1b63b483..294f59103b250b437d59e0a33caa04ba4198667a 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeGroup.h,v 1.3 1997/09/08 02:36:23 momjian Exp $
+ * $Id: nodeGroup.h,v 1.4 1997/09/08 21:52:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEGROUP_H
#define NODEGROUP_H
-extern TupleTableSlot *ExecGroup(Group * node);
-extern bool ExecInitGroup(Group * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsGroup(Group * node);
-extern void ExecEndGroup(Group * node);
+extern TupleTableSlot *ExecGroup(Group *node);
+extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsGroup(Group *node);
+extern void ExecEndGroup(Group *node);
#endif /* NODEGROUP_H */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index c18403b030f0ee28d1f7fcbb2254998b5ddcd8b0..2348e99d97d0ee2a723aa3b7abcdd91592b4c5c3 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -6,29 +6,29 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeHash.h,v 1.4 1997/09/08 02:36:23 momjian Exp $
+ * $Id: nodeHash.h,v 1.5 1997/09/08 21:52:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEHASH_H
#define NODEHASH_H
-extern TupleTableSlot *ExecHash(Hash * node);
-extern bool ExecInitHash(Hash * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsHash(Hash * node);
-extern void ExecEndHash(Hash * node);
-extern HashJoinTable ExecHashTableCreate(Hash * node);
+extern TupleTableSlot *ExecHash(Hash *node);
+extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsHash(Hash *node);
+extern void ExecEndHash(Hash *node);
+extern HashJoinTable ExecHashTableCreate(Hash *node);
extern void
-ExecHashTableInsert(HashJoinTable hashtable, ExprContext * econtext,
- Var * hashkey, File * batches);
+ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext,
+ Var *hashkey, File *batches);
extern void ExecHashTableDestroy(HashJoinTable hashtable);
extern int
-ExecHashGetBucket(HashJoinTable hashtable, ExprContext * econtext,
- Var * hashkey);
-extern HeapTuple
-ExecScanHashBucket(HashJoinState * hjstate, HashBucket bucket,
- HeapTuple curtuple, List * hjclauses,
- ExprContext * econtext);
+ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext,
+ Var *hashkey);
+extern HeapTuple
+ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket,
+ HeapTuple curtuple, List *hjclauses,
+ ExprContext *econtext);
extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples);
#endif /* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index e26f92c65fc5113e2250658154544028064f5133..96ed987718aa56d90dc03f61ea58d495e6af6ce8 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,20 +6,20 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeHashjoin.h,v 1.4 1997/09/08 02:36:25 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.5 1997/09/08 21:52:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEHASHJOIN_H
#define NODEHASHJOIN_H
-extern TupleTableSlot *ExecHashJoin(HashJoin * node);
+extern TupleTableSlot *ExecHashJoin(HashJoin *node);
-extern bool ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent);
+extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
-extern int ExecCountSlotsHashJoin(HashJoin * node);
+extern int ExecCountSlotsHashJoin(HashJoin *node);
-extern void ExecEndHashJoin(HashJoin * node);
+extern void ExecEndHashJoin(HashJoin *node);
extern char *
ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 4137ec90f7b3b52e6e18f40a689c6b73fa090d27..5b149d8aed84bae097b7a93d1d5dd6bbe4b9f9ed 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,29 +6,29 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeIndexscan.h,v 1.4 1997/09/08 02:36:25 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.5 1997/09/08 21:52:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEINDEXSCAN_H
#define NODEINDEXSCAN_H
-extern TupleTableSlot *ExecIndexScan(IndexScan * node);
+extern TupleTableSlot *ExecIndexScan(IndexScan *node);
-extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent);
-extern void ExecEndIndexScan(IndexScan * node);
+extern void ExecEndIndexScan(IndexScan *node);
-extern void ExecIndexMarkPos(IndexScan * node);
+extern void ExecIndexMarkPos(IndexScan *node);
-extern void ExecIndexRestrPos(IndexScan * node);
+extern void ExecIndexRestrPos(IndexScan *node);
-extern void ExecUpdateIndexScanKeys(IndexScan * node, ExprContext * econtext);
+extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext);
-extern bool ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent);
+extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent);
-extern int ExecCountSlotsIndexScan(IndexScan * node);
+extern int ExecCountSlotsIndexScan(IndexScan *node);
-extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent);
+extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent);
#endif /* NODEINDEXSCAN_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index cd97d6b3c9a5e4ba647910ab3dbcd16a401978c1..98daa35f3199baf7d692fb9adc7c460d0fae3345 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,18 +6,18 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeMaterial.h,v 1.3 1997/09/08 02:36:26 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.4 1997/09/08 21:52:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEMATERIAL_H
#define NODEMATERIAL_H
-extern TupleTableSlot *ExecMaterial(Material * node);
-extern bool ExecInitMaterial(Material * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsMaterial(Material * node);
-extern void ExecEndMaterial(Material * node);
-extern List ExecMaterialMarkPos(Material * node);
-extern void ExecMaterialRestrPos(Material * node);
+extern TupleTableSlot *ExecMaterial(Material *node);
+extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsMaterial(Material *node);
+extern void ExecEndMaterial(Material *node);
+extern List ExecMaterialMarkPos(Material *node);
+extern void ExecMaterialRestrPos(Material *node);
#endif /* NODEMATERIAL_H */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 5bd870fabd4a3642cde1d18d038a2d26eb16d88e..96a74e0fc9d78de0b6ac0c7348ed804a71cdc823 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,19 +6,19 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeMergejoin.h,v 1.5 1997/09/08 02:36:29 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.6 1997/09/08 21:52:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEMERGEJOIN_H
#define NODEMERGEJOIN_H
-extern TupleTableSlot *ExecMergeJoin(MergeJoin * node);
+extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
-extern bool ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent);
+extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent);
-extern int ExecCountSlotsMergeJoin(MergeJoin * node);
+extern int ExecCountSlotsMergeJoin(MergeJoin *node);
-extern void ExecEndMergeJoin(MergeJoin * node);
+extern void ExecEndMergeJoin(MergeJoin *node);
#endif /* NODEMERGEJOIN_H; */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index f68539e29298e38c1410c0cf43812a47361271ae..2c4fa13fe1b62683472682810d232dcc9be6a434 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeNestloop.h,v 1.3 1997/09/08 02:36:34 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.4 1997/09/08 21:52:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODENESTLOOP_H
#define NODENESTLOOP_H
-extern TupleTableSlot *ExecNestLoop(NestLoop * node, Plan * parent);
-extern bool ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsNestLoop(NestLoop * node);
-extern void ExecEndNestLoop(NestLoop * node);
+extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent);
+extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsNestLoop(NestLoop *node);
+extern void ExecEndNestLoop(NestLoop *node);
#endif /* NODENESTLOOP_H */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index 2dcb411db948297c23580d13cc2e42f8950ed56a..c66e069f4680f1b5f9288d1ef00d98e9606f59a0 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeResult.h,v 1.3 1997/09/08 02:36:38 momjian Exp $
+ * $Id: nodeResult.h,v 1.4 1997/09/08 21:52:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODERESULT_H
#define NODERESULT_H
-extern TupleTableSlot *ExecResult(Result * node);
-extern bool ExecInitResult(Result * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsResult(Result * node);
-extern void ExecEndResult(Result * node);
+extern TupleTableSlot *ExecResult(Result *node);
+extern bool ExecInitResult(Result *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsResult(Result *node);
+extern void ExecEndResult(Result *node);
#endif /* NODERESULT_H */
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 22154ea1f2ca05107440fb8a2f7dd851809d3eca..d6afe03ac93bcc8cf9b9926af6ce1e662322913b 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,19 +6,19 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeSeqscan.h,v 1.4 1997/09/08 02:36:39 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.5 1997/09/08 21:52:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODESEQSCAN_H
#define NODESEQSCAN_H
-extern TupleTableSlot *ExecSeqScan(SeqScan * node);
-extern bool ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsSeqScan(SeqScan * node);
-extern void ExecEndSeqScan(SeqScan * node);
-extern void ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent);
-extern void ExecSeqMarkPos(SeqScan * node);
-extern void ExecSeqRestrPos(SeqScan * node);
+extern TupleTableSlot *ExecSeqScan(SeqScan *node);
+extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsSeqScan(SeqScan *node);
+extern void ExecEndSeqScan(SeqScan *node);
+extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent);
+extern void ExecSeqMarkPos(SeqScan *node);
+extern void ExecSeqRestrPos(SeqScan *node);
#endif /* NODESEQSCAN_H */
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index a4c0a1b388c6ea3f0fc5e7ba5603918acd1260ad..69b4dbe9a86e6b881fe0210a72d073283099707c 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -6,18 +6,18 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeSort.h,v 1.3 1997/09/08 02:36:40 momjian Exp $
+ * $Id: nodeSort.h,v 1.4 1997/09/08 21:52:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODESORT_H
#define NODESORT_H
-extern TupleTableSlot *ExecSort(Sort * node);
-extern bool ExecInitSort(Sort * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsSort(Sort * node);
-extern void ExecEndSort(Sort * node);
-extern void ExecSortMarkPos(Sort * node);
-extern void ExecSortRestrPos(Sort * node);
+extern TupleTableSlot *ExecSort(Sort *node);
+extern bool ExecInitSort(Sort *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsSort(Sort *node);
+extern void ExecEndSort(Sort *node);
+extern void ExecSortMarkPos(Sort *node);
+extern void ExecSortRestrPos(Sort *node);
#endif /* NODESORT_H */
diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h
index a0fb3831424f2694d8aadd1aa59c0e39704b62d7..c4a603aa3a9d008b5dce30052314d026a340608a 100644
--- a/src/include/executor/nodeTee.h
+++ b/src/include/executor/nodeTee.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeTee.h,v 1.3 1997/09/08 02:36:41 momjian Exp $
+ * $Id: nodeTee.h,v 1.4 1997/09/08 21:52:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -13,10 +13,10 @@
#ifndef NODETEE_H
#define NODETEE_H
-extern TupleTableSlot *ExecTee(Tee * node, Plan * parent);
-extern bool ExecInitTee(Tee * node, EState * estate, Plan * parent);
-extern void ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent);
-extern void ExecEndTee(Tee * node, Plan * parent);
-extern int ExecCountSlotsTee(Tee * node);
+extern TupleTableSlot *ExecTee(Tee *node, Plan *parent);
+extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent);
+extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent);
+extern void ExecEndTee(Tee *node, Plan *parent);
+extern int ExecCountSlotsTee(Tee *node);
#endif /* NODETEE_H */
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 24042581f34dc765d4998061dadafec281f3de14..61ab85828cfe3fe8f38cc1519298ed3c96743419 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeUnique.h,v 1.3 1997/09/08 02:36:42 momjian Exp $
+ * $Id: nodeUnique.h,v 1.4 1997/09/08 21:52:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEUNIQUE_H
#define NODEUNIQUE_H
-extern TupleTableSlot *ExecUnique(Unique * node);
-extern bool ExecInitUnique(Unique * node, EState * estate, Plan * parent);
-extern int ExecCountSlotsUnique(Unique * node);
-extern void ExecEndUnique(Unique * node);
+extern TupleTableSlot *ExecUnique(Unique *node);
+extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent);
+extern int ExecCountSlotsUnique(Unique *node);
+extern void ExecEndUnique(Unique *node);
#endif /* NODEUNIQUE_H */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 34ffef800ab77140407e02f89b719654aecda5a1..d5db0aa3d81bd0b15969e339501caf83fc3ff403 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -40,7 +40,7 @@ typedef struct
uint32 free; /* # of free vals */
TupleDesc tupdesc; /* tuple descriptor */
HeapTuple *vals; /* tuples */
-} SPITupleTable;
+} SPITupleTable;
#define SPI_ERROR_CONNECT -1
#define SPI_ERROR_COPY -2
@@ -73,12 +73,12 @@ extern int SPI_connect(void);
extern int SPI_finish(void);
extern int SPI_exec(char *src, int tcount);
extern int SPI_execp(void *plan, char **values, char *Nulls, int tcount);
-extern void *SPI_prepare(char *src, int nargs, Oid * argtypes);
+extern void *SPI_prepare(char *src, int nargs, Oid *argtypes);
extern void *SPI_saveplan(void *plan);
extern int SPI_fnumber(TupleDesc tupdesc, char *fname);
extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber);
-extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull);
+extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull);
extern char *SPI_gettype(TupleDesc tupdesc, int fnumber);
extern Oid SPI_gettypeid(TupleDesc tupdesc, int fnumber);
extern char *SPI_getrelname(Relation rel);
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index ae82418816355bf0f87f031f14a1d7194d406084..1df589265e2ab9b5747125e44d50ff43d5f9acbe 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tuptable.h,v 1.6 1997/09/08 02:36:45 momjian Exp $
+ * $Id: tuptable.h,v 1.7 1997/09/08 21:52:16 momjian Exp $
*
* NOTES
* The tuple table interface is getting pretty ugly.
@@ -53,7 +53,7 @@ typedef struct TupleTableSlot
TupleDesc ttc_tupleDescriptor;
Buffer ttc_buffer;
int ttc_whichplan;
-} TupleTableSlot;
+} TupleTableSlot;
/* ----------------
* tuple table data structure
@@ -64,7 +64,7 @@ typedef struct TupleTableData
int size; /* size of the table */
int next; /* next available slot number */
TupleTableSlot *array; /* array of TupleTableSlot's */
-} TupleTableData;
+} TupleTableData;
typedef TupleTableData *TupleTable;
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index af0c580cc936d589e11b0f811d0cf269bd9be102..238ac3b8ea0801e12ccf88cedee37dcef7ad8156 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -26,7 +26,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dllist.h,v 1.6 1997/09/08 02:36:47 momjian Exp $
+ * $Id: dllist.h,v 1.7 1997/09/08 21:52:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,13 +44,13 @@ typedef struct Dlelem
struct Dlelem *dle_prev; /* previous element */
void *dle_val; /* value of the element */
struct Dllist *dle_list; /* what list this element is in */
-} Dlelem;
+} Dlelem;
typedef struct Dllist
{
Dlelem *dll_head;
Dlelem *dll_tail;
-} Dllist;
+} Dllist;
extern Dllist *DLNewList(void); /* initialize a new list */
extern void DLFreeList(Dllist *); /* free up a list and all the
@@ -59,14 +59,13 @@ extern Dlelem *DLNewElem(void *val);
extern void DLFreeElem(Dlelem *);
extern Dlelem *DLGetHead(Dllist *);
extern Dlelem *DLGetTail(Dllist *);
-extern Dlelem *DLRemTail(Dllist * l);
+extern Dlelem *DLRemTail(Dllist *l);
extern Dlelem *DLGetPred(Dlelem *); /* get predecessor */
extern Dlelem *DLGetSucc(Dlelem *); /* get successor */
extern void DLRemove(Dlelem *); /* removes node from list */
-extern void DLAddHead(Dllist * list, Dlelem * node);
-extern void DLAddTail(Dllist * list, Dlelem * node);
-extern Dlelem *DLRemHead(Dllist * list); /* remove and return the
- * head */
+extern void DLAddHead(Dllist *list, Dlelem *node);
+extern void DLAddTail(Dllist *list, Dlelem *node);
+extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */
#define DLE_VAL(x) (x->dle_val)
diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h
index f5236c67bbad2db8a8214eaebfaf5669ba155cc7..2fbf62606cd72e42fbaf3afbff7bae2bac8d5348 100644
--- a/src/include/lib/fstack.h
+++ b/src/include/lib/fstack.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fstack.h,v 1.4 1997/09/08 02:36:51 momjian Exp $
+ * $Id: fstack.h,v 1.5 1997/09/08 21:52:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@ typedef struct FixedStackData
FixedItem top; /* Top item on the stack or NULL */
Offset offset; /* Offset from struct base to item */
/* this could be signed short int! */
-} FixedStackData;
+} FixedStackData;
typedef FixedStackData *FixedStack;
diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h
index 4c036f8e25c21718216241a35994ba83fcc7dac0..f2261d3eccf5289476ae4895f7b45a21a4877725 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hasht.h,v 1.4 1997/09/08 02:36:54 momjian Exp $
+ * $Id: hasht.h,v 1.5 1997/09/08 21:52:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,6 +18,6 @@
typedef void (*HashtFunc) ();
-extern void HashTableWalk(HTAB * hashtable, HashtFunc function, int arg);
+extern void HashTableWalk(HTAB *hashtable, HashtFunc function, int arg);
#endif /* HASHT_H */
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index b2b71ef27d0d9e4b3c7fe3c9d06b0a96e6a7d439..74a6929883a44eb94b7da4b8aa278e83bef29d40 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: stringinfo.h,v 1.4 1997/09/08 02:36:55 momjian Exp $
+ * $Id: stringinfo.h,v 1.5 1997/09/08 21:52:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@ typedef struct StringInfoData
char *data;
int maxlen;
int len;
-} StringInfoData;
+} StringInfoData;
typedef StringInfoData *StringInfo;
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index 11f57f1b9e92c4623a89de18f08656c25eb73e82..6a4160e65df0b8c911370ee9a4fb7e3ae142b92a 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: auth.h,v 1.6 1997/09/08 02:36:58 momjian Exp $
+ * $Id: auth.h,v 1.7 1997/09/08 21:52:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,11 +30,11 @@
#define DEFAULT_CLIENT_AUTHSVC "kerberos"
#endif /* KRB4 || KRB5 */
-extern int fe_sendauth(MsgType msgtype, Port * port, char *hostname);
+extern int fe_sendauth(MsgType msgtype, Port *port, char *hostname);
extern void fe_setauthsvc(char *name);
extern MsgType fe_getauthsvc();
extern char *fe_getauthname(void);
-extern int be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp);
+extern int be_recvauth(MsgType msgtype, Port *port, char *username, StartupInfo *sp);
extern void be_setauthsvc(char *name);
/* the value that matches any dbName value when doing
diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 2aef0e6a403f1c5940cb7354a343cc0c60196bc1..507f2a936778f8f9314a4e25cdf988c27d366621 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: be-fsstubs.h,v 1.4 1997/09/08 02:37:00 momjian Exp $
+ * $Id: be-fsstubs.h,v 1.5 1997/09/08 21:52:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,8 +21,8 @@
#define LOread(f,l) loread(f,l)
#define LOwrite(f,b) lowrite(f,b)
-extern Oid lo_import(text * filename);
-extern int4 lo_export(Oid lobjId, text * filename);
+extern Oid lo_import(text *filename);
+extern int4 lo_export(Oid lobjId, text *filename);
extern Oid lo_creat(int mode);
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index c54b9938ce4c5b8b9de7e91499f76f8053a2e4f9..8a430b94c7bd5553b8a4a2197a66b9960ffca884 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
* Interface to hba.c
*
*
- * $Id: hba.h,v 1.4 1997/09/07 04:58:19 momjian Exp $
+ * $Id: hba.h,v 1.5 1997/09/08 21:52:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,16 +38,17 @@
enum Userauth
{
- Trust, Ident, Password
+ Trust, Ident,
+ Password
};
extern int
-hba_recvauth(const Port * port, const char database[], const char user[],
+hba_recvauth(const Port *port, const char database[], const char user[],
const char DataDir[]);
void
find_hba_entry(const char DataDir[], const struct in_addr ip_addr,
const char database[],
- bool * host_ok_p, enum Userauth * userauth_p,
+ bool *host_ok_p, enum Userauth * userauth_p,
char usermap_name[], bool find_password_entries);
#endif
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index bddfa1888b41037c9a3a8b09c28e093ad75175f2..534adf12b65a047eeb74b01f8c0832d41a9cd4f6 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq-be.h,v 1.6 1997/09/08 02:37:03 momjian Exp $
+ * $Id: libpq-be.h,v 1.7 1997/09/08 21:52:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,12 +31,12 @@
/* in be-dumpdata.c */
extern void be_portalinit(void);
-extern void be_portalpush(PortalEntry * entry);
+extern void be_portalpush(PortalEntry *entry);
extern PortalEntry *be_portalpop(void);
extern PortalEntry *be_currentportal(void);
extern PortalEntry *be_newportal(void);
extern void
-be_typeinit(PortalEntry * entry, TupleDesc attrs,
+be_typeinit(PortalEntry *entry, TupleDesc attrs,
int natts);
extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo);
@@ -44,7 +44,7 @@ extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo);
/* in be-pqexec.c */
extern char *
PQfn(int fnid, int *result_buf, int result_len, int result_is_int,
- PQArgBlock * args, int nargs);
+ PQArgBlock *args, int nargs);
extern char *PQexec(char *query);
extern int pqtest_PQexec(char *q);
extern int pqtest_PQfn(char *q);
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index e983a91c0fee54e5e2d70c70bda8187e67993f7f..68265f809a752cbbab62b732841ef6708beefd69 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq.h,v 1.7 1997/09/08 02:37:08 momjian Exp $
+ * $Id: libpq.h,v 1.8 1997/09/08 21:52:36 momjian Exp $
*
* NOTES
* This file contains definitions for structures and
@@ -36,7 +36,7 @@ typedef struct
int *ptr; /* can't use void (dec compiler barfs) */
int integer;
} u;
-} PQArgBlock;
+} PQArgBlock;
/* ----------------
* TypeBlock --
@@ -50,7 +50,7 @@ typedef struct TypeBlock
char name[NAMEDATALEN]; /* name of the attribute */
int adtid; /* adtid of the type */
int adtsize; /* adtsize of the type */
-} TypeBlock;
+} TypeBlock;
/* ----------------
* TupleBlock --
@@ -66,7 +66,7 @@ typedef struct TupleBlock
* foreach tuple */
struct TupleBlock *next; /* next tuple block */
int tuple_index; /* current tuple index */
-} TupleBlock;
+} TupleBlock;
/* ----------------
* GroupBuffer --
@@ -80,7 +80,7 @@ typedef struct GroupBuffer
TypeBlock *types; /* types of the attributes */
TupleBlock *tuples; /* tuples in this group */
struct GroupBuffer *next; /* next group */
-} GroupBuffer;
+} GroupBuffer;
/* ----------------
* PortalBuffer --
@@ -93,7 +93,7 @@ typedef struct PortalBuffer
int no_tuples; /* number of tuples in this portal buffer */
int no_groups; /* number of tuple groups */
GroupBuffer *groups; /* linked list of tuple groups */
-} PortalBuffer;
+} PortalBuffer;
/* ----------------
* PortalEntry --
@@ -111,7 +111,7 @@ typedef struct PortalEntry
PortalBuffer *portal; /* tuples contained in this portal */
Pointer portalcxt; /* memory context (for backend) */
Pointer result; /* result for PQexec */
-} PortalEntry;
+} PortalEntry;
#define PORTALS_INITIAL_SIZE 32
#define PORTALS_GROW_BY 32
@@ -130,7 +130,7 @@ typedef struct PQNotifyList
int be_pid; /* process id of backend */
int valid; /* has this already been handled by user. */
/* SLNode Node; */
-} PQNotifyList;
+} PQNotifyList;
/*
* Exceptions.
@@ -170,37 +170,37 @@ extern void PQuntrace(void);
extern int PQnportals(int rule_p);
extern void PQpnames(char **pnames, int rule_p);
extern PortalBuffer *PQparray(char *pname);
-extern int PQrulep(PortalBuffer * portal);
-extern int PQntuples(PortalBuffer * portal);
-extern int PQninstances(PortalBuffer * portal);
-extern int PQngroups(PortalBuffer * portal);
-extern int PQntuplesGroup(PortalBuffer * portal, int group_index);
-extern int PQninstancesGroup(PortalBuffer * portal, int group_index);
-extern int PQnfieldsGroup(PortalBuffer * portal, int group_index);
-extern int PQfnumberGroup(PortalBuffer * portal, int group_index, char *field_name);
-extern char *PQfnameGroup(PortalBuffer * portal, int group_index, int field_number);
+extern int PQrulep(PortalBuffer *portal);
+extern int PQntuples(PortalBuffer *portal);
+extern int PQninstances(PortalBuffer *portal);
+extern int PQngroups(PortalBuffer *portal);
+extern int PQntuplesGroup(PortalBuffer *portal, int group_index);
+extern int PQninstancesGroup(PortalBuffer *portal, int group_index);
+extern int PQnfieldsGroup(PortalBuffer *portal, int group_index);
+extern int PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name);
+extern char *PQfnameGroup(PortalBuffer *portal, int group_index, int field_number);
extern int
-PQftypeGroup(PortalBuffer * portal, int group_index,
+PQftypeGroup(PortalBuffer *portal, int group_index,
int field_number);
extern int
-PQfsizeGroup(PortalBuffer * portal, int group_index,
+PQfsizeGroup(PortalBuffer *portal, int group_index,
int field_number);
-extern GroupBuffer *PQgroup(PortalBuffer * portal, int tuple_index);
-extern int PQgetgroup(PortalBuffer * portal, int tuple_index);
-extern int PQnfields(PortalBuffer * portal, int tuple_index);
-extern int PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name);
-extern char *PQfname(PortalBuffer * portal, int tuple_index, int field_number);
-extern int PQftype(PortalBuffer * portal, int tuple_index, int field_number);
-extern int PQfsize(PortalBuffer * portal, int tuple_index, int field_number);
-extern int PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2);
-extern char *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number);
-extern char *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number);
-extern int PQgetlength(PortalBuffer * portal, int tuple_index, int field_number);
+extern GroupBuffer *PQgroup(PortalBuffer *portal, int tuple_index);
+extern int PQgetgroup(PortalBuffer *portal, int tuple_index);
+extern int PQnfields(PortalBuffer *portal, int tuple_index);
+extern int PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name);
+extern char *PQfname(PortalBuffer *portal, int tuple_index, int field_number);
+extern int PQftype(PortalBuffer *portal, int tuple_index, int field_number);
+extern int PQfsize(PortalBuffer *portal, int tuple_index, int field_number);
+extern int PQsametype(PortalBuffer *portal, int tuple_index1, int tuple_index2);
+extern char *PQgetvalue(PortalBuffer *portal, int tuple_index, int field_number);
+extern char *PQgetAttr(PortalBuffer *portal, int tuple_index, int field_number);
+extern int PQgetlength(PortalBuffer *portal, int tuple_index, int field_number);
extern void PQclear(char *pname);
extern void PQcleanNotify(void);
extern void PQnotifies_init(void);
extern PQNotifyList *PQnotifies(void);
-extern void PQremoveNotify(PQNotifyList * nPtr);
+extern void PQremoveNotify(PQNotifyList *nPtr);
extern void PQappendNotify(char *relname, int pid);
/*
@@ -209,7 +209,7 @@ extern void PQappendNotify(char *relname, int pid);
extern caddr_t pbuf_alloc(size_t size);
extern void pbuf_free(caddr_t pointer);
extern PortalBuffer *pbuf_addPortal(void);
-extern GroupBuffer *pbuf_addGroup(PortalBuffer * portal);
+extern GroupBuffer *pbuf_addGroup(PortalBuffer *portal);
extern TypeBlock *pbuf_addTypes(int n);
extern TupleBlock *pbuf_addTuples(void);
extern char **pbuf_addTuple(int n);
@@ -217,18 +217,18 @@ extern int *pbuf_addTupleValueLengths(int n);
extern char *pbuf_addValues(int n);
extern PortalEntry *pbuf_addEntry(void);
extern void pbuf_freeEntry(int i);
-extern void pbuf_freeTypes(TypeBlock * types);
-extern void pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields);
-extern void pbuf_freeGroup(GroupBuffer * group);
-extern void pbuf_freePortal(PortalBuffer * portal);
+extern void pbuf_freeTypes(TypeBlock *types);
+extern void pbuf_freeTuples(TupleBlock *tuples, int no_tuples, int no_fields);
+extern void pbuf_freeGroup(GroupBuffer *group);
+extern void pbuf_freePortal(PortalBuffer *portal);
extern int pbuf_getIndex(char *pname);
-extern void pbuf_setportalinfo(PortalEntry * entry, char *pname);
+extern void pbuf_setportalinfo(PortalEntry *entry, char *pname);
extern PortalEntry *pbuf_setup(char *pname);
extern void pbuf_close(char *pname);
-extern GroupBuffer *pbuf_findGroup(PortalBuffer * portal, int group_index);
-extern int pbuf_findFnumber(GroupBuffer * group, char *field_name);
-extern void pbuf_checkFnumber(GroupBuffer * group, int field_number);
-extern char *pbuf_findFname(GroupBuffer * group, int field_number);
+extern GroupBuffer *pbuf_findGroup(PortalBuffer *portal, int group_index);
+extern int pbuf_findFnumber(GroupBuffer *group, char *field_name);
+extern void pbuf_checkFnumber(GroupBuffer *group, int field_number);
+extern char *pbuf_findFname(GroupBuffer *group, int field_number);
/*
* prototypes for functions in pqcomm.c
@@ -253,12 +253,12 @@ extern int pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
extern int
pq_connect(char *dbname, char *user, char *args, char *hostName,
char *debugTty, char *execFile, short portName);
-extern int StreamOpen(char *hostName, short portName, Port * port);
+extern int StreamOpen(char *hostName, short portName, Port *port);
extern void pq_regoob(void (*fptr) ());
extern void pq_unregoob(void);
extern void pq_async_notify(void);
extern int StreamServerPort(char *hostName, short portName, int *fdP);
-extern int StreamConnection(int server_fd, Port * port);
+extern int StreamConnection(int server_fd, Port *port);
extern void StreamClose(int sock);
#endif /* LIBPQ_H */
diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h
index 2b933553d5917fd37dbd3bc42e5feee0f6fde99e..28b279a7c086a6ef24d3d65c58e656373792f0f3 100644
--- a/src/include/libpq/password.h
+++ b/src/include/libpq/password.h
@@ -7,7 +7,7 @@
#define PWFILE_NAME_SIZE USERMAP_NAME_SIZE
int
-verify_password(char *user, char *password, Port * port,
+verify_password(char *user, char *password, Port *port,
char *database, char *DataDir);
#endif
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index f565900a5d5ba7f01747ed34c0ad1f98d07b1b48..c81c5d666c6e1cf4904d664b2c5f2510755990ab 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.13 1997/09/08 20:58:26 momjian Exp $
+ * $Id: pqcomm.h,v 1.14 1997/09/08 21:52:38 momjian Exp $
*
* NOTES
* Some of this should move to libpq.h
@@ -74,7 +74,7 @@ typedef struct StartupInfo
char options[ARGV_SIZE]; /* possible additional args */
char execFile[ARGV_SIZE]; /* possible backend to use */
char tty[PATH_SIZE]; /* possible tty for debug output */
-} StartupInfo;
+} StartupInfo;
/* amount of available data in a packet buffer */
#define MESSAGE_SIZE sizeof(StartupInfo) + 5 /* why 5? BJM 2/11/97 */
@@ -91,7 +91,7 @@ typedef struct PacketBuf
int len;
MsgType msgtype;
char data[MESSAGE_SIZE];
-} PacketBuf;
+} PacketBuf;
/* update the conversion routines
StartupInfo2PacketBuf() and PacketBuf2StartupInfo() (decl. below)
@@ -113,7 +113,7 @@ typedef struct Port
* PacketBufId id;
*//* id of packet buf currently in use */
PacketBuf buf; /* stream implementation (curr pack buf) */
-} Port;
+} Port;
/* invalid socket descriptor */
#define INVALID_SOCK (-1)
@@ -147,9 +147,9 @@ int pqPutByte(int, FILE *);
/*
* prototypes for functions in pqpacket.c
*/
-extern int PacketReceive(Port * port, PacketBuf * buf, char nonBlocking);
+extern int PacketReceive(Port *port, PacketBuf *buf, char nonBlocking);
extern int
-PacketSend(Port * port, PacketBuf * buf,
+PacketSend(Port *port, PacketBuf *buf,
PacketLen len, char nonBlocking);
/* extern PacketBuf* StartupInfo2PacketBuf(StartupInfo*); */
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 2e71ab58744625cca259488707fb0206a6fcd1a5..c4c955295922d4d9ba213e081cccd2caed87c18b 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.13 1997/09/08 02:33:50 momjian Exp $
+ * $Id: miscadmin.h,v 1.14 1997/09/08 21:50:26 momjian Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -154,7 +154,7 @@ typedef enum ProcessingMode
BootstrapProcessing, /* bootstrap creation of template database */
InitProcessing, /* initializing system */
NormalProcessing /* normal processing */
-} ProcessingMode;
+} ProcessingMode;
/*****************************************************************************
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index a2cafdc6426119a07169e04fbd5cef7e49ece897..7a6fdcab94eaaa90b465b9da696144602cd10bf1 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execnodes.h,v 1.11 1997/09/08 20:58:40 momjian Exp $
+ * $Id: execnodes.h,v 1.12 1997/09/08 21:52:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@ typedef struct IndexInfo
AttrNumber *ii_KeyAttributeNumbers;
FuncIndexInfoPtr ii_FuncIndexInfo;
Node *ii_Predicate;
-} IndexInfo;
+} IndexInfo;
/* ----------------
* RelationInfo information
@@ -65,7 +65,7 @@ typedef struct RelationInfo
int ri_NumIndices;
RelationPtr ri_IndexRelationDescs;
IndexInfo **ri_IndexRelationInfo;
-} RelationInfo;
+} RelationInfo;
/* ----------------
* ExprContext
@@ -90,7 +90,7 @@ typedef struct ExprContext
List *ecxt_range_table;
Datum *ecxt_values; /* precomputed values for aggreg */
char *ecxt_nulls; /* null flags for aggreg values */
-} ExprContext;
+} ExprContext;
/* ----------------
* ProjectionInfo node information
@@ -116,7 +116,7 @@ typedef struct ProjectionInfo
Datum *pi_tupValue;
ExprContext *pi_exprContext;
TupleTableSlot *pi_slot;
-} ProjectionInfo;
+} ProjectionInfo;
/* ----------------
* JunkFilter
@@ -157,7 +157,7 @@ typedef struct JunkFilter
int jf_cleanLength;
TupleDesc jf_cleanTupType;
AttrNumber *jf_cleanMap;
-} JunkFilter;
+} JunkFilter;
/* ----------------
* EState information
@@ -205,7 +205,7 @@ typedef struct EState
int *es_refcount;
uint32 es_processed; /* # of tuples processed */
Oid es_lastoid; /* last oid processed (by INSERT) */
-} EState;
+} EState;
/* ----------------
* Executor Type information needed by plannodes.h
@@ -265,7 +265,7 @@ typedef struct CommonState
ExprContext *cs_ExprContext;
ProjectionInfo *cs_ProjInfo;
bool cs_TupFromTlist;
-} CommonState;
+} CommonState;
/* ----------------------------------------------------------------
@@ -293,7 +293,7 @@ typedef struct ResultState
{
CommonState cstate; /* its first field is NodeTag */
int rs_done;
-} ResultState;
+} ResultState;
/* ----------------
* AppendState information
@@ -362,7 +362,7 @@ typedef struct CommonScanState
Relation css_currentRelation;
HeapScanDesc css_currentScanDesc;
TupleTableSlot *css_ScanTupleSlot;
-} CommonScanState;
+} CommonScanState;
/* ----------------
* IndexScanState information
@@ -400,7 +400,7 @@ typedef struct IndexScanState
Pointer iss_RuntimeKeyInfo;
RelationPtr iss_RelationDescs;
IndexScanDescPtr iss_ScanDescs;
-} IndexScanState;
+} IndexScanState;
/* ----------------------------------------------------------------
@@ -444,7 +444,7 @@ typedef struct NestLoopState
{
JoinState jstate; /* its first field is NodeTag */
bool nl_PortalFlag;
-} NestLoopState;
+} NestLoopState;
/* ----------------
* MergeJoinState information
@@ -473,7 +473,7 @@ typedef struct MergeJoinState
List *mj_ISortopO;
int mj_JoinState;
TupleTableSlot *mj_MarkedTupleSlot;
-} MergeJoinState;
+} MergeJoinState;
/* ----------------
* HashJoinState information
@@ -523,7 +523,7 @@ typedef struct HashJoinState
int hj_OuterReadBlk;
TupleTableSlot *hj_OuterTupleSlot;
TupleTableSlot *hj_HashTupleSlot;
-} HashJoinState;
+} HashJoinState;
/* ----------------------------------------------------------------
@@ -562,7 +562,7 @@ typedef struct MaterialState
CommonScanState csstate; /* its first field is NodeTag */
bool mat_Flag;
Relation mat_TempRelation;
-} MaterialState;
+} MaterialState;
/* ---------------------
* AggregateState information
@@ -587,7 +587,7 @@ typedef struct GroupState
bool grp_useLastTuple; /* last tuple not processed yet */
bool grp_done;
TupleTableSlot *grp_lastSlot;
-} GroupState;
+} GroupState;
/* ----------------
* SortState information
@@ -626,7 +626,7 @@ typedef struct SortState
bool sort_Flag;
ScanKey sort_Keys;
bool cleaned;
-} SortState;
+} SortState;
/* ----------------
* UniqueState information
@@ -670,7 +670,7 @@ typedef struct HashState
{
CommonState cstate; /* its first field is NodeTag */
File *hashBatches;
-} HashState;
+} HashState;
/* -----------------------
* TeeState information
@@ -697,6 +697,6 @@ typedef struct TeeState
MemoryContext tee_mcxt;
HeapScanDesc tee_leftScanDesc;
HeapScanDesc tee_rightScanDesc;
-} TeeState;
+} TeeState;
#endif /* EXECNODES_H */
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index aa1050af16c20ccaa07ef5056aa3252e021f4fad..e3104996d4bdb92727f21e0baafb62b078c1635f 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: memnodes.h,v 1.6 1997/09/08 02:37:19 momjian Exp $
+ * $Id: memnodes.h,v 1.7 1997/09/08 21:52:44 momjian Exp $
*
* XXX the typedefs in this file are different from the other ???nodes.h;
* they are pointers to structures instead of the structures themselves.
@@ -48,10 +48,10 @@
typedef struct MemoryContextMethodsData
{
- Pointer(*alloc) ();
+ Pointer (*alloc) ();
void (*free_p) (); /* need to use free as a #define, so can't
* use free */
- Pointer(*realloc) ();
+ Pointer (*realloc) ();
char *(*getName) ();
void (*dump) ();
} *MemoryContextMethods;
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index b1fe74696107da2a409456dd2f99a19f52c7db9d..de5ad32ab5085b798c8faf3aa044e8904a998ca1 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,17 +6,17 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeFuncs.h,v 1.4 1997/09/08 02:37:20 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.5 1997/09/08 21:52:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef NODEFUNCS_H
#define NODEFUNCS_H
-extern bool single_node(Node * node);
-extern bool var_is_outer(Var * var);
-extern bool var_is_rel(Var * var);
-extern Oper *replace_opid(Oper * oper);
-extern bool non_null(Expr * c);
+extern bool single_node(Node *node);
+extern bool var_is_outer(Var *var);
+extern bool var_is_rel(Var *var);
+extern Oper *replace_opid(Oper *oper);
+extern bool non_null(Expr *c);
#endif /* NODEFUNCS_H */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 73c7b84cba90648874ac93fe0c443f07521d267a..93b071a65041cd26912a4474ac2fb2ad9f8815ad 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodes.h,v 1.13 1997/09/08 02:37:21 momjian Exp $
+ * $Id: nodes.h,v 1.14 1997/09/08 21:52:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -209,7 +209,7 @@ typedef enum NodeTag
T_SortClause,
T_GroupClause,
T_SubSelect
-} NodeTag;
+} NodeTag;
/*
* The first field of a node of any type is gauranteed to be the NodeTag.
@@ -220,7 +220,7 @@ typedef enum NodeTag
typedef struct Node
{
NodeTag type;
-} Node;
+} Node;
#define nodeTag(_node_) ((Node*)_node_)->type
@@ -303,7 +303,7 @@ typedef enum CmdType
CMD_NOTIFY,
CMD_UTILITY /* cmds like create, destroy, copy,
* vacuum, etc. */
-} CmdType;
+} CmdType;
#endif /* NODES_H */
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index d3e8bd86e8a1a3c6b1d32d391d99ae46063b7af1..083c5faed41fae5897b392d81be18814cf0ce1c4 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: params.h,v 1.5 1997/09/08 02:37:22 momjian Exp $
+ * $Id: params.h,v 1.6 1997/09/08 21:52:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -83,7 +83,7 @@ typedef struct ParamListInfoData
bool isnull;
bool byval;
Datum value;
-} ParamListInfoData;
+} ParamListInfoData;
typedef ParamListInfoData *ParamListInfo;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 97890a37a8592db5353f68ecb84b60e5473db9df..ff5759cd05830f47677a886565a127c75f8ee2fd 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parsenodes.h,v 1.26 1997/09/08 20:58:47 momjian Exp $
+ * $Id: parsenodes.h,v 1.27 1997/09/08 21:52:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@ typedef struct Query
List *join_relation_list_; /* list of relations generated by
* joins */
bool query_is_archival_; /* archival query flag */
-} Query;
+} Query;
/*****************************************************************************
@@ -98,7 +98,7 @@ typedef struct ChangeACLStmt
struct AclItem *aclitem;
unsigned modechg;
List *relNames;
-} ChangeACLStmt;
+} ChangeACLStmt;
/* ----------------------
* Close Portal Statement
@@ -108,7 +108,7 @@ typedef struct ClosePortalStmt
{
NodeTag type;
char *portalname; /* name of the portal (cursor) */
-} ClosePortalStmt;
+} ClosePortalStmt;
/* ----------------------
* Copy Statement
@@ -123,7 +123,7 @@ typedef struct CopyStmt
int direction; /* TO or FROM */
char *filename; /* if NULL, use stdin/stdout */
char *delimiter; /* delimiter character, \t by default */
-} CopyStmt;
+} CopyStmt;
/* ----------------------
* Create Table Statement
@@ -145,19 +145,19 @@ typedef struct CreateStmt
int location; /* smgrid (-1 if none) */
int archiveLoc; /* smgrid (-1 if none) */
List *constraints; /* list of constraints (ConstaintDef) */
-} CreateStmt;
+} CreateStmt;
typedef enum ConstrType
{
CONSTR_NONE, CONSTR_CHECK /* type of constaints */
-} ConstrType;
+} ConstrType;
typedef struct ConstraintDef
{
ConstrType type;
char *name; /* name */
void *def; /* definition */
-} ConstraintDef;
+} ConstraintDef;
/* ----------------------
* Create/Drop TRIGGER Statements
@@ -178,14 +178,14 @@ typedef struct CreateTrigStmt
char *text; /* AS 'text' */
List *attr; /* UPDATE OF a, b,... (NI) or NULL */
char *when; /* WHEN 'a > 10 ...' (NI) or NULL */
-} CreateTrigStmt;
+} CreateTrigStmt;
typedef struct DropTrigStmt
{
NodeTag type;
char *trigname; /* TRIGGER' name */
char *relname; /* triggered relation */
-} DropTrigStmt;
+} DropTrigStmt;
/* ----------------------
* Create SEQUENCE Statement
@@ -197,7 +197,7 @@ typedef struct CreateSeqStmt
NodeTag type;
char *seqname; /* the relation to create */
List *options;
-} CreateSeqStmt;
+} CreateSeqStmt;
/* ----------------------
* Create Version Statement
@@ -210,7 +210,7 @@ typedef struct VersionStmt
int direction; /* FORWARD | BACKWARD */
char *fromRelname; /* relation to create a version */
char *date; /* date of the snapshot */
-} VersionStmt;
+} VersionStmt;
/* ----------------------
* Create {Operator|Type|Aggregate} Statement
@@ -222,7 +222,7 @@ typedef struct DefineStmt
int defType; /* OPERATOR|P_TYPE|AGGREGATE */
char *defname;
List *definition; /* a list of DefElem */
-} DefineStmt;
+} DefineStmt;
/* ----------------------
* Drop Table Statement
@@ -233,7 +233,7 @@ typedef struct DestroyStmt
NodeTag type;
List *relNames; /* relations to be dropped */
bool sequence;
-} DestroyStmt;
+} DestroyStmt;
/* ----------------------
* Extend Index Statement
@@ -246,7 +246,7 @@ typedef struct ExtendStmt
Node *whereClause; /* qualifications */
List *rangetable; /* range table, filled in by
* transformStmt() */
-} ExtendStmt;
+} ExtendStmt;
/* ----------------------
* Begin Recipe Statement
@@ -256,7 +256,7 @@ typedef struct RecipeStmt
{
NodeTag type;
char *recipeName; /* name of the recipe */
-} RecipeStmt;
+} RecipeStmt;
/* ----------------------
* Fetch Statement
@@ -268,7 +268,7 @@ typedef struct FetchStmt
int direction; /* FORWARD or BACKWARD */
int howMany; /* amount to fetch ("ALL" --> 0) */
char *portalname; /* name of portal (cursor) */
-} FetchStmt;
+} FetchStmt;
/* ----------------------
* Create Index Statement
@@ -287,7 +287,7 @@ typedef struct IndexStmt
* transformStmt() */
bool *lossy; /* is index lossy? */
bool unique; /* is index unique? */
-} IndexStmt;
+} IndexStmt;
/* ----------------------
* Move Statement (Not implemented)
@@ -300,7 +300,7 @@ typedef struct MoveStmt
bool to;
int where;
char *portalname;
-} MoveStmt;
+} MoveStmt;
/* ----------------------
* Create Function Statement
@@ -317,7 +317,7 @@ typedef struct ProcedureStmt
List *withClause; /* a list of ParamString */
char *as; /* the SQL statement or filename */
char *language; /* C or SQL */
-} ProcedureStmt;
+} ProcedureStmt;
/* ----------------------
* Purge Statement
@@ -329,7 +329,7 @@ typedef struct PurgeStmt
char *relname; /* relation to purge */
char *beforeDate; /* purge before this date */
char *afterDate; /* purge after this date */
-} PurgeStmt;
+} PurgeStmt;
/* ----------------------
* Drop Aggregate Statement
@@ -340,7 +340,7 @@ typedef struct RemoveAggrStmt
NodeTag type;
char *aggname; /* aggregate to drop */
char *aggtype; /* for this type */
-} RemoveAggrStmt;
+} RemoveAggrStmt;
/* ----------------------
* Drop Function Statement
@@ -351,7 +351,7 @@ typedef struct RemoveFuncStmt
NodeTag type;
char *funcname; /* function to drop */
List *args; /* types of the arguments */
-} RemoveFuncStmt;
+} RemoveFuncStmt;
/* ----------------------
* Drop Operator Statement
@@ -362,7 +362,7 @@ typedef struct RemoveOperStmt
NodeTag type;
char *opname; /* operator to drop */
List *args; /* types of the arguments */
-} RemoveOperStmt;
+} RemoveOperStmt;
/* ----------------------
* Drop {Type|Index|Rule|View} Statement
@@ -373,7 +373,7 @@ typedef struct RemoveStmt
NodeTag type;
int removeType; /* P_TYPE|INDEX|RULE|VIEW */
char *name; /* name to drop */
-} RemoveStmt;
+} RemoveStmt;
/* ----------------------
* Alter Table Statement
@@ -388,7 +388,7 @@ typedef struct RenameStmt
* the new name. Otherwise, rename this
* column name. */
char *newname; /* the new name */
-} RenameStmt;
+} RenameStmt;
/* ----------------------
* Create Rule Statement
@@ -403,7 +403,7 @@ typedef struct RuleStmt
struct Attr *object; /* object affected */
bool instead; /* is a 'do instead'? */
List *actions; /* the action statements */
-} RuleStmt;
+} RuleStmt;
/* ----------------------
* Notify Statement
@@ -413,7 +413,7 @@ typedef struct NotifyStmt
{
NodeTag type;
char *relname; /* relation to notify */
-} NotifyStmt;
+} NotifyStmt;
/* ----------------------
* Listen Statement
@@ -423,7 +423,7 @@ typedef struct ListenStmt
{
NodeTag type;
char *relname; /* relation to listen on */
-} ListenStmt;
+} ListenStmt;
/* ----------------------
* {Begin|Abort|End} Transaction Statement
@@ -433,7 +433,7 @@ typedef struct TransactionStmt
{
NodeTag type;
int command; /* BEGIN|END|ABORT */
-} TransactionStmt;
+} TransactionStmt;
/* ----------------------
* Create View Statement
@@ -444,7 +444,7 @@ typedef struct ViewStmt
NodeTag type;
char *viewname; /* name of the view */
Query *query; /* the SQL statement */
-} ViewStmt;
+} ViewStmt;
/* ----------------------
* Load Statement
@@ -454,7 +454,7 @@ typedef struct LoadStmt
{
NodeTag type;
char *filename; /* file to load */
-} LoadStmt;
+} LoadStmt;
/* ----------------------
* Createdb Statement
@@ -464,7 +464,7 @@ typedef struct CreatedbStmt
{
NodeTag type;
char *dbname; /* database to create */
-} CreatedbStmt;
+} CreatedbStmt;
/* ----------------------
* Destroydb Statement
@@ -474,7 +474,7 @@ typedef struct DestroydbStmt
{
NodeTag type;
char *dbname; /* database to drop */
-} DestroydbStmt;
+} DestroydbStmt;
/* ----------------------
* Cluster Statement (support pbrown's cluster index implementation)
@@ -485,7 +485,7 @@ typedef struct ClusterStmt
NodeTag type;
char *relname; /* relation being indexed */
char *indexname; /* original index defined */
-} ClusterStmt;
+} ClusterStmt;
/* ----------------------
* Vacuum Statement
@@ -498,7 +498,7 @@ typedef struct VacuumStmt
bool analyze; /* analyze data */
char *vacrel; /* table to vacuum */
List *va_spec; /* columns to analyse */
-} VacuumStmt;
+} VacuumStmt;
/* ----------------------
* Explain Statement
@@ -509,7 +509,7 @@ typedef struct ExplainStmt
NodeTag type;
Query *query; /* the query */
bool verbose; /* print plan info */
-} ExplainStmt;
+} ExplainStmt;
/* ----------------------
* Set Statement
@@ -521,7 +521,7 @@ typedef struct VariableSetStmt
NodeTag type;
char *name;
char *value;
-} VariableSetStmt;
+} VariableSetStmt;
/* ----------------------
* Show Statement
@@ -532,7 +532,7 @@ typedef struct VariableShowStmt
{
NodeTag type;
char *name;
-} VariableShowStmt;
+} VariableShowStmt;
/* ----------------------
* Reset Statement
@@ -543,7 +543,7 @@ typedef struct VariableResetStmt
{
NodeTag type;
char *name;
-} VariableResetStmt;
+} VariableResetStmt;
/*****************************************************************************
@@ -573,7 +573,7 @@ typedef struct DeleteStmt
NodeTag type;
char *relname; /* relation to delete from */
Node *whereClause; /* qualifications */
-} DeleteStmt;
+} DeleteStmt;
/* ----------------------
* Update Statement
@@ -586,7 +586,7 @@ typedef struct ReplaceStmt
List *targetList; /* the target list (of ResTarget) */
Node *whereClause; /* qualifications */
List *fromClause; /* the from clause */
-} ReplaceStmt;
+} ReplaceStmt;
/* ----------------------
* Create Cursor Statement
@@ -603,7 +603,7 @@ typedef struct CursorStmt
Node *whereClause; /* qualifications */
List *groupClause; /* group by clause */
List *sortClause; /* sort clause (a list of SortGroupBy's) */
-} CursorStmt;
+} CursorStmt;
/* ----------------------
* Select Statement
@@ -621,7 +621,7 @@ typedef struct RetrieveStmt
Node *havingClause; /* having conditional-expression */
List *selectClause; /* subselect parameters */
List *sortClause; /* sort clause (a list of SortGroupBy's) */
-} RetrieveStmt;
+} RetrieveStmt;
/****************************************************************************
@@ -640,7 +640,7 @@ typedef struct SubSelect
Node *whereClause; /* qualifications */
List *groupClause; /* group by clause */
Node *havingClause; /* having conditional-expression */
-} SubSelect;
+} SubSelect;
/*
* TypeName - specifies a type in definitions
@@ -653,7 +653,7 @@ typedef struct TypeName
bool setof; /* is a set? */
List *arrayBounds; /* array bounds */
int typlen; /* length for char() and varchar() */
-} TypeName;
+} TypeName;
/*
* ParamNo - specifies a parameter reference
@@ -663,7 +663,7 @@ typedef struct ParamNo
NodeTag type;
int number; /* the number of the parameter */
TypeName *typename; /* the typecast */
-} ParamNo;
+} ParamNo;
/*
* A_Expr - binary expressions
@@ -714,7 +714,7 @@ typedef struct ColumnDef
TypeName *typename; /* type of column */
bool is_not_null; /* flag to NOT NULL constraint */
char *defval; /* default value of column */
-} ColumnDef;
+} ColumnDef;
/*
* Ident -
@@ -730,7 +730,7 @@ typedef struct Ident
List *indirection; /* array references */
bool isRel; /* is a relation - filled in by
* transformExpr() */
-} Ident;
+} Ident;
/*
* FuncCall - a function/aggregate invocation
@@ -740,7 +740,7 @@ typedef struct FuncCall
NodeTag type;
char *funcname; /* name of function */
List *args; /* the arguments (list of exprs) */
-} FuncCall;
+} FuncCall;
/*
* A_Indices - array reference or bounds ([lidx:uidx] or [uidx])
@@ -763,7 +763,7 @@ typedef struct ResTarget
List *indirection; /* array references */
Node *val; /* the value of the result (A_Expr or
* Attr) (or A_Const) */
-} ResTarget;
+} ResTarget;
/*
* ParamString - used in with clauses
@@ -773,7 +773,7 @@ typedef struct ParamString
NodeTag type;
char *name;
char *val;
-} ParamString;
+} ParamString;
/*
* TimeRange - specifies a time range
@@ -783,7 +783,7 @@ typedef struct TimeRange
NodeTag type;
char *startDate;
char *endDate; /* snapshot if NULL */
-} TimeRange;
+} TimeRange;
/*
* RelExpr - relation expressions
@@ -794,7 +794,7 @@ typedef struct RelExpr
char *relname; /* the relation name */
bool inh; /* inheritance query */
TimeRange *timeRange; /* the time range */
-} RelExpr;
+} RelExpr;
/*
* SortGroupBy - for order by clause
@@ -806,7 +806,7 @@ typedef struct SortGroupBy
char *range;
char *name; /* name of column to sort on */
char *useOp; /* operator to use */
-} SortGroupBy;
+} SortGroupBy;
/*
* RangeVar - range variable, used in from clauses
@@ -816,7 +816,7 @@ typedef struct RangeVar
NodeTag type;
RelExpr *relExpr; /* the relation expression */
char *name; /* the name to be referenced (optional) */
-} RangeVar;
+} RangeVar;
/*
* IndexElem - index parameters (used in create index)
@@ -828,7 +828,7 @@ typedef struct IndexElem
List *args; /* if not NULL, function index */
char *class;
TypeName *tname; /* type of index's keys (optional) */
-} IndexElem;
+} IndexElem;
/*
* DefElem -
@@ -839,7 +839,7 @@ typedef struct DefElem
NodeTag type;
char *defname;
Node *arg; /* a (Value *) or a (TypeName *) */
-} DefElem;
+} DefElem;
/****************************************************************************
@@ -859,7 +859,7 @@ typedef struct TargetEntry
Resdom *resdom; /* fjoin overload this to be a list?? */
Fjoin *fjoin;
Node *expr; /* can be a list too */
-} TargetEntry;
+} TargetEntry;
/*
* RangeTblEntry -
@@ -885,7 +885,7 @@ typedef struct RangeTblEntry
bool archive; /* filled in by plan_archive */
bool inFromCl; /* comes from From Clause */
TimeQual timeQual; /* filled in by pg_plan */
-} RangeTblEntry;
+} RangeTblEntry;
/*
* SortClause -
@@ -896,7 +896,7 @@ typedef struct SortClause
NodeTag type;
Resdom *resdom; /* attributes in tlist to be sorted */
Oid opoid; /* sort operators */
-} SortClause;
+} SortClause;
/*
* GroupClause -
@@ -907,6 +907,6 @@ typedef struct GroupClause
NodeTag type;
TargetEntry *entry; /* attributes to group on */
Oid grpOpoid; /* the sort operator to use */
-} GroupClause;
+} GroupClause;
#endif /* PARSENODES_H */
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index 166ce53bd63fa6b31949a6a8c2e6b7ca75efe0c9..e3e3574193d866dc58529115c3484e79dea1c550 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_list.h,v 1.7 1997/09/08 02:37:24 momjian Exp $
+ * $Id: pg_list.h,v 1.8 1997/09/08 21:52:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@ typedef struct Value
long ival;
double dval;
} val;
-} Value;
+} Value;
#define intVal(v) (((Value *)v)->val.ival)
#define floatVal(v) (((Value *)v)->val.dval)
@@ -53,7 +53,7 @@ typedef struct List
int int_value;
} elem;
struct List *next;
-} List;
+} List;
#define NIL ((List *) NULL)
@@ -81,36 +81,36 @@ typedef struct List
/*
* function prototypes in nodes/list.c
*/
-extern int length(List * list);
-extern List *append(List * list1, List * list2);
-extern List *nconc(List * list1, List * list2);
-extern List *lcons(void *datum, List * list);
-extern bool member(void *foo, List * bar);
+extern int length(List *list);
+extern List *append(List *list1, List *list2);
+extern List *nconc(List *list1, List *list2);
+extern List *lcons(void *datum, List *list);
+extern bool member(void *foo, List *bar);
extern Value *makeInteger(long i);
extern Value *makeFloat(double d);
extern Value *makeString(char *str);
extern List *makeList(void *elem,...);
-extern List *lappend(List * list, void *obj);
-extern List *lremove(void *elem, List * list);
-extern void freeList(List * list);
-extern List *LispRemove(void *elem, List * list);
+extern List *lappend(List *list, void *obj);
+extern List *lremove(void *elem, List *list);
+extern void freeList(List *list);
+extern List *LispRemove(void *elem, List *list);
-extern void *nth(int n, List * l);
-extern void set_nth(List * l, int n, void *elem);
+extern void *nth(int n, List *l);
+extern void set_nth(List *l, int n, void *elem);
-List *lconsi(int datum, List * list);
-List *lappendi(List * list, int datum);
+List *lconsi(int datum, List *list);
+List *lappendi(List *list, int datum);
extern bool intMember(int, List *);
-extern List *intAppend(List * list1, List * list2);
+extern List *intAppend(List *list1, List *list2);
-extern int nthi(int n, List * l);
+extern int nthi(int n, List *l);
extern List *nreverse(List *);
extern List *set_difference(List *, List *);
extern List *set_differencei(List *, List *);
-extern List *LispUnion(List * foo, List * bar);
-extern List *LispUnioni(List * foo, List * bar);
-extern bool same(List * foo, List * bar);
+extern List *LispUnion(List *foo, List *bar);
+extern List *LispUnioni(List *foo, List *bar);
+extern bool same(List *foo, List *bar);
/* should be in nodes.h but needs List */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index c20b9b6376463f20a78804fab43026afb24edf1a..77447935b806d2e0323b673e5fad53da082d15e6 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: plannodes.h,v 1.9 1997/09/08 20:58:48 momjian Exp $
+ * $Id: plannodes.h,v 1.10 1997/09/08 21:52:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -75,7 +75,7 @@ typedef struct Plan
List *qual; /* Node* or List* ?? */
struct Plan *lefttree;
struct Plan *righttree;
-} Plan;
+} Plan;
/* ----------------
* these are are defined to avoid confusion problems with "left"
@@ -116,7 +116,7 @@ typedef struct Result
Plan plan;
Node *resconstantqual;
ResultState *resstate;
-} Result;
+} Result;
/* ----------------
* append node
@@ -141,7 +141,7 @@ typedef struct Scan
Plan plan;
Index scanrelid; /* relid is index into the range table */
CommonScanState *scanstate;
-} Scan;
+} Scan;
/* ----------------
* sequential scan node
@@ -159,7 +159,7 @@ typedef struct IndexScan
List *indxid;
List *indxqual;
IndexScanState *indxstate;
-} IndexScan;
+} IndexScan;
/*
* ==========
@@ -181,7 +181,7 @@ typedef struct NestLoop
{
Join join;
NestLoopState *nlstate;
-} NestLoop;
+} NestLoop;
/* ----------------
* merge join node
@@ -195,7 +195,7 @@ typedef struct MergeJoin
Oid *mergerightorder;/* inner sort operator */
Oid *mergeleftorder; /* outer sort operator */
MergeJoinState *mergestate;
-} MergeJoin;
+} MergeJoin;
/* ----------------
* hash join (probe) node
@@ -211,7 +211,7 @@ typedef struct HashJoin
IpcMemoryKey hashjointablekey;
int hashjointablesize;
bool hashdone;
-} HashJoin;
+} HashJoin;
/* ---------------
* aggregate node
@@ -242,7 +242,7 @@ typedef struct Group
int numCols; /* number of group columns */
AttrNumber *grpColIdx; /* index into the target list */
GroupState *grpstate;
-} Group;
+} Group;
/*
* ==========
@@ -254,7 +254,7 @@ typedef struct Temp
Plan plan;
Oid tempid;
int keycount;
-} Temp;
+} Temp;
/* ----------------
* materialization node
@@ -266,7 +266,7 @@ typedef struct Material
Oid tempid;
int keycount;
MaterialState *matstate;
-} Material;
+} Material;
/* ----------------
* sort node
@@ -280,7 +280,7 @@ typedef struct Sort
SortState *sortstate;
void *psortstate;
bool cleaned;
-} Sort;
+} Sort;
/* ----------------
* unique node
@@ -296,7 +296,7 @@ typedef struct Unique
AttrNumber uniqueAttrNum; /* attribute number of attribute to select
* distinct on */
UniqueState *uniquestate;
-} Unique;
+} Unique;
/* ----------------
* hash build node
@@ -310,7 +310,7 @@ typedef struct Hash
HashJoinTable hashtable;
IpcMemoryKey hashtablekey;
int hashtablesize;
-} Hash;
+} Hash;
/* ---------------------
* choose node
@@ -320,7 +320,7 @@ typedef struct Choose
{
Plan plan;
List *chooseplanlist;
-} Choose;
+} Choose;
/* -------------------
* Tee node information
@@ -340,6 +340,6 @@ typedef struct Tee
List *rtentries; /* the range table for the plan below the
* Tee may be different than the parent
* plans */
-} Tee;
+} Tee;
#endif /* PLANNODES_H */
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 733a7c06ff287eb51b87cdf546ce69bab1bfabcd..f0706d1392e04c6699d48985d91c1172cb8efed5 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: primnodes.h,v 1.10 1997/09/08 20:58:50 momjian Exp $
+ * $Id: primnodes.h,v 1.11 1997/09/08 21:52:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@ typedef struct Resdom
Index reskey;
Oid reskeyop;
int resjunk;
-} Resdom;
+} Resdom;
/* -------------
* Fjoin
@@ -73,7 +73,7 @@ typedef struct Fjoin
List *fj_innerNode;
DatumPtr fj_results;
BoolPtr fj_alwaysDone;
-} Fjoin;
+} Fjoin;
/* ----------------
* Expr
@@ -87,7 +87,7 @@ typedef struct Fjoin
typedef enum OpType
{
OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR
-} OpType;
+} OpType;
typedef struct Expr
{
@@ -96,7 +96,7 @@ typedef struct Expr
OpType opType; /* type of the op */
Node *oper; /* could be Oper or Func */
List *args; /* list of argument nodes */
-} Expr;
+} Expr;
/* ----------------
* Var
@@ -124,7 +124,7 @@ typedef struct Var
Oid vartype;
Index varnoold; /* only used by optimizer */
AttrNumber varoattno; /* only used by optimizer */
-} Var;
+} Var;
/* ----------------
* Oper
@@ -154,7 +154,7 @@ typedef struct Oper
Oid opresulttype;
int opsize;
FunctionCachePtr op_fcache;
-} Oper;
+} Oper;
/* ----------------
@@ -183,7 +183,7 @@ typedef struct Const
bool constbyval;
bool constisset;
bool constiscast;
-} Const;
+} Const;
/* ----------------
* Param
@@ -220,7 +220,7 @@ typedef struct Param
char *paramname;
Oid paramtype;
List *param_tlist;
-} Param;
+} Param;
/* ----------------
@@ -248,7 +248,7 @@ typedef struct Func
FunctionCachePtr func_fcache;
List *func_tlist;
List *func_planlist;
-} Func;
+} Func;
/* ----------------
* Aggreg
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index bef8ce3a6cec2c30600cab08cb748f888d67a5e3..bd384e864d294edf250c1944b6dba9f2f4231fdd 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: print.h,v 1.4 1997/09/08 02:37:28 momjian Exp $
+ * $Id: print.h,v 1.5 1997/09/08 21:52:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,14 +21,14 @@
extern void print(void *obj);
extern void pprint(void *obj);
-extern void print_rt(List * rtable);
-extern void print_expr(Node * expr, List * rtable);
-extern void print_keys(List * keys, List * rtable);
-extern void print_tl(List * tlist, List * rtable);
-extern void print_slot(TupleTableSlot * slot);
+extern void print_rt(List *rtable);
+extern void print_expr(Node *expr, List *rtable);
+extern void print_keys(List *keys, List *rtable);
+extern void print_tl(List *tlist, List *rtable);
+extern void print_slot(TupleTableSlot *slot);
extern void
-print_plan_recursive(Plan * p, Query * parsetree,
+print_plan_recursive(Plan *p, Query *parsetree,
int indentLevel, char *label);
-extern void print_plan(Plan * p, Query * parsetree);
+extern void print_plan(Plan *p, Query *parsetree);
#endif /* PRINT_H */
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 4dfcb6692dccdb65370e795b4fc1ab86ca1a81d9..8c2fb363a9251e8ad6f00b8217611ed6888f5f00 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: relation.h,v 1.6 1997/09/08 02:37:29 momjian Exp $
+ * $Id: relation.h,v 1.7 1997/09/08 21:53:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -106,9 +106,9 @@ typedef struct Rel
List *joininfo; /* join clauses */
List *innerjoin;
List *superrels;
-} Rel;
+} Rel;
-extern Var *get_expr(TargetEntry * foo);
+extern Var *get_expr(TargetEntry *foo);
typedef struct MergeOrder
{
@@ -118,12 +118,12 @@ typedef struct MergeOrder
Oid right_operator;
Oid left_type;
Oid right_type;
-} MergeOrder;
+} MergeOrder;
typedef enum OrderType
{
MERGE_ORDER, SORTOP_ORDER
-} OrderType;
+} OrderType;
typedef struct PathOrder
{
@@ -133,7 +133,7 @@ typedef struct PathOrder
Oid *sortop;
MergeOrder *merge;
} ord;
-} PathOrder;
+} PathOrder;
typedef struct Path
{
@@ -150,7 +150,7 @@ typedef struct Path
Cost outerjoincost;
Relid joinid;
List *locclauseinfo;
-} Path;
+} Path;
typedef struct IndexPath
{
@@ -159,7 +159,7 @@ typedef struct IndexPath
List *indexqual;
int *indexkeys; /* to transform heap attnos into index
* ones */
-} IndexPath;
+} IndexPath;
typedef struct JoinPath
{
@@ -167,7 +167,7 @@ typedef struct JoinPath
List *pathclauseinfo;
Path *outerjoinpath;
Path *innerjoinpath;
-} JoinPath;
+} JoinPath;
typedef struct MergePath
{
@@ -175,7 +175,7 @@ typedef struct MergePath
List *path_mergeclauses;
List *outersortkeys;
List *innersortkeys;
-} MergePath;
+} MergePath;
typedef struct HashPath
{
@@ -183,7 +183,7 @@ typedef struct HashPath
List *path_hashclauses;
List *outerhashkeys;
List *innerhashkeys;
-} HashPath;
+} HashPath;
/******
* Keys
@@ -194,14 +194,14 @@ typedef struct OrderKey
NodeTag type;
int attribute_number;
Index array_index;
-} OrderKey;
+} OrderKey;
typedef struct JoinKey
{
NodeTag type;
Var *outer;
Var *inner;
-} JoinKey;
+} JoinKey;
/*******
* clause info
@@ -221,26 +221,26 @@ typedef struct CInfo
/* hashjoin only */
Oid hashjoinoperator;
Relid cinfojoinid;
-} CInfo;
+} CInfo;
typedef struct JoinMethod
{
NodeTag type;
List *jmkeys;
List *clauses;
-} JoinMethod;
+} JoinMethod;
typedef struct HInfo
{
JoinMethod jmethod;
Oid hashop;
-} HInfo;
+} HInfo;
typedef struct MInfo
{
JoinMethod jmethod;
MergeOrder *m_ordering;
-} MInfo;
+} MInfo;
typedef struct JInfo
{
@@ -250,7 +250,7 @@ typedef struct JInfo
bool mergesortable;
bool hashjoinable;
bool inactive;
-} JInfo;
+} JInfo;
typedef struct Iter
{
@@ -258,7 +258,7 @@ typedef struct Iter
Node *iterexpr;
Oid itertype; /* type of the iter expr (use for type
* checking) */
-} Iter;
+} Iter;
/*
** Stream:
@@ -292,6 +292,6 @@ typedef struct Stream
bool groupup;
Cost groupcost;
Cost groupsel;
-} Stream;
+} Stream;
#endif /* RELATION_H */
diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h
index d6f034a4b58d7a2c2fa8ec1d41df04e254008352..6d1b0b8fbff5432cbe7c9f753e2dfcaac2342ca2 100644
--- a/src/include/optimizer/clauseinfo.h
+++ b/src/include/optimizer/clauseinfo.h
@@ -6,21 +6,21 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: clauseinfo.h,v 1.3 1997/09/08 02:37:32 momjian Exp $
+ * $Id: clauseinfo.h,v 1.4 1997/09/08 21:53:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef CLAUSEINFO_H
#define CLAUSEINFO_H
-extern bool valid_or_clause(CInfo * clauseinfo);
-extern List *get_actual_clauses(List * clauseinfo_list);
+extern bool valid_or_clause(CInfo *clauseinfo);
+extern List *get_actual_clauses(List *clauseinfo_list);
extern void
-get_relattvals(List * clauseinfo_list, List ** attnos,
- List ** values, List ** flags);
+get_relattvals(List *clauseinfo_list, List **attnos,
+ List **values, List **flags);
extern void
-get_joinvars(Oid relid, List * clauseinfo_list,
- List ** attnos, List ** values, List ** flags);
-extern List *get_opnos(List * clauseinfo_list);
+get_joinvars(Oid relid, List *clauseinfo_list,
+ List **attnos, List **values, List **flags);
+extern List *get_opnos(List *clauseinfo_list);
#endif /* CLAUSEINFO_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index d3a4ef63d6bd5bbe1273b3964f3887f24a98113a..ebf6cfc04c437cabc32e46dc69bcd60e0f2f5d96 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: clauses.h,v 1.6 1997/09/08 20:58:54 momjian Exp $
+ * $Id: clauses.h,v 1.7 1997/09/08 21:53:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,39 +15,39 @@
#include <nodes/primnodes.h>
-extern Expr *make_clause(int type, Node * oper, List * args);
-extern bool is_opclause(Node * clause);
-extern Expr *make_opclause(Oper * op, Var * leftop, Var * rightop);
-extern Var *get_leftop(Expr * clause);
-extern Var *get_rightop(Expr * clause);
-
-extern bool is_funcclause(Node * clause);
-extern Expr *make_funcclause(Func * func, List * funcargs);
-
-extern bool or_clause(Node * clause);
-extern Expr *make_orclause(List * orclauses);
-
-extern bool not_clause(Node * clause);
-extern Expr *make_notclause(Expr * notclause);
-extern Expr *get_notclausearg(Expr * notclause);
-
-extern bool and_clause(Node * clause);
-extern Expr *make_andclause(List * andclauses);
-
-extern List *pull_constant_clauses(List * quals, List ** constantQual);
-extern void clause_relids_vars(Node * clause, List ** relids, List ** vars);
-extern int NumRelids(Node * clause);
-extern bool contains_not(Node * clause);
-extern bool join_clause_p(Node * clause);
-extern bool qual_clause_p(Node * clause);
-extern void fix_opid(Node * clause);
-extern List *fix_opids(List * clauses);
+extern Expr *make_clause(int type, Node *oper, List *args);
+extern bool is_opclause(Node *clause);
+extern Expr *make_opclause(Oper *op, Var *leftop, Var *rightop);
+extern Var *get_leftop(Expr *clause);
+extern Var *get_rightop(Expr *clause);
+
+extern bool is_funcclause(Node *clause);
+extern Expr *make_funcclause(Func *func, List *funcargs);
+
+extern bool or_clause(Node *clause);
+extern Expr *make_orclause(List *orclauses);
+
+extern bool not_clause(Node *clause);
+extern Expr *make_notclause(Expr *notclause);
+extern Expr *get_notclausearg(Expr *notclause);
+
+extern bool and_clause(Node *clause);
+extern Expr *make_andclause(List *andclauses);
+
+extern List *pull_constant_clauses(List *quals, List **constantQual);
+extern void clause_relids_vars(Node *clause, List **relids, List **vars);
+extern int NumRelids(Node *clause);
+extern bool contains_not(Node *clause);
+extern bool join_clause_p(Node *clause);
+extern bool qual_clause_p(Node *clause);
+extern void fix_opid(Node *clause);
+extern List *fix_opids(List *clauses);
extern void
-get_relattval(Node * clause, int *relid,
- AttrNumber *attno, Datum * constval, int *flag);
+get_relattval(Node *clause, int *relid,
+ AttrNumber *attno, Datum *constval, int *flag);
extern void
-get_rels_atts(Node * clause, int *relid1,
+get_rels_atts(Node *clause, int *relid1,
AttrNumber *attno1, int *relid2, AttrNumber *attno2);
-extern void CommuteClause(Node * clause);
+extern void CommuteClause(Node *clause);
#endif /* CLAUSES_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index a0ab3a59466fc5f51f49e13c8edb3a9d209313d8..8402e7a265137a08e8e1e15afaad15d6986814b6 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: cost.h,v 1.4 1997/09/08 02:37:40 momjian Exp $
+ * $Id: cost.h,v 1.5 1997/09/08 21:53:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,37 +26,37 @@ extern bool _enable_mergesort_;
extern bool _enable_hashjoin_;
extern Cost cost_seqscan(int relid, int relpages, int reltuples);
-extern Cost
+extern Cost
cost_index(Oid indexid, int expected_indexpages, Cost selec,
int relpages, int reltuples, int indexpages,
int indextuples, bool is_injoin);
-extern Cost cost_sort(List * keys, int tuples, int width, bool noread);
-extern Cost
+extern Cost cost_sort(List *keys, int tuples, int width, bool noread);
+extern Cost
cost_nestloop(Cost outercost, Cost innercost, int outertuples,
int innertuples, int outerpages, bool is_indexjoin);
-extern Cost
+extern Cost
cost_mergesort(Cost outercost, Cost innercost,
- List * outersortkeys, List * innersortkeys,
+ List *outersortkeys, List *innersortkeys,
int outersize, int innersize, int outerwidth, int innerwidth);
-extern Cost
-cost_hashjoin(Cost outercost, Cost innercost, List * outerkeys,
- List * innerkeys, int outersize, int innersize,
+extern Cost
+cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys,
+ List *innerkeys, int outersize, int innersize,
int outerwidth, int innerwidth);
-extern int compute_rel_size(Rel * rel);
-extern int compute_rel_width(Rel * rel);
-extern int compute_joinrel_size(JoinPath * joinpath);
+extern int compute_rel_size(Rel *rel);
+extern int compute_rel_width(Rel *rel);
+extern int compute_joinrel_size(JoinPath *joinpath);
extern int page_size(int tuples, int width);
/*
* prototypes for fuctions in clausesel.h--
* routines to compute clause selectivities
*/
-extern void set_clause_selectivities(List * clauseinfo_list, Cost new_selectivity);
-extern Cost product_selec(List * clauseinfo_list);
-extern void set_rest_relselec(Query * root, List * rel_list);
-extern void set_rest_selec(Query * root, List * clauseinfo_list);
-extern Cost
-compute_clause_selec(Query * root,
- Node * clause, List * or_selectivities);
+extern void set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity);
+extern Cost product_selec(List *clauseinfo_list);
+extern void set_rest_relselec(Query *root, List *rel_list);
+extern void set_rest_selec(Query *root, List *clauseinfo_list);
+extern Cost
+compute_clause_selec(Query *root,
+ Node *clause, List *or_selectivities);
#endif /* COST_H */
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index d9e63a1d8fd18748f7663089a01acb632ad78007..ef81545f2bfbbef51b3f5be8b2620ce940b73e7e 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo.h,v 1.5 1997/09/08 02:37:42 momjian Exp $
+ * $Id: geqo.h,v 1.6 1997/09/08 21:53:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -66,13 +66,13 @@ double SelectionBias;
/* ^^^ */
/* geqo prototypes */
-extern Rel *geqo(Query * root);
+extern Rel *geqo(Query *root);
extern void geqo_params(int string_length);
-extern Cost geqo_eval(Query * root, Gene * tour, int num_gene);
+extern Cost geqo_eval(Query *root, Gene *tour, int num_gene);
double geqo_log(double x, double b);
-extern Rel *gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_rel);
+extern Rel *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel);
#endif /* GEQO_H */
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index 219f503d914cbd72a81243110723d6b59d988dad..27c9eaad47b5d978aeb1819da4eead45147eecdc 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_copy.h,v 1.3 1997/09/08 02:37:43 momjian Exp $
+ * $Id: geqo_copy.h,v 1.4 1997/09/08 21:53:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,6 +22,6 @@
#define GEQO_COPY_H
-extern void geqo_copy(Chromosome * chromo1, Chromosome * chromo2, int string_length);
+extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length);
#endif /* GEQO_COPY_H */
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 0363404411010f0ddab093aab772c9b089688ebf..ade40fa7405624808d3a642902ff284c9184b7eb 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_gene.h,v 1.3 1997/09/08 02:37:44 momjian Exp $
+ * $Id: geqo_gene.h,v 1.4 1997/09/08 21:53:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,19 +26,19 @@
/* we presume that int instead of Relid
is o.k. for Gene; so don't change it! */
typedef
-int Gene;
+int Gene;
typedef struct Chromosome
{
Gene *string;
Cost worth;
-} Chromosome;
+} Chromosome;
typedef struct Pool
{
Chromosome *data;
int size;
int string_length;
-} Pool;
+} Pool;
#endif /* GEQO_GENE_H */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 83e896981502265529a1139abe08f0ee50979fc5..64b8ddf432f2a088105a315b7a4c9c8753463cce 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.h,v 1.3 1997/09/08 02:37:46 momjian Exp $
+ * $Id: geqo_misc.h,v 1.4 1997/09/08 21:53:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,12 +23,12 @@
#include <stdio.h>
-extern void print_pool(FILE * fp, Pool * pool, int start, int stop);
-extern void print_gen(FILE * fp, Pool * pool, int generation);
-extern void print_edge_table(FILE * fp, Edge * edge_table, int num_gene);
+extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
+extern void print_gen(FILE *fp, Pool *pool, int generation);
+extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene);
-extern void geqo_print_rel(Query * root, Rel * rel);
-extern void geqo_print_path(Query * root, Path * path, int indent);
-extern void geqo_print_joinclauses(Query * root, List * clauses);
+extern void geqo_print_rel(Query *root, Rel *rel);
+extern void geqo_print_path(Query *root, Path *path, int indent);
+extern void geqo_print_joinclauses(Query *root, List *clauses);
#endif /* GEQO_MISC_H */
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index d195ba0c117052a104c9a620006331adb55d7766..2a18c8cdfdc5950993e74b727185041337949835 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_mutation.h,v 1.3 1997/09/08 02:37:46 momjian Exp $
+ * $Id: geqo_mutation.h,v 1.4 1997/09/08 21:53:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,6 +22,6 @@
#define GEQO_MUTATION_H
-extern void geqo_mutation(Gene * tour, int num_gene);
+extern void geqo_mutation(Gene *tour, int num_gene);
#endif /* GEQO_MUTATION_H */
diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h
index b9a9b7e096c7d9941a75923bf5c0785e8dc6845a..8be4032a227df3c1473bfb2b4e3276bed6eb5fc7 100644
--- a/src/include/optimizer/geqo_paths.h
+++ b/src/include/optimizer/geqo_paths.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_paths.h,v 1.3 1997/09/08 02:37:47 momjian Exp $
+ * $Id: geqo_paths.h,v 1.4 1997/09/08 21:53:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#define GEQO_PATHS_H
-extern List *geqo_prune_rels(List * rel_list);
-extern void geqo_rel_paths(Rel * rel);
+extern List *geqo_prune_rels(List *rel_list);
+extern void geqo_rel_paths(Rel *rel);
#endif /* GEQO_PATHS_H */
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index 2642a8cc3d60cf8ea1a37af32776af5247e81ec4..3fe9c71bd24c5624ac4ae117d28ffdc783e42da1 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_pool.h,v 1.3 1997/09/08 02:37:47 momjian Exp $
+ * $Id: geqo_pool.h,v 1.4 1997/09/08 21:53:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,14 +24,14 @@
extern Pool *alloc_pool(int pool_size, int string_length);
-extern void free_pool(Pool * pool);
+extern void free_pool(Pool *pool);
-extern void random_init_pool(Query * root, Pool * pool, int strt, int stop);
+extern void random_init_pool(Query *root, Pool *pool, int strt, int stop);
extern Chromosome *alloc_chromo(int string_length);
-extern void free_chromo(Chromosome * chromo);
+extern void free_chromo(Chromosome *chromo);
-extern void spread_chromo(Chromosome * chromo, Pool * pool);
+extern void spread_chromo(Chromosome *chromo, Pool *pool);
-extern void sort_pool(Pool * pool);
+extern void sort_pool(Pool *pool);
#endif /* GEQO_POOL_H */
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index 0b678504a46b282593893474cb4b5bc78e6a2daf..eea3c58a9f80e609832330c4531610d60d7b6593 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_recombination.h,v 1.3 1997/09/08 02:37:48 momjian Exp $
+ * $Id: geqo_recombination.h,v 1.4 1997/09/08 21:53:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
#define GEQO_RECOMBINATION_H
-extern void init_tour(Gene * tour, int num_gene);
+extern void init_tour(Gene *tour, int num_gene);
/* edge recombination crossover [ERX] */
@@ -34,14 +34,14 @@ typedef struct Edge
Gene edge_list[4]; /* list of edges */
int total_edges;
int unused_edges;
-} Edge;
+} Edge;
extern Edge *alloc_edge_table(int num_gene);
-extern void free_edge_table(Edge * edge_table);
+extern void free_edge_table(Edge *edge_table);
-extern float gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table);
+extern float gimme_edge_table(Gene *tour1, Gene *tour2, int num_gene, Edge *edge_table);
-extern int gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene);
+extern int gimme_tour(Edge *edge_table, Gene *new_gene, int num_gene);
/* partially matched crossover [PMX] */
@@ -49,7 +49,7 @@ extern int gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene);
#define DAD 1 /* indicator for gene from dad */
#define MOM 0 /* indicator for gene from mom */
-extern void pmx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene);
+extern void pmx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene);
typedef struct City
@@ -58,22 +58,22 @@ typedef struct City
int tour1_position;
int used;
int select_list;
-} City;
+} City;
extern City *alloc_city_table(int num_gene);
-extern void free_city_table(City * city_table);
+extern void free_city_table(City *city_table);
/* cycle crossover [CX] */
-extern int cx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
+extern int cx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table);
/* position crossover [PX] */
-extern void px(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table);
+extern void px(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table);
/* order crossover [OX1] according to Davis */
-extern void ox1(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
+extern void ox1(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table);
/* order crossover [OX2] according to Syswerda */
-extern void ox2(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table);
+extern void ox2(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table);
#endif /* GEQO_RECOMBINATION_H */
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index 910e2048915e74683967fd11afbded224080b8b1..ea7b26492f887205895e3da3f0e267aa86224346 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_selection.h,v 1.3 1997/09/08 02:37:49 momjian Exp $
+ * $Id: geqo_selection.h,v 1.4 1997/09/08 21:53:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,6 +23,6 @@
#define GEQO_SELECTION_H
-extern void geqo_selection(Chromosome * momma, Chromosome * daddy, Pool * pool, double bias);
+extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias);
#endif /* GEQO_SELECTION_H */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 505b6a64c28d6fdf133be9b8440489a13e144eb6..b6c43fba8d1c73be48b10d3ddb8fa9c19d0acfb2 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,15 +6,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: joininfo.h,v 1.3 1997/09/08 02:37:50 momjian Exp $
+ * $Id: joininfo.h,v 1.4 1997/09/08 21:53:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef JOININFO_H
#define JOININFO_H
-extern JInfo *joininfo_member(List * join_relids, List * joininfo_list);
-extern JInfo *find_joininfo_node(Rel * this_rel, List * join_relids);
-extern Var *other_join_clause_var(Var * var, Expr * clause);
+extern JInfo *joininfo_member(List *join_relids, List *joininfo_list);
+extern JInfo *find_joininfo_node(Rel *this_rel, List *join_relids);
+extern Var *other_join_clause_var(Var *var, Expr *clause);
#endif /* JOININFO_H */
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index cf85d6ef174a23b9618ae90117a06c88e6be2493..85af02e873ab2f928ae2ffc126285a16df40c7c1 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: keys.h,v 1.4 1997/09/08 02:37:51 momjian Exp $
+ * $Id: keys.h,v 1.5 1997/09/08 21:53:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef KEYS_H
#define KEYS_H
-extern bool match_indexkey_operand(int indexkey, Var * operand, Rel * rel);
-extern Var *extract_subkey(JoinKey * jk, int which_subkey);
-extern bool samekeys(List * keys1, List * keys2);
-extern List *collect_index_pathkeys(int *index_keys, List * tlist);
+extern bool match_indexkey_operand(int indexkey, Var *operand, Rel *rel);
+extern Var *extract_subkey(JoinKey *jk, int which_subkey);
+extern bool samekeys(List *keys1, List *keys2);
+extern List *collect_index_pathkeys(int *index_keys, List *tlist);
#endif /* KEYS_H */
diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h
index 9d36ac3aaad679400111b383f20cc261c9842206..eac0035be4748e329fdc55d823f2654c36171b8c 100644
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ordering.h,v 1.5 1997/09/08 02:37:52 momjian Exp $
+ * $Id: ordering.h,v 1.6 1997/09/08 21:53:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,14 +15,14 @@
#include <nodes/relation.h>
-extern bool
-equal_path_path_ordering(PathOrder * path_ordering1,
- PathOrder * path_ordering2);
-extern bool
-equal_path_merge_ordering(Oid * path_ordering,
- MergeOrder * merge_ordering);
-extern bool
-equal_merge_merge_ordering(MergeOrder * merge_ordering1,
- MergeOrder * merge_ordering2);
+extern bool
+equal_path_path_ordering(PathOrder *path_ordering1,
+ PathOrder *path_ordering2);
+extern bool
+equal_path_merge_ordering(Oid *path_ordering,
+ MergeOrder *merge_ordering);
+extern bool
+equal_merge_merge_ordering(MergeOrder *merge_ordering1,
+ MergeOrder *merge_ordering2);
#endif /* ORDERING_H */
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index b5538513007aec5e87dacd6b77cffe16c77bbc81..ae6848abb57ddcd84856a8ffdab6c3f1ef186b2d 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pathnode.h,v 1.3 1997/09/08 02:37:52 momjian Exp $
+ * $Id: pathnode.h,v 1.4 1997/09/08 21:53:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,40 +16,40 @@
/*
* prototypes for pathnode.c
*/
-extern bool path_is_cheaper(Path * path1, Path * path2);
-extern Path *set_cheapest(Rel * parent_rel, List * pathlist);
+extern bool path_is_cheaper(Path *path1, Path *path2);
+extern Path *set_cheapest(Rel *parent_rel, List *pathlist);
extern List *
-add_pathlist(Rel * parent_rel, List * unique_paths,
- List * new_paths);
-extern Path *create_seqscan_path(Rel * rel);
+add_pathlist(Rel *parent_rel, List *unique_paths,
+ List *new_paths);
+extern Path *create_seqscan_path(Rel *rel);
extern IndexPath *
-create_index_path(Query * root, Rel * rel, Rel * index,
- List * restriction_clauses, bool is_join_scan);
+create_index_path(Query *root, Rel *rel, Rel *index,
+ List *restriction_clauses, bool is_join_scan);
extern JoinPath *
-create_nestloop_path(Rel * joinrel, Rel * outer_rel,
- Path * outer_path, Path * inner_path, List * keys);
+create_nestloop_path(Rel *joinrel, Rel *outer_rel,
+ Path *outer_path, Path *inner_path, List *keys);
extern MergePath *
-create_mergesort_path(Rel * joinrel, int outersize,
- int innersize, int outerwidth, int innerwidth, Path * outer_path,
- Path * inner_path, List * keys, MergeOrder * order,
- List * mergeclauses, List * outersortkeys, List * innersortkeys);
+create_mergesort_path(Rel *joinrel, int outersize,
+ int innersize, int outerwidth, int innerwidth, Path *outer_path,
+ Path *inner_path, List *keys, MergeOrder *order,
+ List *mergeclauses, List *outersortkeys, List *innersortkeys);
extern HashPath *
-create_hashjoin_path(Rel * joinrel, int outersize,
- int innersize, int outerwidth, int innerwidth, Path * outer_path,
- Path * inner_path, List * keys, Oid operator, List * hashclauses,
- List * outerkeys, List * innerkeys);
+create_hashjoin_path(Rel *joinrel, int outersize,
+ int innersize, int outerwidth, int innerwidth, Path *outer_path,
+ Path *inner_path, List *keys, Oid operator, List *hashclauses,
+ List *outerkeys, List *innerkeys);
/*
* prototypes for rel.c
*/
-extern Rel *rel_member(List * relid, List * rels);
-extern Rel *get_base_rel(Query * root, int relid);
-extern Rel *get_join_rel(Query * root, List * relid);
+extern Rel *rel_member(List *relid, List *rels);
+extern Rel *get_base_rel(Query *root, int relid);
+extern Rel *get_join_rel(Query *root, List *relid);
/*
* prototypes for indexnode.h
*/
-extern List *find_relation_indices(Query * root, Rel * rel);
+extern List *find_relation_indices(Query *root, Rel *rel);
#endif /* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index c3403e19a04f48e87f0e72bcd3bb924239a540aa..61a9cea940f9962c8f11145665488429b7ef2dbd 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: paths.h,v 1.3 1997/09/08 02:37:53 momjian Exp $
+ * $Id: paths.h,v 1.4 1997/09/08 21:53:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,35 +17,35 @@
/*
* allpaths.h
*/
-extern List *find_paths(Query * root, List * rels);
+extern List *find_paths(Query *root, List *rels);
/*
* indxpath.h
* routines to generate index paths
*/
extern List *
-find_index_paths(Query * root, Rel * rel, List * indices,
- List * clauseinfo_list,
- List * joininfo_list);
+find_index_paths(Query *root, Rel *rel, List *indices,
+ List *clauseinfo_list,
+ List *joininfo_list);
/*
* joinpath.h
* routines to create join paths
*/
-extern void find_all_join_paths(Query * root, List * joinrels);
+extern void find_all_join_paths(Query *root, List *joinrels);
/*
* orindxpath.h
*/
-extern List *create_or_index_paths(Query * root, Rel * rel, List * clauses);
+extern List *create_or_index_paths(Query *root, Rel *rel, List *clauses);
/*
* hashutils.h
* routines to deal with hash keys and clauses
*/
extern List *
-group_clauses_by_hashop(List * clauseinfo_list,
+group_clauses_by_hashop(List *clauseinfo_list,
int inner_relid);
/*
@@ -53,45 +53,45 @@ group_clauses_by_hashop(List * clauseinfo_list,
* generic join method key/clause routines
*/
extern List *
-match_pathkeys_joinkeys(List * pathkeys,
- List * joinkeys, List * joinclauses, int which_subkey,
- List ** matchedJoinClausesPtr);
+match_pathkeys_joinkeys(List *pathkeys,
+ List *joinkeys, List *joinclauses, int which_subkey,
+ List **matchedJoinClausesPtr);
extern List *
-extract_path_keys(List * joinkeys, List * tlist,
+extract_path_keys(List *joinkeys, List *tlist,
int which_subkey);
extern Path *
-match_paths_joinkeys(List * joinkeys, PathOrder * ordering,
- List * paths, int which_subkey);
+match_paths_joinkeys(List *joinkeys, PathOrder *ordering,
+ List *paths, int which_subkey);
extern List *
-new_join_pathkeys(List * outer_pathkeys,
- List * join_rel_tlist, List * joinclauses);
+new_join_pathkeys(List *outer_pathkeys,
+ List *join_rel_tlist, List *joinclauses);
/*
* mergeutils.h
* routines to deal with merge keys and clauses
*/
extern List *
-group_clauses_by_order(List * clauseinfo_list,
+group_clauses_by_order(List *clauseinfo_list,
int inner_relid);
extern MInfo *
-match_order_mergeinfo(PathOrder * ordering,
- List * mergeinfo_list);
+match_order_mergeinfo(PathOrder *ordering,
+ List *mergeinfo_list);
/*
* joinrels.h
* routines to determine which relations to join
*/
-extern List *find_join_rels(Query * root, List * outer_rels);
-extern void add_new_joininfos(Query * root, List * joinrels, List * outerrels);
-extern List *final_join_rels(List * join_rel_list);
+extern List *find_join_rels(Query *root, List *outer_rels);
+extern void add_new_joininfos(Query *root, List *joinrels, List *outerrels);
+extern List *final_join_rels(List *join_rel_list);
/*
* prototypes for path/prune.c
*/
-extern List *prune_joinrels(List * rel_list);
-extern void prune_rel_paths(List * rel_list);
-extern Path *prune_rel_path(Rel * rel, Path * unorderedpath);
-extern List *merge_joinrels(List * rel_list1, List * rel_list2);
-extern List *prune_oldrels(List * old_rels);
+extern List *prune_joinrels(List *rel_list);
+extern void prune_rel_paths(List *rel_list);
+extern Path *prune_rel_path(Rel *rel, Path *unorderedpath);
+extern List *merge_joinrels(List *rel_list1, List *rel_list2);
+extern List *prune_oldrels(List *old_rels);
#endif /* PATHS_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 1a2686e3d31c1fd864eacf34622d05b9bf98bba2..c52e5c1416dcddf5f48c156e257b17d5284b9749 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: plancat.h,v 1.5 1997/09/08 02:37:54 momjian Exp $
+ * $Id: plancat.h,v 1.6 1997/09/08 21:53:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,20 +31,20 @@ typedef struct IdxInfoRetval
Oid *classlist; /* classes of AM operators */
Oid indproc;
Node *indpred;
-} IdxInfoRetval;
+} IdxInfoRetval;
extern void
-relation_info(Query * root,
+relation_info(Query *root,
Oid relid,
- bool * hashindex, int *pages,
+ bool *hashindex, int *pages,
int *tuples);
-extern bool
-index_info(Query * root,
- bool first, int relid, IdxInfoRetval * info);
+extern bool
+index_info(Query *root,
+ bool first, int relid, IdxInfoRetval *info);
-extern Cost
+extern Cost
restriction_selectivity(Oid functionObjectId,
Oid operatorObjectId,
Oid relationObjectId,
@@ -53,11 +53,11 @@ restriction_selectivity(Oid functionObjectId,
int32 constFlag);
extern void
-index_selectivity(Oid indid, Oid * classes, List * opnos,
- Oid relid, List * attnos, List * values, List * flags,
+index_selectivity(Oid indid, Oid *classes, List *opnos,
+ Oid relid, List *attnos, List *values, List *flags,
int32 nkeys, float *idxPages, float *idxSelec);
-extern Cost
+extern Cost
join_selectivity(Oid functionObjectId, Oid operatorObjectId,
Oid relationObjectId1, AttrNumber attributeNumber1,
Oid relationObjectId2, AttrNumber attributeNumber2);
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index af165358123276db60106a98a8421df0f85c60ea..8f2abff9326aeae863a292b5de4814c4699e32b8 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: planmain.h,v 1.4 1997/09/08 20:58:56 momjian Exp $
+ * $Id: planmain.h,v 1.5 1997/09/08 21:53:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,47 +18,47 @@
* prototypes for plan/planmain.c
*/
extern Plan *
-query_planner(Query * root,
- int command_type, List * tlist, List * qual);
+query_planner(Query *root,
+ int command_type, List *tlist, List *qual);
/*
* prototypes for plan/createplan.c
*/
-extern Plan *create_plan(Path * best_path);
+extern Plan *create_plan(Path *best_path);
extern SeqScan *
-make_seqscan(List * qptlist, List * qpqual, Index scanrelid,
- Plan * lefttree);
+make_seqscan(List *qptlist, List *qpqual, Index scanrelid,
+ Plan *lefttree);
extern Sort *
-make_sort(List * tlist, Oid tempid, Plan * lefttree,
+make_sort(List *tlist, Oid tempid, Plan *lefttree,
int keycount);
-extern Agg *make_agg(List * tlist, int nagg, Aggreg **aggs);
+extern Agg *make_agg(List *tlist, int nagg, Aggreg **aggs);
extern Group *
-make_group(List * tlist, bool tuplePerGroup, int ngrp,
- AttrNumber *grpColIdx, Sort * lefttree);
-extern Unique *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr);
-extern List *generate_fjoin(List * tlist);
+make_group(List *tlist, bool tuplePerGroup, int ngrp,
+ AttrNumber *grpColIdx, Sort *lefttree);
+extern Unique *make_unique(List *tlist, Plan *lefttree, char *uniqueAttr);
+extern List *generate_fjoin(List *tlist);
/*
* prototypes for plan/initsplan.c
*/
-extern void initialize_base_rels_list(Query * root, List * tlist);
-extern void initialize_base_rels_jinfo(Query * root, List * clauses);
-extern void initialize_join_clause_info(List * rel_list);
-extern void add_missing_vars_to_base_rels(Query * root, List * tlist);
+extern void initialize_base_rels_list(Query *root, List *tlist);
+extern void initialize_base_rels_jinfo(Query *root, List *clauses);
+extern void initialize_join_clause_info(List *rel_list);
+extern void add_missing_vars_to_base_rels(Query *root, List *tlist);
/*
* prototypes for plan/setrefs.c
*/
-extern void set_tlist_references(Plan * plan);
+extern void set_tlist_references(Plan *plan);
extern List *
-join_references(List * clauses, List * outer_tlist,
- List * inner_tlist);
+join_references(List *clauses, List *outer_tlist,
+ List *inner_tlist);
extern List *
-index_outerjoin_references(List * inner_indxqual,
- List * outer_tlist, Index inner_relid);
-extern void set_result_tlist_references(Result * resultNode);
+index_outerjoin_references(List *inner_indxqual,
+ List *outer_tlist, Index inner_relid);
+extern void set_result_tlist_references(Result *resultNode);
extern void set_agg_tlist_references(Agg *aggNode);
extern void set_agg_agglist_references(Agg *aggNode);
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 9f0375a599e052f8fced19a1db26ff927371c5bc..da90b768c611f6b973172a02c4b603bc6ae1a628 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: planner.h,v 1.4 1997/09/08 02:37:56 momjian Exp $
+ * $Id: planner.h,v 1.5 1997/09/08 21:53:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@
/*
*/
-extern Plan *planner(Query * parse);
-extern void pg_checkretval(Oid rettype, QueryTreeList * querytree_list);
+extern Plan *planner(Query *parse);
+extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list);
#endif /* PLANNER_H */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index ccc721495b2d2b086eb19a7526501ec8d2f74fd6..69db9b61ce5a90224bcec030be2705e8a7d4766a 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: prep.h,v 1.4 1997/09/08 02:37:57 momjian Exp $
+ * $Id: prep.h,v 1.5 1997/09/08 21:53:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,23 +19,23 @@
/*
* prototypes for archive.h
*/
-extern void plan_archive(List * rt);
+extern void plan_archive(List *rt);
extern List *find_archive_rels(Oid relid);
/*
* prototypes for prepqual.h
*/
extern List *
-preprocess_qualification(Expr * qual, List * tlist,
- List ** existentialQualPtr);
-extern List *cnfify(Expr * qual, bool removeAndFlag);
+preprocess_qualification(Expr *qual, List *tlist,
+ List **existentialQualPtr);
+extern List *cnfify(Expr *qual, bool removeAndFlag);
/*
* prototypes for preptlist.h
*/
extern List *
-preprocess_targetlist(List * tlist, int command_type,
- Index result_relation, List * range_table);
+preprocess_targetlist(List *tlist, int command_type,
+ Index result_relation, List *range_table);
/*
* prototypes for prepunion.h
@@ -43,14 +43,14 @@ preprocess_targetlist(List * tlist, int command_type,
typedef enum UnionFlag
{
INHERITS_FLAG, ARCHIVE_FLAG, VERSION_FLAG
-} UnionFlag;
+} UnionFlag;
extern List *
-find_all_inheritors(List * unexamined_relids,
- List * examined_relids);
-extern int first_matching_rt_entry(List * rangetable, UnionFlag flag);
+find_all_inheritors(List *unexamined_relids,
+ List *examined_relids);
+extern int first_matching_rt_entry(List *rangetable, UnionFlag flag);
extern Append *
-plan_union_queries(Index rt_index, Query * parse,
+plan_union_queries(Index rt_index, Query *parse,
UnionFlag flag);
#endif /* PREP_H */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 99299db7571f05e5761d5ce8b9da7acbbbe1fe22..318ab74f98f9a30d59e8a728f0758030d66e57f7 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,31 +6,31 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tlist.h,v 1.4 1997/09/08 02:37:57 momjian Exp $
+ * $Id: tlist.h,v 1.5 1997/09/08 21:53:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef TLIST_H
#define TLIST_H
-extern int exec_tlist_length(List * targelist);
-extern TargetEntry *tlistentry_member(Var * var, List * targetlist);
-extern Expr *matching_tlvar(Var * var, List * targetlist);
-extern void add_tl_element(Rel * rel, Var * var);
-extern TargetEntry *create_tl_element(Var * var, int resdomno);
-extern List *get_actual_tlist(List * tlist);
-extern Resdom *tlist_member(Var * var, List * tlist);
-extern Resdom *tlist_resdom(List * tlist, Resdom * resnode);
+extern int exec_tlist_length(List *targelist);
+extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
+extern Expr *matching_tlvar(Var *var, List *targetlist);
+extern void add_tl_element(Rel *rel, Var *var);
+extern TargetEntry *create_tl_element(Var *var, int resdomno);
+extern List *get_actual_tlist(List *tlist);
+extern Resdom *tlist_member(Var *var, List *tlist);
+extern Resdom *tlist_resdom(List *tlist, Resdom *resnode);
-extern TargetEntry *MakeTLE(Resdom * resdom, Node * expr);
-extern Var *get_expr(TargetEntry * tle);
+extern TargetEntry *MakeTLE(Resdom *resdom, Node *expr);
+extern Var *get_expr(TargetEntry *tle);
-extern TargetEntry *match_varid(Var * test_var, List * tlist);
-extern List *new_unsorted_tlist(List * targetlist);
-extern List *copy_vars(List * target, List * source);
-extern List *flatten_tlist(List * tlist);
+extern TargetEntry *match_varid(Var *test_var, List *tlist);
+extern List *new_unsorted_tlist(List *targetlist);
+extern List *copy_vars(List *target, List *source);
+extern List *flatten_tlist(List *tlist);
extern List *
-flatten_tlist_vars(List * full_tlist,
- List * flat_tlist);
+flatten_tlist_vars(List *full_tlist,
+ List *flat_tlist);
#endif /* TLIST_H */
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 372e5a27a8cf78f2e84ea9d323f679b1bfb8f129..ad0dfad36b7d50ccd5a29755749470f866adbc6e 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -6,16 +6,16 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: var.h,v 1.3 1997/09/08 02:37:58 momjian Exp $
+ * $Id: var.h,v 1.4 1997/09/08 21:53:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef VAR_H
#define VAR_H
-extern List *pull_varnos(Node * me);
-extern bool contain_var_clause(Node * clause);
-extern List *pull_var_clause(Node * clause);
-extern bool var_equal(Var * var1, Var * var2);
+extern List *pull_varnos(Node *me);
+extern bool contain_var_clause(Node *clause);
+extern List *pull_var_clause(Node *clause);
+extern bool var_equal(Var *var1, Var *var2);
#endif /* VAR_H */
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index b8232db4f7aa92f1fc5af84833e8162716e15f41..80a956215e235f65ca0d64febc2c24c0e6041f70 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/xfunc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: xfunc.h,v 1.4 1997/09/08 02:37:59 momjian Exp $
+ * $Id: xfunc.h,v 1.5 1997/09/08 21:53:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,38 +49,38 @@ extern int XfuncMode; /* defined in tcop/postgres.c */
#define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0)
/* function prototypes from planner/path/xfunc.c */
-extern void xfunc_trypullup(Rel * rel);
+extern void xfunc_trypullup(Rel *rel);
extern int
-xfunc_shouldpull(Path * childpath, JoinPath * parentpath,
- int whichchild, CInfo * maxcinfopt);
+xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
+ int whichchild, CInfo *maxcinfopt);
extern CInfo *
-xfunc_pullup(Path * childpath, JoinPath * parentpath, CInfo * cinfo,
+xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo,
int whichchild, int clausetype);
-extern Cost xfunc_rank(Expr * clause);
-extern Cost xfunc_expense(Query * queryInfo, Expr * clause);
-extern Cost xfunc_join_expense(JoinPath * path, int whichchild);
-extern Cost xfunc_local_expense(Expr * clause);
-extern Cost xfunc_func_expense(Expr * node, List * args);
-extern int xfunc_width(Expr * clause);
+extern Cost xfunc_rank(Expr *clause);
+extern Cost xfunc_expense(Query *queryInfo, Expr *clause);
+extern Cost xfunc_join_expense(JoinPath *path, int whichchild);
+extern Cost xfunc_local_expense(Expr *clause);
+extern Cost xfunc_func_expense(Expr *node, List *args);
+extern int xfunc_width(Expr *clause);
/* static, moved to xfunc.c */
/* extern int xfunc_card_unreferenced(Expr *clause, Relid referenced); */
extern int xfunc_card_product(Relid relids);
-extern List *xfunc_find_references(List * clause);
-extern List *xfunc_primary_join(JoinPath * pathnode);
-extern Cost xfunc_get_path_cost(Path * pathnode);
-extern Cost xfunc_total_path_cost(JoinPath * pathnode);
-extern Cost xfunc_expense_per_tuple(JoinPath * joinnode, int whichchild);
-extern void xfunc_fixvars(Expr * clause, Rel * rel, int varno);
+extern List *xfunc_find_references(List *clause);
+extern List *xfunc_primary_join(JoinPath *pathnode);
+extern Cost xfunc_get_path_cost(Path *pathnode);
+extern Cost xfunc_total_path_cost(JoinPath *pathnode);
+extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild);
+extern void xfunc_fixvars(Expr *clause, Rel *rel, int varno);
extern int xfunc_cinfo_compare(void *arg1, void *arg2);
extern int xfunc_clause_compare(void *arg1, void *arg2);
-extern void xfunc_disjunct_sort(List * clause_list);
+extern void xfunc_disjunct_sort(List *clause_list);
extern int xfunc_disjunct_compare(void *arg1, void *arg2);
-extern int xfunc_func_width(RegProcedure funcid, List * args);
+extern int xfunc_func_width(RegProcedure funcid, List *args);
extern int xfunc_tuple_width(Relation rd);
-extern int xfunc_num_join_clauses(JoinPath * path);
-extern List *xfunc_LispRemove(List * foo, List * bar);
-extern bool xfunc_copyrel(Rel * from, Rel ** to);
+extern int xfunc_num_join_clauses(JoinPath *path);
+extern List *xfunc_LispRemove(List *foo, List *bar);
+extern bool xfunc_copyrel(Rel *from, Rel **to);
/*
* function prototypes for path/predmig.c
diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h
index 0a449713122932d39a5165602cf2629620639973..707ca3a1c6ed848cca86f78743cec7ca99ee56eb 100644
--- a/src/include/parser/catalog_utils.h
+++ b/src/include/parser/catalog_utils.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: catalog_utils.h,v 1.12 1997/09/08 02:38:01 momjian Exp $
+ * $Id: catalog_utils.h,v 1.13 1997/09/08 21:53:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,15 +40,15 @@ extern char *getAttrName(Relation rd, int attrno);
extern char *instr2(Type tp, char *string, int typlen);
extern Oid GetArrayElementType(Oid typearray);
extern Oid funcid_get_rettype(Oid funcid);
-extern bool
-func_get_detail(char *funcname, int nargs, Oid * oid_array,
- Oid * funcid, Oid * rettype, bool * retset, Oid ** true_typeids);
+extern bool
+func_get_detail(char *funcname, int nargs, Oid *oid_array,
+ Oid *funcid, Oid *rettype, bool *retset, Oid **true_typeids);
extern Oid typeid_get_retinfunc(Oid type_id);
extern Oid typeid_get_retoutfunc(Oid type_id);
extern Oid typeid_get_relid(Oid type_id);
extern Oid get_typrelid(Type typ);
extern Oid get_typelem(Oid type_id);
-extern void func_error(char *caller, char *funcname, int nargs, Oid * argtypes);
+extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes);
extern void agg_error(char *caller, char *aggname, Oid basetypeID);
#endif /* CATALOG_UTILS_H */
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 961689368510110cd8fe1cc4dff4b738c4d4102b..2fb04acd560ec0d70c8c7d5df0292e3a5a1a1d0a 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: gramparse.h,v 1.4 1997/09/08 02:38:11 momjian Exp $
+ * $Id: gramparse.h,v 1.5 1997/09/08 21:53:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
extern void init_io(void);
/* from gram.y */
-extern void parser_init(Oid * typev, int nargs);
+extern void parser_init(Oid *typev, int nargs);
extern int yyparse(void);
#endif /* GRAMPARSE_H */
diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h
index 9d459cda8adc3294e0f09dc0d9fc8b69b4eaeda9..7feda88a0894c4f6b53cf9040d4f47836a6a4446 100644
--- a/src/include/parser/keywords.h
+++ b/src/include/parser/keywords.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: keywords.h,v 1.3 1997/09/08 02:38:14 momjian Exp $
+ * $Id: keywords.h,v 1.4 1997/09/08 21:53:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@ typedef struct ScanKeyword
{
char *name;
int value;
-} ScanKeyword;
+} ScanKeyword;
extern ScanKeyword *ScanKeywordLookup(char *text);
extern char *AtomValueGetString(int atomval);
diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h
index 63310a8bd72dd1e48cbc42bc724c7d1968fa9870..7775ec0260f1f7b4d71c633083e6a1aac8fa4f6b 100644
--- a/src/include/parser/parse_query.h
+++ b/src/include/parser/parse_query.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_query.h,v 1.11 1997/09/08 02:38:15 momjian Exp $
+ * $Id: parse_query.h,v 1.12 1997/09/08 21:53:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,52 +21,52 @@ typedef struct QueryTreeList
{
int len; /* number of queries */
Query **qtrees;
-} QueryTreeList;
+} QueryTreeList;
-extern RangeTblEntry *refnameRangeTableEntry(List * rtable, char *refname);
-extern RangeTblEntry *colnameRangeTableEntry(ParseState * pstate, char *colname);
-extern int refnameRangeTablePosn(List * rtable, char *refname);
+extern RangeTblEntry *refnameRangeTableEntry(List *rtable, char *refname);
+extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname);
+extern int refnameRangeTablePosn(List *rtable, char *refname);
extern RangeTblEntry *
-addRangeTableEntry(ParseState * pstate,
+addRangeTableEntry(ParseState *pstate,
char *relname, char *refname,
bool inh, bool inFromCl,
- TimeRange * timeRange);
+ TimeRange *timeRange);
extern List *
-expandAll(ParseState * pstate, char *relname, char *refname,
+expandAll(ParseState *pstate, char *relname, char *refname,
int *this_resno);
-extern TimeQual
+extern TimeQual
makeTimeRange(char *datestring1, char *datestring2,
int timecode);
-extern Expr *make_op(char *opname, Node * ltree, Node * rtree);
+extern Expr *make_op(char *opname, Node *ltree, Node *rtree);
extern Oid find_atttype(Oid relid, char *attrname);
extern Var *
-make_var(ParseState * pstate,
- char *relname, char *attrname, Oid * type_id);
-extern ArrayRef *make_array_ref(Node * array, List * indirection);
+make_var(ParseState *pstate,
+ char *relname, char *attrname, Oid *type_id);
+extern ArrayRef *make_array_ref(Node *array, List *indirection);
extern ArrayRef *
-make_array_set(Expr * target_expr, List * upperIndexpr,
- List * lowerIndexpr, Expr * expr);
-extern Const *make_const(Value * value);
+make_array_set(Expr *target_expr, List *upperIndexpr,
+ List *lowerIndexpr, Expr *expr);
+extern Const *make_const(Value *value);
-extern void param_type_init(Oid * typev, int nargs);
+extern void param_type_init(Oid *typev, int nargs);
extern Oid param_type(int t);
/* parser.c (was ylib.c) */
-extern QueryTreeList *parser(char *str, Oid * typev, int nargs);
-extern Node *parser_typecast(Value * expr, TypeName * typename, int typlen);
-extern Node *parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen);
-extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node * target);
+extern QueryTreeList *parser(char *str, Oid *typev, int nargs);
+extern Node *parser_typecast(Value *expr, TypeName *typename, int typlen);
+extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen);
+extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node *target);
extern void
-handleTargetColname(ParseState * pstate, char **resname,
+handleTargetColname(ParseState *pstate, char **resname,
char *refname, char *colname);
/*
* analyze.c
*/
-Oid exprType(Node * expr);
-QueryTreeList *parse_analyze(List * querytree_list);
+Oid exprType(Node *expr);
+QueryTreeList *parse_analyze(List *querytree_list);
/* define in parse_query.c, used in gram.y */
extern Oid *param_type_info;
diff --git a/src/include/parser/parse_state.h b/src/include/parser/parse_state.h
index ce41c6cd7698287d9e38cb734dfc0d575bd2fd62..abda19b18c5ae334396a883430d0c57559c55f3f 100644
--- a/src/include/parser/parse_state.h
+++ b/src/include/parser/parse_state.h
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_state.h,v 1.7 1997/09/08 02:38:15 momjian Exp $
+ * $Id: parse_state.h,v 1.8 1997/09/08 21:53:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@ typedef struct ParseState
bool p_is_rule;
Relation p_target_relation;
RangeTblEntry *p_target_rangetblentry;
-} ParseState;
+} ParseState;
#endif /* PARSE_QUERY_H */
diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h
index 447b8ee4427ec21f2226eb2229673b7480f6273a..68690cd5cdb4c9ff9cce792a730a37777458c79f 100644
--- a/src/include/port/hpux.h
+++ b/src/include/port/hpux.h
@@ -4,7 +4,7 @@
typedef struct
{
int sem[4];
-} slock_t;
+} slock_t;
#ifndef BIG_ENDIAN
#define BIG_ENDIAN 4321
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 706dcc1a41bd71835421fdb9f532b9cbf5c0ec23..37d966cf2f4cbd186f5a866eda032dee3caefde7 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1995, Regents of the University of California
*
- * $Id: postgres.h,v 1.8 1997/09/08 02:33:54 momjian Exp $
+ * $Id: postgres.h,v 1.9 1997/09/08 21:50:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,7 +91,7 @@ typedef struct varlena text;
typedef struct char8
{
char data[8];
-} char8;
+} char8;
/* ----------------
* char16
@@ -100,7 +100,7 @@ typedef struct char8
typedef struct char16
{
char data[16];
-} char16;
+} char16;
typedef char16 *Char16;
@@ -110,7 +110,7 @@ typedef Oid oid8[8];
typedef struct nameData
{
char data[NAMEDATALEN];
-} NameData;
+} NameData;
typedef NameData *Name;
/* ----------------
@@ -123,7 +123,7 @@ typedef struct OidInt4Data
{
Oid oi_oid;
int32 oi_int4;
-} OidInt4Data;
+} OidInt4Data;
typedef struct OidInt4Data *OidInt4;
@@ -137,7 +137,7 @@ typedef struct OidInt2Data
{
Oid oi_oid;
int16 oi_int2;
-} OidInt2Data;
+} OidInt2Data;
typedef struct OidInt2Data *OidInt2;
@@ -151,7 +151,7 @@ typedef struct OidNameData
{
Oid id;
NameData name;
-} OidNameData;
+} OidNameData;
typedef struct OidNameData *OidName;
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 94b3ea4a2d8e33c6de14cc9e3c264365608206a8..cd9efbceb7581c638c64199027ab92d67c43b66e 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -51,13 +51,13 @@ typedef struct
size_t re_nsub; /* number of parenthesized subexpressions */
const char *re_endp; /* end pointer for REG_PEND */
struct re_guts *re_g; /* none of your business :-) */
-} regex_t;
+} regex_t;
typedef struct
{
regoff_t rm_so; /* start of match */
regoff_t rm_eo; /* end of match */
-} regmatch_t;
+} regmatch_t;
/* regcomp() flags */
#define REG_BASIC 0000
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index 70b03b0250ab71e58bedb04f24d214c81cfb64c1..564c626c5bb6e8302d6d4a595e09223dda33cb8f 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -130,7 +130,7 @@ typedef struct
uch hash; /* hash code */
size_t smultis;
char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */
-} cset;
+} cset;
/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
#define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h
index b1336b51c61af7dddb4aba291fcef93c0c6d49a8..94e0563d8f3ce9294d381d9c9d9d0d9ebd4f302f 100644
--- a/src/include/rewrite/locks.h
+++ b/src/include/rewrite/locks.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: locks.h,v 1.5 1997/09/08 02:38:44 momjian Exp $
+ * $Id: locks.h,v 1.6 1997/09/08 21:54:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "rewrite/prs2lock.h"
extern List *
-matchLocks(CmdType event, RuleLock * rulelocks, int varno,
- Query * parsetree);
+matchLocks(CmdType event, RuleLock *rulelocks, int varno,
+ Query *parsetree);
#endif /* LOCKS_H */
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index b1d2f019d0a5f20a74012b170b6dd2553e0ee1a0..183abf5130993c44993744022bedd3ffe93de8b7 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: prs2lock.h,v 1.6 1997/09/08 02:38:46 momjian Exp $
+ * $Id: prs2lock.h,v 1.7 1997/09/08 21:54:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@ typedef struct RewriteRule
Node *qual;
List *actions;
bool isInstead;
-} RewriteRule;
+} RewriteRule;
/*
* RuleLock -
@@ -40,6 +40,6 @@ typedef struct RuleLock
{
int numLocks;
RewriteRule **rules;
-} RuleLock;
+} RuleLock;
#endif /* REWRITE_H */
diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h
index 7dfacf3911749bce09a7419ca196a2357215fa4b..ca72f1910597a09e4a187ded2ee2e5a78c85fdee 100644
--- a/src/include/rewrite/rewriteDefine.h
+++ b/src/include/rewrite/rewriteDefine.h
@@ -6,13 +6,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rewriteDefine.h,v 1.3 1997/09/08 02:38:48 momjian Exp $
+ * $Id: rewriteDefine.h,v 1.4 1997/09/08 21:54:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef REWRITEDEFINE_H
#define REWRITEDEFINE_H
-extern void DefineQueryRewrite(RuleStmt * args);
+extern void DefineQueryRewrite(RuleStmt *args);
#endif /* REWRITEDEFINE_H */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index f38e7c048d8b3fbf6efb507b95336c7a89c5510a..344fd7ae5122e92d026240837ed15409f3eeaa73 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rewriteHandler.h,v 1.3 1997/09/08 02:38:50 momjian Exp $
+ * $Id: rewriteHandler.h,v 1.4 1997/09/08 21:54:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,6 +31,6 @@ struct _rewrite_meta_knowledge
typedef struct _rewrite_meta_knowledge RewriteInfo;
-extern List *QueryRewrite(Query * parsetree);
+extern List *QueryRewrite(Query *parsetree);
#endif /* REWRITEHANDLER_H */
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index 4a2f0afb20ca4e248be4cdfbfdb314be3c0be00a..fc8935f1c842d7c51012afe47c62c98d9461ea0a 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rewriteManip.h,v 1.3 1997/09/08 02:38:51 momjian Exp $
+ * $Id: rewriteManip.h,v 1.4 1997/09/08 21:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,19 +14,19 @@
#define REWRITEMANIP_H
/* RewriteManip.c */
-void OffsetVarNodes(Node * node, int offset);
-void ChangeVarNodes(Node * node, int old_varno, int new_varno);
-void AddQual(Query * parsetree, Node * qual);
-void AddNotQual(Query * parsetree, Node * qual);
-void FixResdomTypes(List * user_tlist);
-void FixNew(RewriteInfo * info, Query * parsetree);
+void OffsetVarNodes(Node *node, int offset);
+void ChangeVarNodes(Node *node, int old_varno, int new_varno);
+void AddQual(Query *parsetree, Node *qual);
+void AddNotQual(Query *parsetree, Node *qual);
+void FixResdomTypes(List *user_tlist);
+void FixNew(RewriteInfo *info, Query *parsetree);
void
-HandleRIRAttributeRule(Query * parsetree, List * rtable, List * targetlist,
+HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist,
int rt_index, int attr_num, int *modified,
int *badpostquel);
void
-HandleViewRule(Query * parsetree, List * rtable, List * targetlist,
+HandleViewRule(Query *parsetree, List *rtable, List *targetlist,
int rt_index, int *modified);
#endif /* REWRITEMANIP_H */
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 99f198504ef12a863f56a60a0434f383791b5f43..e7b910250be77722980ce830d10a8ba1011cfc6a 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rewriteSupport.h,v 1.4 1997/09/08 02:38:52 momjian Exp $
+ * $Id: rewriteSupport.h,v 1.5 1997/09/08 21:54:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,8 +18,8 @@ extern int IsDefinedRewriteRule(char *ruleName);
extern void
prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type,
- AttrNumber attno, bool isInstead, Node * qual,
- List * actions);
+ AttrNumber attno, bool isInstead, Node *qual,
+ List *actions);
extern void prs2_deleteFromRelation(Oid relid, Oid ruleId);
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index be40014b0bc27880a627adf4214e9174f35c750e..b0d268be08a0c7158623f988b9f561cc5eacc5c1 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: buf_internals.h,v 1.17 1997/09/08 20:59:00 momjian Exp $
+ * $Id: buf_internals.h,v 1.18 1997/09/08 21:54:14 momjian Exp $
*
* NOTE
* If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -212,7 +212,7 @@ extern void InitFreeList(bool init);
/* buf_table.c */
extern void InitBufTable(void);
-extern BufferDesc *BufTableLookup(BufferTag * tagPtr);
+extern BufferDesc *BufTableLookup(BufferTag *tagPtr);
extern bool BufTableDelete(BufferDesc *buf);
extern bool BufTableInsert(BufferDesc *buf);
@@ -231,7 +231,7 @@ extern int NLocBuffer;
extern BufferDesc *
LocalBufferAlloc(Relation reln, BlockNumber blockNum,
- bool * foundPtr);
+ bool *foundPtr);
extern int WriteLocalBuffer(Buffer buffer, bool release);
extern int FlushLocalBuffer(Buffer buffer, bool release);
extern void InitLocalBuffer(void);
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 469eca4de288f3bb33749ee8d8033d32ee6131e2..e9afc2e7e12bcb897d4b9acf31e6beb2c6b2a7ee 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufmgr.h,v 1.14 1997/09/08 20:59:05 momjian Exp $
+ * $Id: bufmgr.h,v 1.15 1997/09/08 21:54:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -82,7 +82,7 @@ ReleaseAndReadBuffer(Buffer buffer, Relation relation,
BlockNumber blockNum);
extern void InitBufferPool(IPCKey key);
-extern void PrintBufferUsage(FILE * statfp);
+extern void PrintBufferUsage(FILE *statfp);
extern void ResetBufferUsage(void);
extern void ResetBufferPool(void);
extern int BufferPoolCheckLeak(void);
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 4b031746f0bef93637bbe90b7eae0f8660c32dda..befb6b0849c9ecb1d0c8ef812e63f2af968ff9fc 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufpage.h,v 1.12 1997/09/08 02:38:59 momjian Exp $
+ * $Id: bufpage.h,v 1.13 1997/09/08 21:54:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -102,7 +102,7 @@ typedef uint16 LocationIndex;
typedef struct OpaqueData
{
uint16 od_pagesize;
-} OpaqueData;
+} OpaqueData;
typedef OpaqueData *Opaque;
@@ -117,7 +117,7 @@ typedef struct PageHeaderData
LocationIndex pd_special; /* offset to start of special space */
OpaqueData pd_opaque; /* AM-generic information */
ItemIdData pd_linp[1]; /* line pointers */
-} PageHeaderData;
+} PageHeaderData;
typedef PageHeaderData *PageHeader;
@@ -125,7 +125,7 @@ typedef enum
{
ShufflePageManagerMode,
OverwritePageManagerMode
-} PageManagerMode;
+} PageManagerMode;
/* ----------------
* misc support macros
@@ -280,7 +280,7 @@ typedef enum
*/
extern void PageInit(Page page, Size pageSize, Size specialSize);
-extern OffsetNumber
+extern OffsetNumber
PageAddItem(Page page, Item item, Size size,
OffsetNumber offsetNumber, ItemIdFlags flags);
extern Page PageGetTempPage(Page page, Size specialSize);
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index e75a26c045447d1c34d67d682503396feff6233c..b62387b668e4687406ebedf9a7eed8650bf0541d 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ipc.h,v 1.19 1997/09/08 02:39:01 momjian Exp $
+ * $Id: ipc.h,v 1.20 1997/09/08 21:54:21 momjian Exp $
*
* NOTES
* This file is very architecture-specific. This stuff should actually
@@ -28,15 +28,15 @@
#if defined(HAS_TEST_AND_SET)
-extern void S_LOCK(slock_t * lock);
-extern void S_UNLOCK(slock_t * lock);
-extern void S_INIT_LOCK(slock_t * lock);
+extern void S_LOCK(slock_t *lock);
+extern void S_UNLOCK(slock_t *lock);
+extern void S_INIT_LOCK(slock_t *lock);
#if (defined(alpha) && !defined(linuxalpha)) || \
defined(hpux) || \
defined(irix5) || \
defined(nextstep)
-extern int S_LOCK_FREE(slock_t * lock);
+extern int S_LOCK_FREE(slock_t *lock);
#else
#define S_LOCK_FREE(lock) ((*lock) == 0)
@@ -93,7 +93,7 @@ extern void exitpg(int code);
extern void quasi_exitpg(void);
extern int on_exitpg(void (*function) (), caddr_t arg);
-extern IpcSemaphoreId
+extern IpcSemaphoreId
IpcSemaphoreCreate(IpcSemaphoreKey semKey,
int semNum, int permission, int semStartValue,
int removeOnExit, int *status);
@@ -102,7 +102,7 @@ extern void IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock);
extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock);
extern int IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem);
extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem);
-extern IpcMemoryId
+extern IpcMemoryId
IpcMemoryCreate(IpcMemoryKey memKey, uint32 size,
int permission);
extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size);
@@ -135,7 +135,7 @@ typedef enum _LockId_
PROCSTRUCTLOCKID,
FIRSTFREELOCKID
-} _LockId_;
+} _LockId_;
#define MAX_SPINS FIRSTFREELOCKID
@@ -148,7 +148,7 @@ typedef struct slock
slock_t exlock;
slock_t comlock;
struct slock *next;
-} SLock;
+} SLock;
extern void ExclusiveLock(int lockid);
extern void ExclusiveUnlock(int lockid);
@@ -171,7 +171,7 @@ typedef enum _LockId_
PROCSTRUCTLOCKID,
OIDGENLOCKID,
FIRSTFREELOCKID
-} _LockId_;
+} _LockId_;
#define MAX_SPINS FIRSTFREELOCKID
diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h
index 1c382fb1b9eb7257cf4d9193e50dade77403f1e5..c6b0abc19bda97a51bb4ffcdea509491bec12fb9 100644
--- a/src/include/storage/itemid.h
+++ b/src/include/storage/itemid.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: itemid.h,v 1.3 1997/09/08 02:39:02 momjian Exp $
+ * $Id: itemid.h,v 1.4 1997/09/08 21:54:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@ typedef struct ItemIdData
/* can be reduced by 2 if necc. */
lp_flags:6, /* flags on tuple */
lp_len:13; /* length of tuple */
-} ItemIdData;
+} ItemIdData;
typedef struct ItemIdData *ItemId;
diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h
index b6156ca229c457f5f01cfcd298feb6bda7807b57..5bac77c9fccceea56fbf8533cd2a0771b4a148ee 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: itemptr.h,v 1.6 1997/09/08 02:39:03 momjian Exp $
+ * $Id: itemptr.h,v 1.7 1997/09/08 21:54:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@ typedef struct ItemPointerData
{
BlockIdData ip_blkid;
OffsetNumber ip_posid;
-} ItemPointerData;
+} ItemPointerData;
typedef ItemPointerData *ItemPointer;
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 710b1bac5c2c0c7dc161bd453b8b657432860597..276792e19e209d668790f7e0ea2df4e010849719 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: large_object.h,v 1.6 1997/09/08 02:39:03 momjian Exp $
+ * $Id: large_object.h,v 1.7 1997/09/08 21:54:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ typedef struct LargeObjectDesc
#define IFS_ATEOF (1 << 2)
u_long flags; /* locking info, etc */
-} LargeObjectDesc;
+} LargeObjectDesc;
/*
* Function definitions...
@@ -47,11 +47,11 @@ typedef struct LargeObjectDesc
/* inversion stuff in inv_api.c */
extern LargeObjectDesc *inv_create(int flags);
extern LargeObjectDesc *inv_open(Oid lobjId, int flags);
-extern void inv_close(LargeObjectDesc * obj_desc);
+extern void inv_close(LargeObjectDesc *obj_desc);
extern int inv_destroy(Oid lobjId);
-extern int inv_seek(LargeObjectDesc * obj_desc, int offset, int whence);
-extern int inv_tell(LargeObjectDesc * obj_desc);
-extern int inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes);
-extern int inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes);
+extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence);
+extern int inv_tell(LargeObjectDesc *obj_desc);
+extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes);
+extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes);
#endif /* LARGE_OBJECT_H */
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index bd8d50f709f446a4c4dd5a0b2efd30ee3266be33..2cfea514e106223575619a9515afc10fc2a04766 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lmgr.h,v 1.7 1997/09/08 02:39:04 momjian Exp $
+ * $Id: lmgr.h,v 1.8 1997/09/08 21:54:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@ typedef struct LRelId
{
Oid relId; /* a relation identifier */
Oid dbId; /* a database identifier */
-} LRelId;
+} LRelId;
typedef struct LockInfoData
{
@@ -32,7 +32,7 @@ typedef struct LockInfoData
LRelId lRelId;
TransactionId transactionIdData;
uint16 flags;
-} LockInfoData;
+} LockInfoData;
typedef LockInfoData *LockInfo;
#define LockInfoIsValid(linfo) \
@@ -73,7 +73,7 @@ extern void RelationUnsetWIntentLock(Relation relation);
/* single.c */
extern bool SingleLockReln(LockInfo linfo, LOCKT lockt, int action);
-extern bool
+extern bool
SingleLockPage(LockInfo linfo, ItemPointer tidPtr,
LOCKT lockt, int action);
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 898795753421172cb3e9cb03178b6503e7da9a7e..d7f9b20472eddc501df1526e2e991697feeb66a8 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.7 1997/09/08 02:39:05 momjian Exp $
+ * $Id: lock.h,v 1.8 1997/09/08 21:54:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,7 @@ typedef struct ltag
Oid relId;
Oid dbId;
ItemPointerData tupleId;
-} LOCKTAG;
+} LOCKTAG;
#define TAGSIZE (sizeof(LOCKTAG))
@@ -91,7 +91,7 @@ typedef struct lockctl
int conflictTab[MAX_LOCKTYPES];
int prio[MAX_LOCKTYPES];
SPINLOCK masterLock;
-} LOCKCTL;
+} LOCKCTL;
/*
* lockHash -- hash table on lock Ids,
@@ -104,7 +104,7 @@ typedef struct ltable
HTAB *lockHash;
HTAB *xidHash;
LOCKCTL *ctl;
-} LOCKTAB;
+} LOCKTAB;
/* -----------------------
* A transaction never conflicts with its own locks. Hence, if
@@ -140,7 +140,7 @@ typedef struct XIDTAG
SHMEM_OFFSET lock;
int pid;
TransactionId xid;
-} XIDTAG;
+} XIDTAG;
typedef struct XIDLookupEnt
{
@@ -151,7 +151,7 @@ typedef struct XIDLookupEnt
int holders[MAX_LOCKTYPES];
int nHolding;
SHM_QUEUE queue;
-} XIDLookupEnt;
+} XIDLookupEnt;
#define XID_TAGSIZE (sizeof(XIDTAG))
@@ -160,7 +160,7 @@ typedef struct procQueue
{
SHM_QUEUE links;
int size;
-} PROC_QUEUE;
+} PROC_QUEUE;
/*
@@ -186,7 +186,7 @@ typedef struct Lock
int nHolding;
int activeHolders[MAX_LOCKTYPES];
int nActive;
-} LOCK;
+} LOCK;
#define LockGetLock_nHolders(l) l->nHolders
@@ -204,16 +204,16 @@ extern SPINLOCK LockMgrLock;
*/
extern void InitLocks(void);
extern void LockDisable(int status);
-extern LockTableId
-LockTabInit(char *tabName, MASK * conflictsP, int *prioP,
+extern LockTableId
+LockTabInit(char *tabName, MASK *conflictsP, int *prioP,
int ntypes);
-extern bool LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
+extern bool LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt);
extern int
-LockResolveConflicts(LOCKTAB * ltable, LOCK * lock, LOCKT lockt,
+LockResolveConflicts(LOCKTAB *ltable, LOCK *lock, LOCKT lockt,
TransactionId xid);
-extern bool LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt);
-extern void GrantLock(LOCK * lock, LOCKT lockt);
-extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue);
+extern bool LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt);
+extern void GrantLock(LOCK *lock, LOCKT lockt);
+extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue);
extern int LockShmemSize(void);
extern bool LockingDisabled(void);
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index d8ea70918a7605e5bd370be1cff9e9b6c37c6d7c..5a7c85b0b1bba9e16845d374500822b5044acbce 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: proc.h,v 1.7 1997/09/08 02:39:07 momjian Exp $
+ * $Id: proc.h,v 1.8 1997/09/08 21:54:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@ typedef struct
int semNum;
IpcSemaphoreId semId;
IpcSemaphoreKey semKey;
-} SEMA;
+} SEMA;
/*
* Each backend has:
@@ -54,7 +54,7 @@ typedef struct proc
short sLocks[MAX_SPINS]; /* Spin lock stats */
SHM_QUEUE lockQueue; /* locks associated with current
* transaction */
-} PROC;
+} PROC;
/*
@@ -72,7 +72,7 @@ typedef struct procglobal
int numProcs;
IPCKey currKey;
int32 freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET];
-} PROC_HDR;
+} PROC_HDR;
extern PROC *MyProc;
@@ -101,13 +101,13 @@ extern bool ProcRemove(int pid);
/* extern bool ProcKill(int exitStatus, int pid); */
/* make static in storage/lmgr/proc.c -- jolly */
-extern void ProcQueueInit(PROC_QUEUE * queue);
+extern void ProcQueueInit(PROC_QUEUE *queue);
extern int
-ProcSleep(PROC_QUEUE * queue, SPINLOCK spinlock, int token,
- int prio, LOCK * lock);
-extern int ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock);
-extern void ProcAddLock(SHM_QUEUE * elem);
-extern void ProcReleaseSpins(PROC * proc);
+ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token,
+ int prio, LOCK *lock);
+extern int ProcLockWakeup(PROC_QUEUE *queue, char *ltable, char *lock);
+extern void ProcAddLock(SHM_QUEUE *elem);
+extern void ProcReleaseSpins(PROC *proc);
extern void ProcFreeAllSemaphores(void);
#endif /* PROC_H */
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index a11783f91d0f9470b594ad40616f548cf0d0df75..168d4fb96939f6fea94c79358c7370ef4e4b7e88 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: shmem.h,v 1.8 1997/09/08 20:59:07 momjian Exp $
+ * $Id: shmem.h,v 1.9 1997/09/08 21:54:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@ typedef struct SHM_QUEUE
{
SHMEM_OFFSET prev;
SHMEM_OFFSET next;
-} SHM_QUEUE;
+} SHM_QUEUE;
/* shmem.c */
extern void ShmemBindingTabReset(void);
@@ -66,12 +66,12 @@ extern long *ShmemAlloc(unsigned long size);
extern int ShmemIsValid(unsigned long addr);
extern HTAB *
ShmemInitHash(char *name, long init_size, long max_size,
- HASHCTL * infoP, int hash_flags);
-extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET * locationPtr);
+ HASHCTL *infoP, int hash_flags);
+extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr);
extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
extern long *
ShmemInitStruct(char *name, unsigned long size,
- bool * foundPtr);
+ bool *foundPtr);
extern bool TransactionIdIsInProgress(TransactionId xid);
@@ -96,13 +96,13 @@ typedef struct
/*
* prototypes for functions in shmqueue.c
*/
-extern void SHMQueueInit(SHM_QUEUE * queue);
-extern void SHMQueueElemInit(SHM_QUEUE * queue);
-extern void SHMQueueDelete(SHM_QUEUE * queue);
-extern void SHMQueueInsertTL(SHM_QUEUE * queue, SHM_QUEUE * elem);
+extern void SHMQueueInit(SHM_QUEUE *queue);
+extern void SHMQueueElemInit(SHM_QUEUE *queue);
+extern void SHMQueueDelete(SHM_QUEUE *queue);
+extern void SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem);
extern void
-SHMQueueFirst(SHM_QUEUE * queue, Pointer * nextPtrPtr,
- SHM_QUEUE * nextQueue);
-extern bool SHMQueueEmpty(SHM_QUEUE * queue);
+SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr,
+ SHM_QUEUE *nextQueue);
+extern bool SHMQueueEmpty(SHM_QUEUE *queue);
#endif /* SHMEM_H */
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 1862cda616e9e6b542690a5a29788498d9f18a24..d499dc3b35f7e2ca17296dfabef9bf4ba7e17ea5 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: sinvaladt.h,v 1.5 1997/09/08 02:39:13 momjian Exp $
+ * $Id: sinvaladt.h,v 1.6 1997/09/08 21:54:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ typedef struct ProcState
bool resetState; /* true, if backend has to reset its state */
int tag; /* special tag, recieved from the
* postmaster */
-} ProcState;
+} ProcState;
typedef struct SISeg
@@ -74,7 +74,7 @@ typedef struct SISeg
ProcState procState[MaxBackendId]; /* reflects the
* invalidation state */
/* here starts the entry section, controlled by offsets */
-} SISeg;
+} SISeg;
#define SizeSISeg sizeof(SISeg)
@@ -83,7 +83,7 @@ typedef struct SharedInvalidData
int cacheId; /* XXX */
Index hashIndex;
ItemPointerData pointerData;
-} SharedInvalidData;
+} SharedInvalidData;
typedef SharedInvalidData *SharedInvalid;
@@ -93,7 +93,7 @@ typedef struct SISegEntry
SharedInvalidData entryData;/* the message data */
bool isfree; /* entry free? */
Offset next; /* offset to next entry */
-} SISegEntry;
+} SISegEntry;
#define SizeOfOneSISegEntry sizeof(SISegEntry)
@@ -102,7 +102,7 @@ typedef struct SISegOffsets
Offset startSegment; /* always 0 (for now) */
Offset offsetToFirstEntry; /* A + a = B */
Offset offsetToEndOfSegemnt; /* A + a + b */
-} SISegOffsets;
+} SISegOffsets;
/****************************************************************************/
@@ -119,15 +119,15 @@ extern SISeg *shmInvalBuffer;
/*
* prototypes for functions in sinvaladt.c
*/
-extern int SIBackendInit(SISeg * segInOutP);
+extern int SIBackendInit(SISeg *segInOutP);
extern int SISegmentInit(bool killExistingSegment, IPCKey key);
-extern bool SISetDataEntry(SISeg * segP, SharedInvalidData * data);
-extern void SISetProcStateInvalid(SISeg * segP);
-extern bool SIDelDataEntry(SISeg * segP);
+extern bool SISetDataEntry(SISeg *segP, SharedInvalidData *data);
+extern void SISetProcStateInvalid(SISeg *segP);
+extern bool SIDelDataEntry(SISeg *segP);
extern void
-SIReadEntryData(SISeg * segP, int backendId,
+SIReadEntryData(SISeg *segP, int backendId,
void (*invalFunction) (), void (*resetFunction) ());
-extern void SIDelExpiredDataEntries(SISeg * segP);
+extern void SIDelExpiredDataEntries(SISeg *segP);
#endif /* SINVALADT_H */
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index 0eeda39c8235aa752cc67f203dc93d5230562b3f..813be1f5f9f40aa778d98db32177a1086dfb3b49 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -26,7 +26,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dest.h,v 1.10 1997/09/08 02:39:16 momjian Exp $
+ * $Id: dest.h,v 1.11 1997/09/08 21:54:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,7 +53,7 @@ typedef enum
RemoteInternal, /* results sent to frontend process in
* internal (binary) form */
SPI /* results sent to SPI manager */
-} CommandDest;
+} CommandDest;
/* AttrInfo* replaced with TupleDesc, now that TupleDesc also has within it
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index b4c72305aa6dc5c44b8cfabdb0b69434e31ebd55..37a870286d00662f5601eff6a58f5257b40cf99a 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pquery.h,v 1.6 1997/09/08 02:39:19 momjian Exp $
+ * $Id: pquery.h,v 1.7 1997/09/08 21:54:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,12 +24,12 @@ extern EState *CreateExecutorState(void);
extern void
-ProcessPortal(char *portalName, Query * parseTree,
- Plan * plan, EState * state, TupleDesc attinfo,
+ProcessPortal(char *portalName, Query *parseTree,
+ Plan *plan, EState *state, TupleDesc attinfo,
CommandDest dest);
extern void
-ProcessQuery(Query * parsetree, Plan * plan, char *argv[],
- Oid * typev, int nargs, CommandDest dest);
+ProcessQuery(Query *parsetree, Plan *plan, char *argv[],
+ Oid *typev, int nargs, CommandDest dest);
#endif /* pqueryIncluded */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 86883ab642b91bd2a4fc77b89853203d06738e26..6142f24e9658af8b31149b6a0f7ad815438a590d 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tcopprot.h,v 1.6 1997/09/08 02:39:20 momjian Exp $
+ * $Id: tcopprot.h,v 1.7 1997/09/08 21:54:42 momjian Exp $
*
* OLD COMMENTS
* This file was created so that other c files could get the two
@@ -23,11 +23,11 @@
#ifndef BOOTSTRAP_INCLUDE
extern List *
-pg_plan(char *query_string, Oid * typev, int nargs,
- QueryTreeList ** queryListP, CommandDest dest);
-extern void pg_eval(char *query_string, char **argv, Oid * typev, int nargs);
+pg_plan(char *query_string, Oid *typev, int nargs,
+ QueryTreeList **queryListP, CommandDest dest);
+extern void pg_eval(char *query_string, char **argv, Oid *typev, int nargs);
extern void
-pg_eval_dest(char *query_string, char **argv, Oid * typev,
+pg_eval_dest(char *query_string, char **argv, Oid *typev,
int nargs, CommandDest dest);
#endif /* BOOTSTRAP_HEADER */
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 6dd5add42c5e8f7220d1663253e89527418da0d5..99b43229ffecd0121961e447ecdb18727fca4323 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: utility.h,v 1.4 1997/09/08 02:39:21 momjian Exp $
+ * $Id: utility.h,v 1.5 1997/09/08 21:54:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,6 +15,6 @@
#include <executor/execdesc.h>
-extern void ProcessUtility(Node * parsetree, CommandDest dest);
+extern void ProcessUtility(Node *parsetree, CommandDest dest);
#endif /* UTILITY_H */
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index fcf6ca32ece0a139d24ba991346b8926073b4d76..b35dbd199a9aed5b9a4a2b6f54d83817ddfc907b 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: acl.h,v 1.10 1997/09/08 20:59:15 momjian Exp $
+ * $Id: acl.h,v 1.11 1997/09/08 21:54:47 momjian Exp $
*
* NOTES
* For backward-compatability purposes we have to allow there
@@ -142,7 +142,7 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);
extern char *aclmakepriv(char *old_privlist, char new_priv);
extern char *aclmakeuser(char *user_type, char *user);
extern ChangeACLStmt *
-makeAclStmt(char *privs, List * rel_list, char *grantee,
+makeAclStmt(char *privs, List *rel_list, char *grantee,
char grant_or_revoke);
/*
@@ -165,10 +165,10 @@ extern char *get_groname(AclId grosysid);
/* XXX move these elsewhere -pma */
extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
-extern int32
+extern int32
pg_func_ownercheck(char *usename, char *funcname,
- int nargs, Oid * arglist);
-extern int32
+ int nargs, Oid *arglist);
+extern int32
pg_aggr_ownercheck(char *usename, char *aggname,
Oid basetypeID);
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index b8116065d4b86baa4a8c7e3081ab2a5685058802..d09330e92ab0143d7e6ea494f62a2b3fb1609631 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: array.h,v 1.7 1997/09/08 20:59:18 momjian Exp $
+ * $Id: array.h,v 1.8 1997/09/08 21:54:49 momjian Exp $
*
* NOTES
* XXX the data array should be LONGALIGN'd -- notice that the array
@@ -109,27 +109,27 @@ typedef struct
{
char lo_name[NAME_LEN];
int C[MAXDIM];
-} CHUNK_INFO;
+} CHUNK_INFO;
/*
* prototypes for functions defined in arrayfuncs.c
*/
extern char *array_in(char *string, Oid element_type);
extern char *array_out(ArrayType *v, Oid element_type);
-extern char *array_dims(ArrayType *v, bool * isNull);
-extern Datum
+extern char *array_dims(ArrayType *v, bool *isNull);
+extern Datum
array_ref(ArrayType *array, int n, int indx[], int reftype,
- int elmlen, int arraylen, bool * isNull);
-extern Datum
+ int elmlen, int arraylen, bool *isNull);
+extern Datum
array_clip(ArrayType *array, int n, int upperIndx[],
- int lowerIndx[], int reftype, int len, bool * isNull);
+ int lowerIndx[], int reftype, int len, bool *isNull);
extern char *
array_set(ArrayType *array, int n, int indx[], char *dataPtr,
- int reftype, int elmlen, int arraylen, bool * isNull);
+ int reftype, int elmlen, int arraylen, bool *isNull);
extern char *
array_assgn(ArrayType *array, int n, int upperIndx[],
int lowerIndx[], ArrayType *newArr, int reftype,
- int len, bool * isNull);
+ int len, bool *isNull);
extern int array_eq(ArrayType *array1, ArrayType *array2);
extern int
_LOtransfer(char **destfd, int size, int nitems, char **srcfd,
@@ -157,14 +157,14 @@ extern int next_tuple(int n, int curr[], int span[]);
* prototypes for functions defined in chunk.c
*/
extern char *
-_ChunkArray(int fd, FILE * afd, int ndim, int dim[], int baseSize,
+_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
int *nbytes, char *chunkfile);
extern int
_ReadChunkArray(int st[], int endp[], int bsize, int fp,
- char *destfp, ArrayType *array, int isDestLO, bool * isNull);
+ char *destfp, ArrayType *array, int isDestLO, bool *isNull);
extern struct varlena *
_ReadChunkArray1El(int st[], int bsize, int fp,
- ArrayType *array, bool * isNull);
+ ArrayType *array, bool *isNull);
#endif /* ARRAY_H */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index f7fc9d2190486e4d9be32adb843f764a95269792..58d6885f35451dea4b0d6cdca7ef8ea039d133a7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.24 1997/09/08 20:59:19 momjian Exp $
+ * $Id: builtins.h,v 1.25 1997/09/08 21:54:50 momjian Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@@ -92,7 +92,7 @@ extern int32 char8cmp(char *arg1, char *arg2);
extern int32 int2in(char *num);
extern char *int2out(int16 sh);
extern int16 *int28in(char *shs);
-extern char *int28out(int16(*shs)[]);
+extern char *int28out(int16 (*shs)[]);
extern int32 *int44in(char *input_string);
extern char *int44out(int32 an_array[]);
extern int32 int4in(char *num);
@@ -123,7 +123,7 @@ extern bool int42lt(int32 arg1, int32 arg2);
extern bool int42le(int32 arg1, int32 arg2);
extern bool int42gt(int32 arg1, int32 arg2);
extern bool int42ge(int32 arg1, int32 arg2);
-extern bool keyfirsteq(int16 * arg1, int16 arg2);
+extern bool keyfirsteq(int16 *arg1, int16 arg2);
extern int32 int4um(int32 arg);
extern int32 int4pl(int32 arg1, int32 arg2);
extern int32 int4mi(int32 arg1, int32 arg2);
@@ -157,13 +157,13 @@ extern int32 int4smaller(int32 arg1, int32 arg2);
/* name.c */
extern NameData *namein(char *s);
-extern char *nameout(NameData * s);
-extern bool nameeq(NameData * arg1, NameData * arg2);
-extern bool namene(NameData * arg1, NameData * arg2);
-extern bool namelt(NameData * arg1, NameData * arg2);
-extern bool namele(NameData * arg1, NameData * arg2);
-extern bool namegt(NameData * arg1, NameData * arg2);
-extern bool namege(NameData * arg1, NameData * arg2);
+extern char *nameout(NameData *s);
+extern bool nameeq(NameData *arg1, NameData *arg2);
+extern bool namene(NameData *arg1, NameData *arg2);
+extern bool namelt(NameData *arg1, NameData *arg2);
+extern bool namele(NameData *arg1, NameData *arg2);
+extern bool namegt(NameData *arg1, NameData *arg2);
+extern bool namege(NameData *arg1, NameData *arg2);
extern int namecmp(Name n1, Name n2);
extern int namecpy(Name n1, Name n2);
extern int namestrcpy(Name name, char *str);
@@ -195,7 +195,7 @@ extern int32 btchar2cmp(uint16 a, uint16 b);
extern int32 btchar4cmp(uint32 a, uint32 b);
extern int32 btchar8cmp(char *a, char *b);
extern int32 btchar16cmp(char *a, char *b);
-extern int32 btnamecmp(NameData * a, NameData * b);
+extern int32 btnamecmp(NameData *a, NameData *b);
extern int32 bttextcmp(struct varlena * a, struct varlena * b);
/* support routines for the rtree access method, by opclass */
@@ -203,9 +203,9 @@ extern BOX *rt_box_union(BOX *a, BOX *b);
extern BOX *rt_box_inter(BOX *a, BOX *b);
extern void rt_box_size(BOX *a, float *size);
extern void rt_bigbox_size(BOX *a, float *size);
-extern void rt_poly_size(POLYGON * a, float *size);
-extern POLYGON *rt_poly_union(POLYGON * a, POLYGON * b);
-extern POLYGON *rt_poly_inter(POLYGON * a, POLYGON * b);
+extern void rt_poly_size(POLYGON *a, float *size);
+extern POLYGON *rt_poly_union(POLYGON *a, POLYGON *b);
+extern POLYGON *rt_poly_inter(POLYGON *a, POLYGON *b);
/* projection utilities */
/* extern char *GetAttributeByName();
@@ -222,7 +222,7 @@ extern int32 reltimein(char *timestring);
extern char *reltimeout(int32 timevalue);
extern TimeInterval tintervalin(char *intervalstr);
extern char *tintervalout(TimeInterval interval);
-extern RelativeTime timespan_reltime(TimeSpan * timespan);
+extern RelativeTime timespan_reltime(TimeSpan *timespan);
extern TimeSpan *reltime_timespan(RelativeTime reltime);
extern TimeInterval mktinterval(AbsoluteTime t1, AbsoluteTime t2);
extern AbsoluteTime timepl(AbsoluteTime t1, RelativeTime t2);
@@ -254,9 +254,9 @@ extern text *timeofday(void);
/* dt.c */
extern DateTime *datetime_in(char *str);
-extern char *datetime_out(DateTime * datetime);
+extern char *datetime_out(DateTime *datetime);
extern TimeSpan *timespan_in(char *str);
-extern char *timespan_out(TimeSpan * timespan);
+extern char *timespan_out(TimeSpan *timespan);
extern int datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
/* filename.c */
@@ -341,8 +341,8 @@ extern bool float84ge(float64 arg1, float32 arg2);
extern double *box_area(BOX *box);
/* misc.c */
-extern bool nullvalue(Datum value, bool * isNull);
-extern bool nonnullvalue(Datum value, bool * isNull);
+extern bool nullvalue(Datum value, bool *isNull);
+extern bool nonnullvalue(Datum value, bool *isNull);
extern bool oidrand(Oid o, int32 X);
extern bool oidsrand(int32 X);
extern int32 userfntest(int i);
@@ -357,7 +357,7 @@ extern bool oidnotin(Oid the_oid, char *compare);
/* oid.c */
extern Oid *oid8in(char *oidString);
-extern char *oid8out(Oid(*oidArray)[]);
+extern char *oid8out(Oid (*oidArray)[]);
extern Oid oidin(char *s);
extern char *oidout(Oid o);
extern bool oideq(Oid arg1, Oid arg2);
@@ -375,8 +375,8 @@ extern bool char8regexeq(char *s, struct varlena * p);
extern bool char8regexne(char *s, struct varlena * p);
extern bool char16regexeq(char *s, struct varlena * p);
extern bool char16regexne(char *s, struct varlena * p);
-extern bool nameregexeq(NameData * n, struct varlena * p);
-extern bool nameregexne(NameData * s, struct varlena * p);
+extern bool nameregexeq(NameData *n, struct varlena * p);
+extern bool nameregexne(NameData *s, struct varlena * p);
extern bool textregexeq(struct varlena * s, struct varlena * p);
extern bool textregexne(struct varlena * s, struct varlena * p);
extern bool char2icregexeq(uint16 arg1, struct varlena * p);
@@ -387,8 +387,8 @@ extern bool char8icregexeq(char *s, struct varlena * p);
extern bool char8icregexne(char *s, struct varlena * p);
extern bool char16icregexeq(char *s, struct varlena * p);
extern bool char16icregexne(char *s, struct varlena * p);
-extern bool nameicregexeq(NameData * s, struct varlena * p);
-extern bool nameicregexne(NameData * s, struct varlena * p);
+extern bool nameicregexeq(NameData *s, struct varlena * p);
+extern bool nameicregexne(NameData *s, struct varlena * p);
extern bool texticregexeq(struct varlena * s, struct varlena * p);
extern bool texticregexne(struct varlena * s, struct varlena * p);
@@ -462,14 +462,14 @@ extern struct varlena *byteain(char *inputText);
extern char *byteaout(struct varlena * vlena);
extern struct varlena *textin(char *inputText);
extern char *textout(struct varlena * vlena);
-extern text *textcat(text * t1, text * t2);
+extern text *textcat(text *t1, text *t2);
extern bool texteq(struct varlena * arg1, struct varlena * arg2);
extern bool textne(struct varlena * arg1, struct varlena * arg2);
extern bool text_lt(struct varlena * arg1, struct varlena * arg2);
extern bool text_le(struct varlena * arg1, struct varlena * arg2);
extern bool text_gt(struct varlena * arg1, struct varlena * arg2);
extern bool text_ge(struct varlena * arg1, struct varlena * arg2);
-extern int32 textpos(text * t1, text * t2);
+extern int32 textpos(text *t1, text *t2);
extern int32 byteaGetSize(struct varlena * v);
extern int32 byteaGetByte(struct varlena * v, int32 n);
extern int32 byteaGetBit(struct varlena * v, int32 n);
@@ -492,19 +492,19 @@ extern int32 date_mi(DateADT dateVal1, DateADT dateVal2);
extern DateADT date_pli(DateADT dateVal, int32 days);
extern DateADT date_mii(DateADT dateVal, int32 days);
extern DateTime *date_datetime(DateADT date);
-extern DateADT datetime_date(DateTime * datetime);
-extern DateTime *datetime_datetime(DateADT date, TimeADT * time);
+extern DateADT datetime_date(DateTime *datetime);
+extern DateTime *datetime_datetime(DateADT date, TimeADT *time);
extern DateADT abstime_date(AbsoluteTime abstime);
extern TimeADT *time_in(char *timestr);
-extern char *time_out(TimeADT * time);
-extern bool time_eq(TimeADT * time1, TimeADT * time2);
-extern bool time_ne(TimeADT * time1, TimeADT * time2);
-extern bool time_lt(TimeADT * time1, TimeADT * time2);
-extern bool time_le(TimeADT * time1, TimeADT * time2);
-extern bool time_gt(TimeADT * time1, TimeADT * time2);
-extern bool time_ge(TimeADT * time1, TimeADT * time2);
-extern int time_cmp(TimeADT * time1, TimeADT * time2);
+extern char *time_out(TimeADT *time);
+extern bool time_eq(TimeADT *time1, TimeADT *time2);
+extern bool time_ne(TimeADT *time1, TimeADT *time2);
+extern bool time_lt(TimeADT *time1, TimeADT *time2);
+extern bool time_le(TimeADT *time1, TimeADT *time2);
+extern bool time_gt(TimeADT *time1, TimeADT *time2);
+extern bool time_ge(TimeADT *time1, TimeADT *time2);
+extern int time_cmp(TimeADT *time1, TimeADT *time2);
extern int32 int42reltime(int32 timevalue);
/* like.c */
@@ -516,22 +516,22 @@ extern bool char8like(char *s, struct varlena * p);
extern bool char8nlike(char *s, struct varlena * p);
extern bool char16like(char *s, struct varlena * p);
extern bool char16nlike(char *s, struct varlena * p);
-extern bool namelike(NameData * n, struct varlena * p);
-extern bool namenlike(NameData * s, struct varlena * p);
+extern bool namelike(NameData *n, struct varlena * p);
+extern bool namenlike(NameData *s, struct varlena * p);
extern bool textlike(struct varlena * s, struct varlena * p);
extern bool textnlike(struct varlena * s, struct varlena * p);
/* oracle_compat.c */
-extern text *lower(text * string);
-extern text *upper(text * string);
-extern text *initcap(text * string);
-extern text *lpad(text * string1, int4 len, text * string2);
-extern text *rpad(text * string1, int4 len, text * string2);
-extern text *ltrim(text * string, text * set);
-extern text *rtrim(text * string, text * set);
-extern text *substr(text * string, int4 m, int4 n);
-extern text *translate(text * string, char from, char to);
+extern text *lower(text *string);
+extern text *upper(text *string);
+extern text *initcap(text *string);
+extern text *lpad(text *string1, int4 len, text *string2);
+extern text *rpad(text *string1, int4 len, text *string2);
+extern text *ltrim(text *string, text *set);
+extern text *rtrim(text *string, text *set);
+extern text *substr(text *string, int4 m, int4 n);
+extern text *translate(text *string, char from, char to);
/* acl.c */
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index 4a88219090ecde908d68170f17cddde694849340..dc1692dee97d2307c90d8e8a2deff134167b18c0 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -12,24 +12,24 @@
/* if we store this as 4 bytes, we better make it int, not long, bjm */
typedef signed int Cash;
-extern const char *cash_out(Cash * value);
+extern const char *cash_out(Cash *value);
extern Cash *cash_in(const char *str);
-extern bool cash_eq(Cash * c1, Cash * c2);
-extern bool cash_ne(Cash * c1, Cash * c2);
-extern bool cash_lt(Cash * c1, Cash * c2);
-extern bool cash_le(Cash * c1, Cash * c2);
-extern bool cash_gt(Cash * c1, Cash * c2);
-extern bool cash_ge(Cash * c1, Cash * c2);
+extern bool cash_eq(Cash *c1, Cash *c2);
+extern bool cash_ne(Cash *c1, Cash *c2);
+extern bool cash_lt(Cash *c1, Cash *c2);
+extern bool cash_le(Cash *c1, Cash *c2);
+extern bool cash_gt(Cash *c1, Cash *c2);
+extern bool cash_ge(Cash *c1, Cash *c2);
-extern Cash *cash_pl(Cash * c1, Cash * c2);
-extern Cash *cash_mi(Cash * c1, Cash * c2);
-extern Cash *cash_mul(Cash * c, float8 * f);
-extern Cash *cash_div(Cash * c, float8 * f);
+extern Cash *cash_pl(Cash *c1, Cash *c2);
+extern Cash *cash_mi(Cash *c1, Cash *c2);
+extern Cash *cash_mul(Cash *c, float8 *f);
+extern Cash *cash_div(Cash *c, float8 *f);
-extern Cash *cashlarger(Cash * c1, Cash * c2);
-extern Cash *cashsmaller(Cash * c1, Cash * c2);
+extern Cash *cashlarger(Cash *c1, Cash *c2);
+extern Cash *cashsmaller(Cash *c1, Cash *c2);
-extern const char *cash_words_out(Cash * value);
+extern const char *cash_words_out(Cash *value);
#endif /* CASH_H */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index c7dc6283445743054ad0529d25d91eedfb88cd02..d84da610ec9c00c7e312c282d5283a780afb59f2 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: catcache.h,v 1.7 1997/09/08 02:39:34 momjian Exp $
+ * $Id: catcache.h,v 1.8 1997/09/08 21:54:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@ typedef struct catctup
Dlelem *ct_node; /* points to LRU list is the CatCTup is in
* the cache, else, points to the cache if
* the CatCTup is in LRU list */
-} CatCTup;
+} CatCTup;
/* voodoo constants */
#define NCCBUCK 500 /* CatCache buckets */
@@ -43,7 +43,7 @@ typedef struct catcache
Oid indexId;
char *cc_relname; /* relation name for defered open */
char *cc_indname; /* index name for defered open */
- HeapTuple(*cc_iscanfunc) (); /* index scanfunction */
+ HeapTuple (*cc_iscanfunc) (); /* index scanfunction */
TupleDesc cc_tupdesc; /* tuple descriptor from reldesc */
int id; /* XXX could be improved -hirohama */
short cc_ntup; /* # of tuples in this cache */
@@ -56,7 +56,7 @@ typedef struct catcache
struct catcache *cc_next;
Dllist *cc_lrulist; /* LRU list, most recent first */
Dllist *cc_cache[NCCBUCK + 1];
-} CatCache;
+} CatCache;
#define InvalidCatalogCacheId (-1)
@@ -69,8 +69,8 @@ CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
extern void ResetSystemCache(void);
extern CatCache *
InitSysCache(char *relname, char *indname, int id, int nkeys,
- int key[], HeapTuple(*iScanfuncP) ());
-extern HeapTuple
+ int key[], HeapTuple (*iScanfuncP) ());
+extern HeapTuple
SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
Datum v3, Datum v4);
extern void
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 8fcd213656819ceb91ab17328977360fbd117bda..923df6c96a34f8292cdea5a7cb9a78595155fb33 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: datum.h,v 1.4 1997/09/08 02:39:36 momjian Exp $
+ * $Id: datum.h,v 1.5 1997/09/08 21:54:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len);
* return true if thwo datums are equal, false otherwise.
* XXX : See comments in the code for restrictions!
*/
-extern bool
+extern bool
datumIsEqual(Datum value1, Datum value2, Oid type,
bool byVal, Size len);
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 8634b7f03c2fffb09be0b725e9660b80a3a1872e..64d270ed74bd11b6e268368f9702f1a6cecfccdb 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dt.h,v 1.20 1997/09/08 02:39:37 momjian Exp $
+ * $Id: dt.h,v 1.21 1997/09/08 21:54:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,7 +36,7 @@ typedef struct
* years */
int4 month; /* months and years, after time for
* alignment */
-} TimeSpan;
+} TimeSpan;
/* ----------------------------------------------------------------
@@ -191,7 +191,7 @@ typedef struct
#endif /* aix */
char type;
char value; /* this may be unsigned, alas */
-} datetkn;
+} datetkn;
#ifdef NAN
#define DT_INVALID (NAN)
@@ -260,52 +260,52 @@ extern int datetime_is_epoch(double j);
*/
extern DateTime *datetime_in(char *str);
-extern char *datetime_out(DateTime * dt);
-extern bool datetime_eq(DateTime * dt1, DateTime * dt2);
-extern bool datetime_ne(DateTime * dt1, DateTime * dt2);
-extern bool datetime_lt(DateTime * dt1, DateTime * dt2);
-extern bool datetime_le(DateTime * dt1, DateTime * dt2);
-extern bool datetime_ge(DateTime * dt1, DateTime * dt2);
-extern bool datetime_gt(DateTime * dt1, DateTime * dt2);
-extern bool datetime_finite(DateTime * datetime);
-extern int datetime_cmp(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_smaller(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_larger(DateTime * dt1, DateTime * dt2);
+extern char *datetime_out(DateTime *dt);
+extern bool datetime_eq(DateTime *dt1, DateTime *dt2);
+extern bool datetime_ne(DateTime *dt1, DateTime *dt2);
+extern bool datetime_lt(DateTime *dt1, DateTime *dt2);
+extern bool datetime_le(DateTime *dt1, DateTime *dt2);
+extern bool datetime_ge(DateTime *dt1, DateTime *dt2);
+extern bool datetime_gt(DateTime *dt1, DateTime *dt2);
+extern bool datetime_finite(DateTime *datetime);
+extern int datetime_cmp(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_smaller(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_larger(DateTime *dt1, DateTime *dt2);
extern TimeSpan *timespan_in(char *str);
-extern char *timespan_out(TimeSpan * span);
-extern bool timespan_eq(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_ne(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_lt(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_le(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_ge(TimeSpan * span1, TimeSpan * span2);
-extern bool timespan_gt(TimeSpan * span1, TimeSpan * span2);
-extern int timespan_cmp(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_smaller(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_larger(TimeSpan * span1, TimeSpan * span2);
-
-extern text *datetime_text(DateTime * datetime);
-extern DateTime *text_datetime(text * str);
-extern text *timespan_text(TimeSpan * timespan);
-extern DateTime *datetime_trunc(text * units, DateTime * datetime);
-extern TimeSpan *timespan_trunc(text * units, TimeSpan * timespan);
-extern float64 datetime_part(text * units, DateTime * datetime);
-extern float64 timespan_part(text * units, TimeSpan * timespan);
-extern text *datetime_zone(text * zone, DateTime * datetime);
-
-extern TimeSpan *timespan_um(TimeSpan * span);
-extern TimeSpan *timespan_pl(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_mi(TimeSpan * span1, TimeSpan * span2);
-extern TimeSpan *timespan_div(TimeSpan * span1, float8 * arg2);
-
-extern TimeSpan *datetime_mi(DateTime * dt1, DateTime * dt2);
-extern DateTime *datetime_pl_span(DateTime * dt, TimeSpan * span);
-extern DateTime *datetime_mi_span(DateTime * dt, TimeSpan * span);
-extern TimeSpan *datetime_age(DateTime * dt1, DateTime * dt2);
+extern char *timespan_out(TimeSpan *span);
+extern bool timespan_eq(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_ne(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_lt(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_le(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_ge(TimeSpan *span1, TimeSpan *span2);
+extern bool timespan_gt(TimeSpan *span1, TimeSpan *span2);
+extern int timespan_cmp(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_smaller(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_larger(TimeSpan *span1, TimeSpan *span2);
+
+extern text *datetime_text(DateTime *datetime);
+extern DateTime *text_datetime(text *str);
+extern text *timespan_text(TimeSpan *timespan);
+extern DateTime *datetime_trunc(text *units, DateTime *datetime);
+extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan);
+extern float64 datetime_part(text *units, DateTime *datetime);
+extern float64 timespan_part(text *units, TimeSpan *timespan);
+extern text *datetime_zone(text *zone, DateTime *datetime);
+
+extern TimeSpan *timespan_um(TimeSpan *span);
+extern TimeSpan *timespan_pl(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_mi(TimeSpan *span1, TimeSpan *span2);
+extern TimeSpan *timespan_div(TimeSpan *span1, float8 *arg2);
+
+extern TimeSpan *datetime_mi(DateTime *dt1, DateTime *dt2);
+extern DateTime *datetime_pl_span(DateTime *dt, TimeSpan *span);
+extern DateTime *datetime_mi_span(DateTime *dt, TimeSpan *span);
+extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2);
extern void GetCurrentTime(struct tm * tm);
extern DateTime SetDateTime(DateTime datetime);
-extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * dt);
+extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
extern void j2date(int jd, int *year, int *month, int *day);
extern int date2j(int year, int month, int day);
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 7c8b075a90bca89bdc1c9c892205e808dd213360..13ed4174f3604df68d11cac151ddc4ace1253dbb 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dynamic_loader.h,v 1.7 1997/09/08 02:39:38 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.8 1997/09/08 21:54:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@ typedef struct df_files
ino_t inode; /* Inode number of file */
void *handle; /* a handle for pg_dl* functions */
struct df_files *next;
-} DynamicFileList;
+} DynamicFileList;
extern void *pg_dlopen(char *filename);
extern func_ptr pg_dlsym(void *handle, char *funcname);
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index c8b791cb6f691f909740ec7d5eac38a403e2e0b1..bdc9a83d0e61a693bf2837fb3e6e5738ea598a62 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: exc.h,v 1.9 1997/09/08 02:39:41 momjian Exp $
+ * $Id: exc.h,v 1.10 1997/09/08 21:54:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,7 +43,7 @@ typedef struct ExcFrame
ExcDetail detail;
ExcData data;
ExcMessage message;
-} ExcFrame;
+} ExcFrame;
extern ExcFrame *ExcCurFrameP;
@@ -71,7 +71,7 @@ extern ExcFrame *ExcCurFrameP;
#define reraise() \
raise4(*exception.id,exception.detail,exception.data,exception.message)
-typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
+typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage);
/*
@@ -79,7 +79,7 @@ typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage);
*/
extern void EnableExceptionHandling(bool on);
extern void
-ExcRaise(Exception * excP,
+ExcRaise(Exception *excP,
ExcDetail detail,
ExcData data,
ExcMessage message);
@@ -89,7 +89,7 @@ ExcRaise(Exception * excP,
* prototypes for functions in excabort.c
*/
extern void
-ExcAbort(const Exception * excP, ExcDetail detail, ExcData data,
+ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
ExcMessage message);
#endif /* EXC_H */
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index af8111676e485ff4ba408f5b24290847450097f7..f9ace84b13ac5808e0a1d721e3a2091e837363bd 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fcache.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
+ * $Id: fcache.h,v 1.5 1997/09/08 21:54:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,6 +49,7 @@ typedef struct
* of tuples */
bool istrusted; /* trusted fn? */
-} FunctionCache, *FunctionCachePtr;
+} FunctionCache,
+ *FunctionCachePtr;
#endif /* FCACHE_H */
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index bf9c7fb0c64df06fda845d459b346a13f44dcf19..9ed3c76603e3ea7c0a73669f1186d807ab5fccac 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fcache2.h,v 1.4 1997/09/08 02:39:43 momjian Exp $
+ * $Id: fcache2.h,v 1.5 1997/09/08 21:55:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,6 +16,6 @@
#include <nodes/execnodes.h>
extern void
- setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext);
+ setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
#endif /* FCACHE2_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index a94e7f4811cd6f117fd0216a64f7d9ab9b176b66..953f18113751c4e54efd069aca8016ae003729d9 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fmgrtab.h,v 1.6 1997/09/08 02:39:44 momjian Exp $
+ * $Id: fmgrtab.h,v 1.7 1997/09/08 21:55:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,7 @@ typedef struct
uint16 nargs;
func_ptr func;
char *funcName;
-} FmgrCall;
+} FmgrCall;
extern FmgrCall *fmgr_isbuiltin(Oid id);
extern func_ptr fmgr_lookupByName(char *name);
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index be308f28ae80148cae6154fa630e30f2525c752e..878f1bb418550b88c5f0c914fd0495954329cb8b 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geo_decls.h,v 1.11 1997/09/08 20:59:21 momjian Exp $
+ * $Id: geo_decls.h,v 1.12 1997/09/08 21:55:06 momjian Exp $
*
* NOTE
* These routines do *not* use the float types from adt/.
@@ -67,7 +67,7 @@ typedef struct
{
double x,
y;
-} Point;
+} Point;
/*---------------------------------------------------------------------
@@ -78,7 +78,7 @@ typedef struct
Point p[2];
double m; /* precomputed to save time, not in tuple */
-} LSEG;
+} LSEG;
/*---------------------------------------------------------------------
@@ -91,7 +91,7 @@ typedef struct
int32 closed; /* is this a closed polygon? */
int32 dummy; /* padding to make it double align */
Point p[1]; /* variable length array of POINTs */
-} PATH;
+} PATH;
/*---------------------------------------------------------------------
@@ -109,7 +109,7 @@ typedef struct
C;
double m;
-} LINE;
+} LINE;
/*---------------------------------------------------------------------
@@ -133,7 +133,7 @@ typedef struct
int32 npts;
BOX boundbox;
Point p[1]; /* variable length array of POINTs */
-} POLYGON;
+} POLYGON;
/*---------------------------------------------------------------------
* CIRCLE - Specified by a center point and radius.
@@ -142,7 +142,7 @@ typedef struct
{
Point center;
double radius;
-} CIRCLE;
+} CIRCLE;
/*
* in geo_ops.h
@@ -150,65 +150,65 @@ typedef struct
/* public point routines */
extern Point *point_in(char *str);
-extern char *point_out(Point * pt);
-extern bool point_left(Point * pt1, Point * pt2);
-extern bool point_right(Point * pt1, Point * pt2);
-extern bool point_above(Point * pt1, Point * pt2);
-extern bool point_below(Point * pt1, Point * pt2);
-extern bool point_vert(Point * pt1, Point * pt2);
-extern bool point_horiz(Point * pt1, Point * pt2);
-extern bool point_eq(Point * pt1, Point * pt2);
-extern int32 pointdist(Point * p1, Point * p2);
-extern double *point_distance(Point * pt1, Point * pt2);
-extern double *point_slope(Point * pt1, Point * pt2);
+extern char *point_out(Point *pt);
+extern bool point_left(Point *pt1, Point *pt2);
+extern bool point_right(Point *pt1, Point *pt2);
+extern bool point_above(Point *pt1, Point *pt2);
+extern bool point_below(Point *pt1, Point *pt2);
+extern bool point_vert(Point *pt1, Point *pt2);
+extern bool point_horiz(Point *pt1, Point *pt2);
+extern bool point_eq(Point *pt1, Point *pt2);
+extern int32 pointdist(Point *p1, Point *p2);
+extern double *point_distance(Point *pt1, Point *pt2);
+extern double *point_slope(Point *pt1, Point *pt2);
/* private routines */
-extern double point_dt(Point * pt1, Point * pt2);
-extern double point_sl(Point * pt1, Point * pt2);
+extern double point_dt(Point *pt1, Point *pt2);
+extern double point_sl(Point *pt1, Point *pt2);
-extern Point *point(float8 * x, float8 * y);
-extern Point *point_add(Point * p1, Point * p2);
-extern Point *point_sub(Point * p1, Point * p2);
-extern Point *point_mul(Point * p1, Point * p2);
-extern Point *point_div(Point * p1, Point * p2);
+extern Point *point(float8 *x, float8 *y);
+extern Point *point_add(Point *p1, Point *p2);
+extern Point *point_sub(Point *p1, Point *p2);
+extern Point *point_mul(Point *p1, Point *p2);
+extern Point *point_div(Point *p1, Point *p2);
/* public lseg routines */
extern LSEG *lseg_in(char *str);
-extern char *lseg_out(LSEG * ls);
-extern bool lseg_intersect(LSEG * l1, LSEG * l2);
-extern bool lseg_parallel(LSEG * l1, LSEG * l2);
-extern bool lseg_perp(LSEG * l1, LSEG * l2);
-extern bool lseg_vertical(LSEG * lseg);
-extern bool lseg_horizontal(LSEG * lseg);
-extern bool lseg_eq(LSEG * l1, LSEG * l2);
-extern double *lseg_distance(LSEG * l1, LSEG * l2);
-extern Point *lseg_center(LSEG * lseg);
-extern Point *lseg_interpt(LSEG * l1, LSEG * l2);
-extern double *dist_pl(Point * pt, LINE * line);
-extern double *dist_ps(Point * pt, LSEG * lseg);
-extern double *dist_ppath(Point * pt, PATH * path);
-extern double *dist_pb(Point * pt, BOX *box);
-extern double *dist_sl(LSEG * lseg, LINE * line);
-extern double *dist_sb(LSEG * lseg, BOX *box);
-extern double *dist_lb(LINE * line, BOX *box);
-extern Point *close_pl(Point * pt, LINE * line);
-extern Point *close_ps(Point * pt, LSEG * lseg);
-extern Point *close_pb(Point * pt, BOX *box);
-extern Point *close_sl(LSEG * lseg, LINE * line);
-extern Point *close_sb(LSEG * lseg, BOX *box);
-extern Point *close_lb(LINE * line, BOX *box);
-extern bool on_pl(Point * pt, LINE * line);
-extern bool on_ps(Point * pt, LSEG * lseg);
-extern bool on_pb(Point * pt, BOX *box);
-extern bool on_ppath(Point * pt, PATH * path);
-extern bool on_sl(LSEG * lseg, LINE * line);
-extern bool on_sb(LSEG * lseg, BOX *box);
-extern bool inter_sl(LSEG * lseg, LINE * line);
-extern bool inter_sb(LSEG * lseg, BOX *box);
-extern bool inter_lb(LINE * line, BOX *box);
+extern char *lseg_out(LSEG *ls);
+extern bool lseg_intersect(LSEG *l1, LSEG *l2);
+extern bool lseg_parallel(LSEG *l1, LSEG *l2);
+extern bool lseg_perp(LSEG *l1, LSEG *l2);
+extern bool lseg_vertical(LSEG *lseg);
+extern bool lseg_horizontal(LSEG *lseg);
+extern bool lseg_eq(LSEG *l1, LSEG *l2);
+extern double *lseg_distance(LSEG *l1, LSEG *l2);
+extern Point *lseg_center(LSEG *lseg);
+extern Point *lseg_interpt(LSEG *l1, LSEG *l2);
+extern double *dist_pl(Point *pt, LINE *line);
+extern double *dist_ps(Point *pt, LSEG *lseg);
+extern double *dist_ppath(Point *pt, PATH *path);
+extern double *dist_pb(Point *pt, BOX *box);
+extern double *dist_sl(LSEG *lseg, LINE *line);
+extern double *dist_sb(LSEG *lseg, BOX *box);
+extern double *dist_lb(LINE *line, BOX *box);
+extern Point *close_pl(Point *pt, LINE *line);
+extern Point *close_ps(Point *pt, LSEG *lseg);
+extern Point *close_pb(Point *pt, BOX *box);
+extern Point *close_sl(LSEG *lseg, LINE *line);
+extern Point *close_sb(LSEG *lseg, BOX *box);
+extern Point *close_lb(LINE *line, BOX *box);
+extern bool on_pl(Point *pt, LINE *line);
+extern bool on_ps(Point *pt, LSEG *lseg);
+extern bool on_pb(Point *pt, BOX *box);
+extern bool on_ppath(Point *pt, PATH *path);
+extern bool on_sl(LSEG *lseg, LINE *line);
+extern bool on_sb(LSEG *lseg, BOX *box);
+extern bool inter_sl(LSEG *lseg, LINE *line);
+extern bool inter_sb(LSEG *lseg, BOX *box);
+extern bool inter_lb(LINE *line, BOX *box);
/* private routines */
-extern LSEG *lseg_construct(Point * pt1, Point * pt2);
+extern LSEG *lseg_construct(Point *pt1, Point *pt2);
/* public box routines */
extern BOX *box_in(char *str);
@@ -241,120 +241,120 @@ extern LSEG *box_diagonal(BOX *box);
extern double box_dt(BOX *box1, BOX *box2);
-extern BOX *box(Point * p1, Point * p2);
-extern BOX *box_add(BOX *box, Point * p);
-extern BOX *box_sub(BOX *box, Point * p);
-extern BOX *box_mul(BOX *box, Point * p);
-extern BOX *box_div(BOX *box, Point * p);
+extern BOX *box(Point *p1, Point *p2);
+extern BOX *box_add(BOX *box, Point *p);
+extern BOX *box_sub(BOX *box, Point *p);
+extern BOX *box_mul(BOX *box, Point *p);
+extern BOX *box_div(BOX *box, Point *p);
/* private line routines */
-extern double *line_distance(LINE * l1, LINE * l2);
+extern double *line_distance(LINE *l1, LINE *l2);
/* public path routines */
extern PATH *path_in(char *str);
-extern char *path_out(PATH * path);
-extern bool path_n_lt(PATH * p1, PATH * p2);
-extern bool path_n_gt(PATH * p1, PATH * p2);
-extern bool path_n_eq(PATH * p1, PATH * p2);
-extern bool path_n_le(PATH * p1, PATH * p2);
-extern bool path_n_ge(PATH * p1, PATH * p2);
-extern bool path_inter(PATH * p1, PATH * p2);
-extern double *path_distance(PATH * p1, PATH * p2);
-extern double *path_length(PATH * path);
-
-extern bool path_isclosed(PATH * path);
-extern bool path_isopen(PATH * path);
-extern int4 path_npoints(PATH * path);
-
-extern PATH *path_close(PATH * path);
-extern PATH *path_open(PATH * path);
-extern PATH *path_add(PATH * p1, PATH * p2);
-extern PATH *path_add_pt(PATH * path, Point * point);
-extern PATH *path_sub_pt(PATH * path, Point * point);
-extern PATH *path_mul_pt(PATH * path, Point * point);
-extern PATH *path_div_pt(PATH * path, Point * point);
-extern bool path_contain_pt(PATH * path, Point * p);
-extern bool pt_contained_path(Point * p, PATH * path);
-
-extern Point *path_center(PATH * path);
-extern POLYGON *path_poly(PATH * path);
-
-extern PATH *upgradepath(PATH * path);
-extern bool isoldpath(PATH * path);
+extern char *path_out(PATH *path);
+extern bool path_n_lt(PATH *p1, PATH *p2);
+extern bool path_n_gt(PATH *p1, PATH *p2);
+extern bool path_n_eq(PATH *p1, PATH *p2);
+extern bool path_n_le(PATH *p1, PATH *p2);
+extern bool path_n_ge(PATH *p1, PATH *p2);
+extern bool path_inter(PATH *p1, PATH *p2);
+extern double *path_distance(PATH *p1, PATH *p2);
+extern double *path_length(PATH *path);
+
+extern bool path_isclosed(PATH *path);
+extern bool path_isopen(PATH *path);
+extern int4 path_npoints(PATH *path);
+
+extern PATH *path_close(PATH *path);
+extern PATH *path_open(PATH *path);
+extern PATH *path_add(PATH *p1, PATH *p2);
+extern PATH *path_add_pt(PATH *path, Point *point);
+extern PATH *path_sub_pt(PATH *path, Point *point);
+extern PATH *path_mul_pt(PATH *path, Point *point);
+extern PATH *path_div_pt(PATH *path, Point *point);
+extern bool path_contain_pt(PATH *path, Point *p);
+extern bool pt_contained_path(Point *p, PATH *path);
+
+extern Point *path_center(PATH *path);
+extern POLYGON *path_poly(PATH *path);
+
+extern PATH *upgradepath(PATH *path);
+extern bool isoldpath(PATH *path);
/* public polygon routines */
extern POLYGON *poly_in(char *s);
-extern char *poly_out(POLYGON * poly);
-extern bool poly_left(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overleft(POLYGON * polya, POLYGON * polyb);
-extern bool poly_right(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overright(POLYGON * polya, POLYGON * polyb);
-extern bool poly_same(POLYGON * polya, POLYGON * polyb);
-extern bool poly_overlap(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contain(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contained(POLYGON * polya, POLYGON * polyb);
-extern bool poly_contain_pt(POLYGON * poly, Point * p);
-extern bool pt_contained_poly(Point * p, POLYGON * poly);
-
-extern double *poly_distance(POLYGON * polya, POLYGON * polyb);
-extern int4 poly_npoints(POLYGON * poly);
-extern Point *poly_center(POLYGON * poly);
-extern BOX *poly_box(POLYGON * poly);
-extern PATH *poly_path(POLYGON * poly);
+extern char *poly_out(POLYGON *poly);
+extern bool poly_left(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overleft(POLYGON *polya, POLYGON *polyb);
+extern bool poly_right(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overright(POLYGON *polya, POLYGON *polyb);
+extern bool poly_same(POLYGON *polya, POLYGON *polyb);
+extern bool poly_overlap(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contain(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contained(POLYGON *polya, POLYGON *polyb);
+extern bool poly_contain_pt(POLYGON *poly, Point *p);
+extern bool pt_contained_poly(Point *p, POLYGON *poly);
+
+extern double *poly_distance(POLYGON *polya, POLYGON *polyb);
+extern int4 poly_npoints(POLYGON *poly);
+extern Point *poly_center(POLYGON *poly);
+extern BOX *poly_box(POLYGON *poly);
+extern PATH *poly_path(POLYGON *poly);
extern POLYGON *box_poly(BOX *box);
-extern POLYGON *upgradepoly(POLYGON * poly);
-extern POLYGON *revertpoly(POLYGON * poly);
+extern POLYGON *upgradepoly(POLYGON *poly);
+extern POLYGON *revertpoly(POLYGON *poly);
/* private polygon routines */
/* public circle routines */
extern CIRCLE *circle_in(char *str);
-extern char *circle_out(CIRCLE * circle);
-extern bool circle_same(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overlap(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overleft(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_left(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_right(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_overright(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contained(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contain(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_below(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_above(CIRCLE * circle1, CIRCLE * circle2);
-
-extern bool circle_eq(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_ne(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_lt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_gt(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_le(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_ge(CIRCLE * circle1, CIRCLE * circle2);
-extern bool circle_contain_pt(CIRCLE * circle, Point * point);
-extern bool pt_contained_circle(Point * point, CIRCLE * circle);
-extern CIRCLE *circle_add_pt(CIRCLE * circle, Point * point);
-extern CIRCLE *circle_sub_pt(CIRCLE * circle, Point * point);
-extern CIRCLE *circle_mul_pt(CIRCLE * circle, Point * point);
-extern CIRCLE *circle_div_pt(CIRCLE * circle, Point * point);
-extern double *circle_diameter(CIRCLE * circle);
-extern double *circle_radius(CIRCLE * circle);
-extern double *circle_distance(CIRCLE * circle1, CIRCLE * circle2);
-extern double *dist_pc(Point * point, CIRCLE * circle);
-extern double *dist_cpoly(CIRCLE * circle, POLYGON * poly);
-extern Point *circle_center(CIRCLE * circle);
-extern CIRCLE *circle(Point * center, float8 * radius);
+extern char *circle_out(CIRCLE *circle);
+extern bool circle_same(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overlap(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overleft(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_left(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_right(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_overright(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contained(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contain(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_below(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_above(CIRCLE *circle1, CIRCLE *circle2);
+
+extern bool circle_eq(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_ne(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_lt(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_gt(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_le(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_ge(CIRCLE *circle1, CIRCLE *circle2);
+extern bool circle_contain_pt(CIRCLE *circle, Point *point);
+extern bool pt_contained_circle(Point *point, CIRCLE *circle);
+extern CIRCLE *circle_add_pt(CIRCLE *circle, Point *point);
+extern CIRCLE *circle_sub_pt(CIRCLE *circle, Point *point);
+extern CIRCLE *circle_mul_pt(CIRCLE *circle, Point *point);
+extern CIRCLE *circle_div_pt(CIRCLE *circle, Point *point);
+extern double *circle_diameter(CIRCLE *circle);
+extern double *circle_radius(CIRCLE *circle);
+extern double *circle_distance(CIRCLE *circle1, CIRCLE *circle2);
+extern double *dist_pc(Point *point, CIRCLE *circle);
+extern double *dist_cpoly(CIRCLE *circle, POLYGON *poly);
+extern Point *circle_center(CIRCLE *circle);
+extern CIRCLE *circle(Point *center, float8 *radius);
extern CIRCLE *box_circle(BOX *box);
-extern BOX *circle_box(CIRCLE * circle);
-extern CIRCLE *poly_circle(POLYGON * poly);
-extern POLYGON *circle_poly(int npts, CIRCLE * circle);
+extern BOX *circle_box(CIRCLE *circle);
+extern CIRCLE *poly_circle(POLYGON *poly);
+extern POLYGON *circle_poly(int npts, CIRCLE *circle);
/* private routines */
-extern double *circle_area(CIRCLE * circle);
-extern double circle_dt(CIRCLE * circle1, CIRCLE * circle2);
+extern double *circle_area(CIRCLE *circle);
+extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2);
/* geo_selfuncs.c */
-extern float64
+extern float64
areasel(Oid opid, Oid relid, AttrNumber attno,
char *value, int32 flag);
-extern float64
+extern float64
areajoinsel(Oid opid, Oid relid, AttrNumber attno,
char *value, int32 flag);
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 7cc6894c92a269ffccd712955f66aedf2f38f689..55fe23315ddb36bf3fc7d8135f3a426aba2bb683 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hsearch.h,v 1.5 1997/09/08 02:39:47 momjian Exp $
+ * $Id: hsearch.h,v 1.6 1997/09/08 21:55:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,7 +36,7 @@ typedef struct element
{
unsigned long next; /* secret from user */
long key;
-} ELEMENT;
+} ELEMENT;
typedef unsigned long BUCKET_INDEX;
@@ -67,7 +67,7 @@ typedef struct hashhdr
long accesses;
long collisions;
#endif
-} HHDR;
+} HHDR;
typedef struct htab
{
@@ -79,7 +79,7 @@ typedef struct htab
long *(*alloc) (); /* memory allocator (long * for alignment
* reasons) */
-} HTAB;
+} HTAB;
typedef struct hashctl
{
@@ -97,7 +97,7 @@ typedef struct hashctl
long *dir; /* directory if allocated already */
long *hctl; /* location of header information in shd
* mem */
-} HASHCTL;
+} HASHCTL;
/* Flags to indicate action for hctl */
#define HASH_BUCKET 0x001 /* Setting bucket size */
@@ -125,18 +125,18 @@ typedef enum
HASH_REMOVE,
HASH_FIND_SAVE,
HASH_REMOVE_SAVED
-} HASHACTION;
+} HASHACTION;
/*
* prototypes from functions in dynahash.c
*/
-extern HTAB *hash_create(int nelem, HASHCTL * info, int flags);
-extern void hash_destroy(HTAB * hashp);
-extern void hash_stats(char *where, HTAB * hashp);
+extern HTAB *hash_create(int nelem, HASHCTL *info, int flags);
+extern void hash_destroy(HTAB *hashp);
+extern void hash_stats(char *where, HTAB *hashp);
extern long *
-hash_search(HTAB * hashp, char *keyPtr, HASHACTION action,
- bool * foundPtr);
-extern long *hash_seq(HTAB * hashp);
+hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
+ bool *foundPtr);
+extern long *hash_seq(HTAB *hashp);
/*
* prototypes from functions in hashfn.c
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index ada1cf32d12cc32738d4eaed0e5b69c0ca10a495..06ebf21927efccdb802def0250b21ceda8df91c1 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: inval.h,v 1.6 1997/09/08 02:39:48 momjian Exp $
+ * $Id: inval.h,v 1.7 1997/09/08 21:55:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,13 +30,13 @@ extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple);
typedef struct InvalidationUserData
{
struct InvalidationUserData *dataP[1]; /* VARIABLE LENGTH */
-} InvalidationUserData; /* VARIABLE LENGTH STRUCTURE */
+} InvalidationUserData; /* VARIABLE LENGTH STRUCTURE */
typedef struct InvalidationEntryData
{
InvalidationUserData *nextP;
InvalidationUserData userData; /* VARIABLE LENGTH ARRAY */
-} InvalidationEntryData; /* VARIABLE LENGTH STRUCTURE */
+} InvalidationEntryData; /* VARIABLE LENGTH STRUCTURE */
typedef Pointer InvalidationEntry;
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index f31fa5583d2655a8888e580f24d6839aea0c53b1..a820f2ddaf5c1c69f8d53ec22465ad7c10306b0b 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lselect.h,v 1.6 1997/09/08 02:39:48 momjian Exp $
+ * $Id: lselect.h,v 1.7 1997/09/08 21:55:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,13 +32,13 @@ typedef struct
int nKeys;
ScanKey scanKeys;
int sortMem; /* needed for psort */
-} LeftistContextData;
+} LeftistContextData;
typedef LeftistContextData *LeftistContext;
extern struct leftist *
lmerge(struct leftist * pt, struct leftist * qt,
LeftistContext context);
-extern HeapTuple
+extern HeapTuple
gettuple(struct leftist ** treep, short *devnum,
LeftistContext context);
extern void
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index cad6ecfbfa4d576307994f41eade33b0525a48e4..ca07a4a25cce5cf94fcbe6b83510f419f83a13b6 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lsyscache.h,v 1.5 1997/09/08 02:39:49 momjian Exp $
+ * $Id: lsyscache.h,v 1.6 1997/09/08 21:55:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,9 +23,9 @@ extern Oid get_atttype(Oid relid, AttrNumber attnum);
extern bool get_attisset(Oid relid, char *attname);
extern RegProcedure get_opcode(Oid opid);
extern char *get_opname(Oid opid);
-extern bool
+extern bool
op_mergesortable(Oid opid, Oid ltype, Oid rtype,
- Oid * leftOp, Oid * rightOp);
+ Oid *leftOp, Oid *rightOp);
extern Oid op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
extern Oid get_commutator(Oid opid);
extern HeapTuple get_operator_tuple(Oid opno);
@@ -34,7 +34,7 @@ extern RegProcedure get_oprrest(Oid opid);
extern RegProcedure get_oprjoin(Oid opid);
extern int get_relnatts(Oid relid);
extern char *get_rel_name(Oid relid);
-extern struct varlena *get_relstub(Oid relid, int no, bool * islast);
+extern struct varlena *get_relstub(Oid relid, int no, bool *islast);
extern Oid get_ruleid(char *rulename);
extern Oid get_eventrelid(Oid ruleid);
extern int16 get_typlen(Oid typid);
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 4c37d33187c30e45b498799356703e678b4cd54a..54f772394369a449e9ce36a1ce9f6cc11d9cda74 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: mcxt.h,v 1.7 1997/09/08 02:39:49 momjian Exp $
+ * $Id: mcxt.h,v 1.8 1997/09/08 21:55:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@ extern MemoryContext TopMemoryContext;
*/
extern void EnableMemoryContext(bool on);
extern Pointer MemoryContextAlloc(MemoryContext context, Size size);
-extern Pointer
+extern Pointer
MemoryContextRealloc(MemoryContext context,
Pointer pointer,
Size size);
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index f1a065caf4a962044fc3de4d6d2684e545bb3354..8fcaee7bc534e50b88c53a3575afd9369a041041 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nabstime.h,v 1.12 1997/09/08 02:39:51 momjian Exp $
+ * $Id: nabstime.h,v 1.13 1997/09/08 21:55:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@ typedef struct
{
int32 status;
AbsoluteTime data[2];
-} TimeIntervalData;
+} TimeIntervalData;
typedef TimeIntervalData *TimeInterval;
/*
@@ -112,7 +112,7 @@ extern bool abstimele(AbsoluteTime t1, AbsoluteTime t2);
extern bool abstimege(AbsoluteTime t1, AbsoluteTime t2);
extern bool abstime_finite(AbsoluteTime time);
-extern AbsoluteTime datetime_abstime(DateTime * datetime);
+extern AbsoluteTime datetime_abstime(DateTime *datetime);
extern DateTime *abstime_datetime(AbsoluteTime abstime);
extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 84a5d539af4a59c7e7a11d8d691ceb7eeab4aa07..8150bb9caa8afca84604a950efbec73f246fb53f 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: portal.h,v 1.6 1997/09/08 02:39:53 momjian Exp $
+ * $Id: portal.h,v 1.7 1997/09/08 21:55:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@ typedef struct PortalBlockData
{
AllocSetData setData;
FixedItemData itemData;
-} PortalBlockData;
+} PortalBlockData;
typedef PortalBlockData *PortalBlock;
@@ -69,13 +69,13 @@ extern void EnablePortalManager(bool on);
extern Portal GetPortalByName(char *name);
extern Portal BlankPortalAssignName(char *name);
extern void
-PortalSetQuery(Portal portal, QueryDesc * queryDesc,
- TupleDesc attinfo, EState * state,
+PortalSetQuery(Portal portal, QueryDesc *queryDesc,
+ TupleDesc attinfo, EState *state,
void (*cleanup) (Portal portal));
extern QueryDesc *PortalGetQueryDesc(Portal portal);
extern EState *PortalGetState(Portal portal);
extern Portal CreatePortal(char *name);
-extern void PortalDestroy(Portal * portalP);
+extern void PortalDestroy(Portal *portalP);
extern void StartPortalAllocMode(AllocMode mode, Size limit);
extern void EndPortalAllocMode(void);
extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index 01fa4153c1efe5b3ffdcff988fce9c02acce89d4..21366b2220f1fa0394f09f23cc49a97adc69bec9 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: psort.h,v 1.9 1997/09/08 02:39:54 momjian Exp $
+ * $Id: psort.h,v 1.10 1997/09/08 21:55:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@ typedef struct Psortstate
bool using_tape_files;
HeapTuple *memtuples;
-} Psortstate;
+} Psortstate;
#ifdef EBUG
#include <stdio.h>
@@ -98,10 +98,10 @@ if (1) CODE; else
#endif
/* psort.c */
-extern bool psort_begin(Sort * node, int nkeys, ScanKey key);
-extern HeapTuple psort_grabtuple(Sort * node);
-extern void psort_markpos(Sort * node);
-extern void psort_restorepos(Sort * node);
-extern void psort_end(Sort * node);
+extern bool psort_begin(Sort *node, int nkeys, ScanKey key);
+extern HeapTuple psort_grabtuple(Sort *node);
+extern void psort_markpos(Sort *node);
+extern void psort_restorepos(Sort *node);
+extern void psort_end(Sort *node);
#endif /* PSORT_H */
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 9fe943c58d6769f24bb1bc4360f4493a96073acd..0dbf0e1c397337d1e07d3151b2bf315fe5cc60a2 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rel.h,v 1.11 1997/09/08 02:39:55 momjian Exp $
+ * $Id: rel.h,v 1.12 1997/09/08 21:55:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@ typedef struct Trigger
int16 tgnargs;
int16 tgattr[8];
char **tgargs;
-} Trigger;
+} Trigger;
typedef struct TriggerDesc
{
@@ -42,7 +42,7 @@ typedef struct TriggerDesc
Trigger **tg_after_row[4];
Trigger **tg_after_statement[4];
Trigger *triggers;
-} TriggerDesc;
+} TriggerDesc;
typedef struct RelationData
{
@@ -62,7 +62,7 @@ typedef struct RelationData
IndexStrategy rd_istrat;
RegProcedure *rd_support;
TriggerDesc *trigdesc;
-} RelationData;
+} RelationData;
typedef RelationData *Relation;
@@ -190,6 +190,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation);
extern void
RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
- RegProcedure * support);
+ RegProcedure *support);
#endif /* REL_H */
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 19873d34e28bbccdbdc710f36ca95190a074a87b..0f750f47ff937ce4326b9d235ac68ae6222d6cef 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rel2.h,v 1.3 1997/09/07 05:02:58 momjian Exp $
+ * $Id: rel2.h,v 1.4 1997/09/08 21:55:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,6 +19,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation);
extern void
RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
- RegProcedure * support);
+ RegProcedure *support);
#endif /* TMP_REL2_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 627356e29a3939069b10114e39f45d877b7ebabf..54c42a198444d90c296d72f0f3c2412508caf08d 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: syscache.h,v 1.6 1997/09/08 02:39:58 momjian Exp $
+ * $Id: syscache.h,v 1.7 1997/09/08 21:55:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -73,16 +73,15 @@ struct cachedesc
int size; /* sizeof(appropriate struct) */
char *indname; /* index relation for this cache, if
* exists */
- HeapTuple(*iScanFunc) (); /* function to handle
- * index scans */
+ HeapTuple (*iScanFunc) ();/* function to handle index scans */
};
extern void zerocaches(void);
extern void InitCatalogCache(void);
-extern HeapTuple
+extern HeapTuple
SearchSysCacheTuple(int cacheId, Datum key1, Datum key2,
Datum key3, Datum key4);
-extern int32
+extern int32
SearchSysCacheStruct(int cacheId, char *returnStruct,
Datum key1, Datum key2, Datum key3, Datum key4);
extern void *
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 579c6e9525e3ef2eb77522afd4c7a629646385e3..11253891a98bed9943892b9cc90de36589c0050a 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tqual.h,v 1.8 1997/09/08 02:39:59 momjian Exp $
+ * $Id: tqual.h,v 1.9 1997/09/08 21:55:19 momjian Exp $
*
* NOTE
* It may be desirable to allow time qualifications to indicate
@@ -22,7 +22,7 @@
typedef struct TimeQualSpace
{
char data[12];
-} TimeQualSpace;
+} TimeQualSpace;
typedef Pointer TimeQual;
@@ -36,7 +36,7 @@ extern void setheapoverride(bool on);
extern bool heapisoverride(void);
extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time);
-extern TimeQual
+extern TimeQual
TimeFormRangedTimeQual(AbsoluteTime startTime,
AbsoluteTime endTime);
extern bool HeapTupleSatisfiesTimeQual(HeapTuple tuple, TimeQual qual);
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index fb43616a8ea9826db65ca5d3c0037cbd9fb19d88..5b82ff1a51c98b6c11262be2a031579f15159188 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.5 1997/09/08 02:40:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.6 1997/09/08 21:55:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
* Create the Id for a new connection and hash it
*/
void
-PgSetConnectionId(Pg_clientData * cd, char *id, PGconn * conn)
+PgSetConnectionId(Pg_clientData * cd, char *id, PGconn *conn)
{
Tcl_HashEntry *hent;
Pg_ConnectionId *connid;
@@ -111,7 +111,7 @@ PgDelConnectionId(Pg_clientData * cd, char *id)
* Create a new result Id and hash it
*/
void
-PgSetResultId(Pg_clientData * cd, char *id, char *connid_c, PGresult * res)
+PgSetResultId(Pg_clientData * cd, char *id, char *connid_c, PGresult *res)
{
Tcl_HashEntry *hent;
Pg_ConnectionId *connid;
diff --git a/src/interfaces/libpgtcl/pgtclId.h b/src/interfaces/libpgtcl/pgtclId.h
index 22d44c5b9fa9603d9562544c3d742ba73f7a0c29..130f017ec6ec39a740c67af283d6f458de6fa3c7 100644
--- a/src/interfaces/libpgtcl/pgtclId.h
+++ b/src/interfaces/libpgtcl/pgtclId.h
@@ -8,15 +8,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pgtclId.h,v 1.4 1997/09/08 02:40:17 momjian Exp $
+ * $Id: pgtclId.h,v 1.5 1997/09/08 21:55:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-extern void PgSetConnectionId(Pg_clientData * cd, char *id, PGconn * conn);
+extern void PgSetConnectionId(Pg_clientData * cd, char *id, PGconn *conn);
extern PGconn *PgGetConnectionId(Pg_clientData * cd, char *id);
extern void PgDelConnectionId(Pg_clientData * cd, char *id);
-extern void PgSetResultId(Pg_clientData * cd, char *id, char *connid, PGresult * res);
+extern void PgSetResultId(Pg_clientData * cd, char *id, char *connid, PGresult *res);
extern PGresult *PgGetResultId(Pg_clientData * cd, char *id);
extern void PgDelResultId(Pg_clientData * cd, char *id);
extern void PgGetConnByResultId(Pg_clientData * cd, char *id, char *resid);
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 0b4a697f8596b2d4abdcdf4514ff2e98a6baa604..3bcd919dc0cf8a006952c072115b8957b818dd3e 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.10 1997/09/08 02:40:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.11 1997/09/08 21:55:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -457,7 +457,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock,
#endif /* KRB5 */
static int
-pg_password_sendauth(Port * port, const char *user, const char *password)
+pg_password_sendauth(Port *port, const char *user, const char *password)
{
PacketBuf buf;
char *tmp;
@@ -478,7 +478,7 @@ pg_password_sendauth(Port * port, const char *user, const char *password)
* fe_sendauth -- client demux routine for outgoing authentication information
*/
int
-fe_sendauth(MsgType msgtype, Port * port, const char *hostname,
+fe_sendauth(MsgType msgtype, Port *port, const char *hostname,
const char *user, const char *password, const char *PQerrormsg)
{
switch (msgtype)
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h
index 6bd4530a285254caeca50074b863f4d9d23886d9..6f188a541ec95290490bdccce910f2d2626fcd44 100644
--- a/src/interfaces/libpq/fe-auth.h
+++ b/src/interfaces/libpq/fe-auth.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fe-auth.h,v 1.5 1997/09/08 02:40:23 momjian Exp $
+ * $Id: fe-auth.h,v 1.6 1997/09/08 21:55:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
#endif /* KRB4 || KRB5 */
extern int
-fe_sendauth(MsgType msgtype, Port * port, const char *hostname,
+fe_sendauth(MsgType msgtype, Port *port, const char *hostname,
const char *user, const char *password,
const char *PQerromsg);
extern void fe_setauthsvc(const char *name, char *PQerrormsg);
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index c338f49ca3e4184d837f7ea79de9b8d7675b2a99..d2089157764385b3b94e9663ebbf9f0f387ce925 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.40 1997/09/08 02:40:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.41 1997/09/08 21:55:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,11 +39,11 @@
/* use a local version instead of the one found in pqpacket.c */
-static ConnStatusType connectDB(PGconn * conn);
+static ConnStatusType connectDB(PGconn *conn);
-static void startup2PacketBuf(StartupInfo * s, PacketBuf * res);
-static void freePGconn(PGconn * conn);
-static void closePGconn(PGconn * conn);
+static void startup2PacketBuf(StartupInfo *s, PacketBuf *res);
+static void freePGconn(PGconn *conn);
+static void closePGconn(PGconn *conn);
static int conninfo_parse(const char *conninfo, char *errorMessage);
static char *conninfo_getval(char *keyword);
static void conninfo_free(void);
@@ -463,7 +463,7 @@ PQsetdb(const char *pghost, const char *pgport, const char *pgoptions, const cha
*
*/
static ConnStatusType
-connectDB(PGconn * conn)
+connectDB(PGconn *conn)
{
struct hostent *hp;
@@ -646,7 +646,7 @@ connect_errReturn:
*
*/
static void
-freePGconn(PGconn * conn)
+freePGconn(PGconn *conn)
{
if (!conn)
return;
@@ -674,7 +674,7 @@ freePGconn(PGconn * conn)
- properly close a connection to the backend
*/
static void
-closePGconn(PGconn * conn)
+closePGconn(PGconn *conn)
{
/* GH: What to do for !USE_POSIX_SIGNALS ? */
#if defined(USE_POSIX_SIGNALS)
@@ -721,7 +721,7 @@ closePGconn(PGconn * conn)
after this
*/
void
-PQfinish(PGconn * conn)
+PQfinish(PGconn *conn)
{
if (!conn)
{
@@ -740,7 +740,7 @@ PQfinish(PGconn * conn)
closes the existing connection and makes a new one
*/
void
-PQreset(PGconn * conn)
+PQreset(PGconn *conn)
{
if (!conn)
{
@@ -768,8 +768,8 @@ PQreset(PGconn * conn)
*
*/
int
-packetSend(Port * port,
- PacketBuf * buf,
+packetSend(Port *port,
+ PacketBuf *buf,
PacketLen len,
bool nonBlocking)
{
@@ -798,7 +798,7 @@ packetSend(Port * port,
* converts a StartupInfo structure to a PacketBuf
*/
static void
-startup2PacketBuf(StartupInfo * s, PacketBuf * res)
+startup2PacketBuf(StartupInfo *s, PacketBuf *res)
{
char *tmp;
@@ -1088,7 +1088,7 @@ conninfo_free()
/* =========== accessor functions for PGconn ========= */
char *
-PQdb(PGconn * conn)
+PQdb(PGconn *conn)
{
if (!conn)
{
@@ -1099,7 +1099,7 @@ PQdb(PGconn * conn)
}
char *
-PQuser(PGconn * conn)
+PQuser(PGconn *conn)
{
if (!conn)
{
@@ -1110,7 +1110,7 @@ PQuser(PGconn * conn)
}
char *
-PQhost(PGconn * conn)
+PQhost(PGconn *conn)
{
if (!conn)
{
@@ -1122,7 +1122,7 @@ PQhost(PGconn * conn)
}
char *
-PQoptions(PGconn * conn)
+PQoptions(PGconn *conn)
{
if (!conn)
{
@@ -1133,7 +1133,7 @@ PQoptions(PGconn * conn)
}
char *
-PQtty(PGconn * conn)
+PQtty(PGconn *conn)
{
if (!conn)
{
@@ -1144,7 +1144,7 @@ PQtty(PGconn * conn)
}
char *
-PQport(PGconn * conn)
+PQport(PGconn *conn)
{
if (!conn)
{
@@ -1155,7 +1155,7 @@ PQport(PGconn * conn)
}
ConnStatusType
-PQstatus(PGconn * conn)
+PQstatus(PGconn *conn)
{
if (!conn)
{
@@ -1166,7 +1166,7 @@ PQstatus(PGconn * conn)
}
char *
-PQerrorMessage(PGconn * conn)
+PQerrorMessage(PGconn *conn)
{
if (!conn)
{
@@ -1177,7 +1177,7 @@ PQerrorMessage(PGconn * conn)
}
void
-PQtrace(PGconn * conn, FILE * debug_port)
+PQtrace(PGconn *conn, FILE *debug_port)
{
if (conn == NULL ||
conn->status == CONNECTION_BAD)
@@ -1189,7 +1189,7 @@ PQtrace(PGconn * conn, FILE * debug_port)
}
void
-PQuntrace(PGconn * conn)
+PQuntrace(PGconn *conn)
{
if (conn == NULL ||
conn->status == CONNECTION_BAD)
diff --git a/src/interfaces/libpq/fe-connect.h b/src/interfaces/libpq/fe-connect.h
index bf4c5cdf35d22372e1dd8699b90b53d0c39471f1..bbacedf6dd6dcf25271f055cd060383abb3c0d01 100644
--- a/src/interfaces/libpq/fe-connect.h
+++ b/src/interfaces/libpq/fe-connect.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fe-connect.h,v 1.3 1997/09/08 02:40:27 momjian Exp $
+ * $Id: fe-connect.h,v 1.4 1997/09/08 21:55:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,12 +18,12 @@
*----------------------------------------------------------------
*/
-extern int packetSend(Port * port, PacketBuf * buf, PacketLen len, bool nonBlocking);
+extern int packetSend(Port *port, PacketBuf *buf, PacketLen len, bool nonBlocking);
#endif /* FE_CONNECT_H */
#ifndef FE_CONNECT_H
#define FE_CONNECT_H
-int packetSend(Port * port, PacketBuf * buf, PacketLen len, bool nonBlocking);
+int packetSend(Port *port, PacketBuf *buf, PacketLen len, bool nonBlocking);
#endif
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 454555bfda3ae62c5ad617fef60bb5156f631cd3..332b9f6b7776af5ca6687321ab9f9c4f409ff646 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.37 1997/09/08 02:40:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.38 1997/09/08 21:55:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,15 +56,15 @@ const char *pgresStatus[] = {
};
-static PGresult *makePGresult(PGconn * conn, char *pname);
-static void addTuple(PGresult * res, PGresAttValue * tup);
-static PGresAttValue *getTuple(PGconn * conn, PGresult * res, int binary);
-static PGresult *makeEmptyPGresult(PGconn * conn, ExecStatusType status);
-static void fill(int length, int max, char filler, FILE * fp);
+static PGresult *makePGresult(PGconn *conn, char *pname);
+static void addTuple(PGresult *res, PGresAttValue *tup);
+static PGresAttValue *getTuple(PGconn *conn, PGresult *res, int binary);
+static PGresult *makeEmptyPGresult(PGconn *conn, ExecStatusType status);
+static void fill(int length, int max, char filler, FILE *fp);
static char *
-do_header(FILE * fout, PQprintOpt * po, const int nFields,
+do_header(FILE *fout, PQprintOpt *po, const int nFields,
int fieldMax[], char *fieldNames[], unsigned char fieldNotNum[],
- const int fs_len, PGresult * res);
+ const int fs_len, PGresult *res);
/*
* PQclear -
@@ -72,7 +72,7 @@ do_header(FILE * fout, PQprintOpt * po, const int nFields,
*
*/
void
-PQclear(PGresult * res)
+PQclear(PGresult *res)
{
int i,
j;
@@ -114,7 +114,7 @@ PQclear(PGresult * res)
*/
static PGresult *
-makeEmptyPGresult(PGconn * conn, ExecStatusType status)
+makeEmptyPGresult(PGconn *conn, ExecStatusType status)
{
PGresult *result;
@@ -140,7 +140,7 @@ makeEmptyPGresult(PGconn * conn, ExecStatusType status)
*/
static PGresAttValue *
-getTuple(PGconn * conn, PGresult * result, int binary)
+getTuple(PGconn *conn, PGresult *result, int binary)
{
char bitmap[MAX_FIELDS]; /* the backend sends us a bitmap
* of */
@@ -225,7 +225,7 @@ getTuple(PGconn * conn, PGresult * result, int binary)
*
*/
static void
-addTuple(PGresult * res, PGresAttValue * tup)
+addTuple(PGresult *res, PGresAttValue *tup)
{
if (res->ntups == res->tupArrSize)
{
@@ -262,7 +262,7 @@ addTuple(PGresult * res, PGresAttValue * tup)
*/
static PGresult *
-makePGresult(PGconn * conn, char *pname)
+makePGresult(PGconn *conn, char *pname)
{
PGresult *result;
int id;
@@ -406,9 +406,9 @@ makePGresult_badResponse_return:
*/
static void
-process_response_from_backend(FILE * pfin, FILE * pfout, FILE * pfdebug,
- PGconn * conn,
- PGresult ** result_p, char *const reason)
+process_response_from_backend(FILE *pfin, FILE *pfout, FILE *pfdebug,
+ PGconn *conn,
+ PGresult **result_p, char *const reason)
{
int id;
@@ -630,7 +630,7 @@ process_response_from_backend(FILE * pfin, FILE * pfout, FILE * pfdebug,
*/
PGresult *
-PQexec(PGconn * conn, const char *query)
+PQexec(PGconn *conn, const char *query)
{
PGresult *result;
char buffer[MAX_MESSAGE_LEN];
@@ -692,7 +692,7 @@ PQexec(PGconn * conn, const char *query)
*/
PGnotify *
-PQnotifies(PGconn * conn)
+PQnotifies(PGconn *conn)
{
Dlelem *e;
@@ -727,7 +727,7 @@ PQnotifies(PGconn * conn)
* 1 in other cases
*/
int
-PQgetline(PGconn * conn, char *s, int maxlen)
+PQgetline(PGconn *conn, char *s, int maxlen)
{
int c = '\0';
@@ -764,7 +764,7 @@ PQgetline(PGconn * conn, char *s, int maxlen)
*
*/
void
-PQputline(PGconn * conn, const char *s)
+PQputline(PGconn *conn, const char *s)
{
if (conn && (conn->Pfout))
{
@@ -783,7 +783,7 @@ PQputline(PGconn * conn, const char *s)
* 1 on failure
*/
int
-PQendcopy(PGconn * conn)
+PQendcopy(PGconn *conn)
{
FILE *pfin,
*pfdebug;
@@ -819,7 +819,7 @@ PQendcopy(PGconn * conn)
/* simply send out max-length number of filler characters to fp */
static void
-fill(int length, int max, char filler, FILE * fp)
+fill(int length, int max, char filler, FILE *fp)
{
int count;
char filltmp[2];
@@ -838,8 +838,8 @@ fill(int length, int max, char filler, FILE * fp)
* kept for backward compatibility
*/
void
-PQdisplayTuples(PGresult * res,
- FILE * fp, /* where to send the output */
+PQdisplayTuples(PGresult *res,
+ FILE *fp, /* where to send the output */
int fillAlign, /* pad the fields with spaces */
const char *fieldSep, /* field separator */
int printHeader,/* display headers? */
@@ -934,8 +934,8 @@ PQdisplayTuples(PGresult * res,
*
*/
void
-PQprintTuples(PGresult * res,
- FILE * fout, /* output stream */
+PQprintTuples(PGresult *res,
+ FILE *fout, /* output stream */
int PrintAttNames,/* print attribute names or not */
int TerseOutput, /* delimiter bars or not? */
int colWidth /* width of column, if 0, use variable
@@ -1014,12 +1014,12 @@ PQprintTuples(PGresult * res,
static void
-do_field(PQprintOpt * po, PGresult * res,
+do_field(PQprintOpt *po, PGresult *res,
const int i, const int j, char *buf, const int fs_len,
char *fields[],
const int nFields, char *fieldNames[],
unsigned char fieldNotNum[], int fieldMax[],
- const int fieldMaxLen, FILE * fout
+ const int fieldMaxLen, FILE *fout
)
{
@@ -1114,9 +1114,9 @@ do_field(PQprintOpt * po, PGresult * res,
static char *
-do_header(FILE * fout, PQprintOpt * po, const int nFields, int fieldMax[],
+do_header(FILE *fout, PQprintOpt *po, const int nFields, int fieldMax[],
char *fieldNames[], unsigned char fieldNotNum[],
- const int fs_len, PGresult * res)
+ const int fs_len, PGresult *res)
{
int j; /* for loop index */
@@ -1202,7 +1202,7 @@ do_header(FILE * fout, PQprintOpt * po, const int nFields, int fieldMax[],
static void
-output_row(FILE * fout, PQprintOpt * po, const int nFields, char *fields[],
+output_row(FILE *fout, PQprintOpt *po, const int nFields, char *fields[],
unsigned char fieldNotNum[], int fieldMax[], char *border,
const int row_index)
{
@@ -1257,9 +1257,9 @@ output_row(FILE * fout, PQprintOpt * po, const int nFields, char *fields[],
*/
void
-PQprint(FILE * fout,
- PGresult * res,
- PQprintOpt * po
+PQprint(FILE *fout,
+ PGresult *res,
+ PQprintOpt *po
)
{
int nFields;
@@ -1502,12 +1502,12 @@ PQprint(FILE * fout,
*/
PGresult *
-PQfn(PGconn * conn,
+PQfn(PGconn *conn,
int fnid,
int *result_buf,
int *actual_result_len,
int result_is_int,
- PQArgBlock * args,
+ PQArgBlock *args,
int nargs)
{
FILE *pfin,
@@ -1609,7 +1609,7 @@ PQfn(PGconn * conn,
/* ====== accessor funcs for PGresult ======== */
ExecStatusType
-PQresultStatus(PGresult * res)
+PQresultStatus(PGresult *res)
{
if (!res)
{
@@ -1621,7 +1621,7 @@ PQresultStatus(PGresult * res)
}
int
-PQntuples(PGresult * res)
+PQntuples(PGresult *res)
{
if (!res)
{
@@ -1632,7 +1632,7 @@ PQntuples(PGresult * res)
}
int
-PQnfields(PGresult * res)
+PQnfields(PGresult *res)
{
if (!res)
{
@@ -1646,7 +1646,7 @@ PQnfields(PGresult * res)
returns NULL if the field_num is invalid
*/
char *
-PQfname(PGresult * res, int field_num)
+PQfname(PGresult *res, int field_num)
{
if (!res)
{
@@ -1673,7 +1673,7 @@ PQfname(PGresult * res, int field_num)
returns -1 on a bad field name
*/
int
-PQfnumber(PGresult * res, const char *field_name)
+PQfnumber(PGresult *res, const char *field_name)
{
int i;
@@ -1698,7 +1698,7 @@ PQfnumber(PGresult * res, const char *field_name)
}
Oid
-PQftype(PGresult * res, int field_num)
+PQftype(PGresult *res, int field_num)
{
if (!res)
{
@@ -1721,7 +1721,7 @@ PQftype(PGresult * res, int field_num)
}
int2
-PQfsize(PGresult * res, int field_num)
+PQfsize(PGresult *res, int field_num)
{
if (!res)
{
@@ -1744,7 +1744,7 @@ PQfsize(PGresult * res, int field_num)
}
char *
-PQcmdStatus(PGresult * res)
+PQcmdStatus(PGresult *res)
{
if (!res)
{
@@ -1761,7 +1761,7 @@ PQcmdStatus(PGresult * res)
*/
static char oidStatus[32] = {0};
const char *
-PQoidStatus(PGresult * res)
+PQoidStatus(PGresult *res)
{
if (!res)
{
@@ -1791,7 +1791,7 @@ PQoidStatus(PGresult * res)
of inserted/affected tuples, if not, return ""
*/
const char *
-PQcmdTuples(PGresult * res)
+PQcmdTuples(PGresult *res)
{
if (!res)
{
@@ -1841,7 +1841,7 @@ PQcmdTuples(PGresult * res)
if res is not binary, a null-terminated ASCII string is returned.
*/
char *
-PQgetvalue(PGresult * res, int tup_num, int field_num)
+PQgetvalue(PGresult *res, int tup_num, int field_num)
{
if (!res)
{
@@ -1876,7 +1876,7 @@ PQgetvalue(PGresult * res, int tup_num, int field_num)
NOT include the size field of the varlena.
*/
int
-PQgetlength(PGresult * res, int tup_num, int field_num)
+PQgetlength(PGresult *res, int tup_num, int field_num)
{
if (!res)
{
@@ -1903,7 +1903,7 @@ PQgetlength(PGresult * res, int tup_num, int field_num)
returns the null status of a field value.
*/
int
-PQgetisnull(PGresult * res, int tup_num, int field_num)
+PQgetisnull(PGresult *res, int tup_num, int field_num)
{
if (!res)
{
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 6e97e6465d9ffb564f97be7d1ec04ceaaa598daf..3af5dc09715cea2ffc6dc0812e3fdae6984244c5 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.9 1997/09/08 02:40:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.10 1997/09/08 21:55:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
#define LO_BUFSIZE 1024
-static int lo_initialize(PGconn * conn);
+static int lo_initialize(PGconn *conn);
/*
* lo_open
@@ -33,7 +33,7 @@ static int lo_initialize(PGconn * conn);
* return -1 upon failure.
*/
int
-lo_open(PGconn * conn, Oid lobjId, int mode)
+lo_open(PGconn *conn, Oid lobjId, int mode)
{
int fd;
int result_len;
@@ -79,7 +79,7 @@ lo_open(PGconn * conn, Oid lobjId, int mode)
* returns -1 upon failure.
*/
int
-lo_close(PGconn * conn, int fd)
+lo_close(PGconn *conn, int fd)
{
PQArgBlock argv[1];
PGresult *res;
@@ -117,7 +117,7 @@ lo_close(PGconn * conn, int fd)
*/
int
-lo_read(PGconn * conn, int fd, char *buf, int len)
+lo_read(PGconn *conn, int fd, char *buf, int len)
{
PQArgBlock argv[2];
PGresult *res;
@@ -156,7 +156,7 @@ lo_read(PGconn * conn, int fd, char *buf, int len)
*
*/
int
-lo_write(PGconn * conn, int fd, char *buf, int len)
+lo_write(PGconn *conn, int fd, char *buf, int len)
{
PQArgBlock argv[2];
PGresult *res;
@@ -201,7 +201,7 @@ lo_write(PGconn * conn, int fd, char *buf, int len)
*/
int
-lo_lseek(PGconn * conn, int fd, int offset, int whence)
+lo_lseek(PGconn *conn, int fd, int offset, int whence)
{
PQArgBlock argv[3];
PGresult *res;
@@ -249,7 +249,7 @@ lo_lseek(PGconn * conn, int fd, int offset, int whence)
*/
Oid
-lo_creat(PGconn * conn, int mode)
+lo_creat(PGconn *conn, int mode)
{
PQArgBlock argv[1];
PGresult *res;
@@ -286,7 +286,7 @@ lo_creat(PGconn * conn, int mode)
*/
int
-lo_tell(PGconn * conn, int fd)
+lo_tell(PGconn *conn, int fd)
{
int retval;
PQArgBlock argv[1];
@@ -323,7 +323,7 @@ lo_tell(PGconn * conn, int fd)
*/
int
-lo_unlink(PGconn * conn, Oid lobjId)
+lo_unlink(PGconn *conn, Oid lobjId)
{
PQArgBlock argv[1];
PGresult *res;
@@ -362,7 +362,7 @@ lo_unlink(PGconn * conn, Oid lobjId)
*/
Oid
-lo_import(PGconn * conn, char *filename)
+lo_import(PGconn *conn, char *filename)
{
int fd;
int nbytes,
@@ -427,7 +427,7 @@ lo_import(PGconn * conn, char *filename)
* returns -1 upon failure, 1 otherwise
*/
int
-lo_export(PGconn * conn, Oid lobjId, char *filename)
+lo_export(PGconn *conn, Oid lobjId, char *filename)
{
int fd;
int nbytes,
@@ -488,7 +488,7 @@ lo_export(PGconn * conn, Oid lobjId, char *filename)
* ----------------
*/
static int
-lo_initialize(PGconn * conn)
+lo_initialize(PGconn *conn)
{
PGresult *res;
PGlobjfuncs *lobjfuncs;
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 23d1e42955f96136eee58a61777bc8841fcefa5e..9f5fd907b54335fc07383f724fadb452c12a21cd 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.7 1997/09/08 02:40:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.8 1997/09/08 21:55:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@
if debug is set, also echo the character fetched
*/
int
-pqGetc(FILE * fin, FILE * debug)
+pqGetc(FILE *fin, FILE *debug)
{
int c;
@@ -49,7 +49,7 @@ pqGetc(FILE * fin, FILE * debug)
returns 1 if there was an error, 0 otherwise.
*/
int
-pqPutnchar(const char *s, int len, FILE * f, FILE * debug)
+pqPutnchar(const char *s, int len, FILE *f, FILE *debug)
{
if (f == NULL)
return 1;
@@ -68,7 +68,7 @@ pqPutnchar(const char *s, int len, FILE * f, FILE * debug)
get a string of exactly len length from stream f
*/
int
-pqGetnchar(char *s, int len, FILE * f, FILE * debug)
+pqGetnchar(char *s, int len, FILE *f, FILE *debug)
{
int cnt;
@@ -90,7 +90,7 @@ pqGetnchar(char *s, int len, FILE * f, FILE * debug)
get a string of up to length len from stream f
*/
int
-pqGets(char *s, int len, FILE * f, FILE * debug)
+pqGets(char *s, int len, FILE *f, FILE *debug)
{
int c;
const char *str = s;
@@ -116,7 +116,7 @@ pqGets(char *s, int len, FILE * f, FILE * debug)
returns 0 if successful, 1 otherwise
*/
int
-pqPutInt(const int integer, int bytes, FILE * f, FILE * debug)
+pqPutInt(const int integer, int bytes, FILE *f, FILE *debug)
{
int retval = 0;
@@ -146,7 +146,7 @@ pqPutInt(const int integer, int bytes, FILE * f, FILE * debug)
returns 0 if successful
*/
int
-pqGetInt(int *result, int bytes, FILE * f, FILE * debug)
+pqGetInt(int *result, int bytes, FILE *f, FILE *debug)
{
int retval = 0;
@@ -171,7 +171,7 @@ pqGetInt(int *result, int bytes, FILE * f, FILE * debug)
/* --------------------------------------------------------------------- */
int
-pqPuts(const char *s, FILE * f, FILE * debug)
+pqPuts(const char *s, FILE *f, FILE *debug)
{
if (f == NULL)
return 1;
@@ -193,7 +193,7 @@ pqPuts(const char *s, FILE * f, FILE * debug)
/* --------------------------------------------------------------------- */
void
-pqFlush(FILE * f, FILE * debug)
+pqFlush(FILE *f, FILE *debug)
{
if (f)
fflush(f);
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 397630ad5d927cbbde0a4e7e4ca5e2ec5a4acf11..6f2d93b8db47918862fd25839bdf4bb6fe7f2fc3 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq-fe.h,v 1.22 1997/09/08 02:40:36 momjian Exp $
+ * $Id: libpq-fe.h,v 1.23 1997/09/08 21:55:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ extern "C"
{
CONNECTION_OK,
CONNECTION_BAD
- } ConnStatusType;
+ } ConnStatusType;
typedef enum
{
@@ -49,7 +49,7 @@ extern "C"
PGRES_NONFATAL_ERROR,
PGRES_FATAL_ERROR
- } ExecStatusType;
+ } ExecStatusType;
/* string descriptions of the ExecStatusTypes */
extern const char *pgresStatus[];
@@ -79,14 +79,14 @@ extern "C"
int *ptr; /* can't use void (dec compiler barfs) */
int integer;
} u;
- } PQArgBlock;
+ } PQArgBlock;
typedef struct pgresAttDesc
{
char *name; /* type name */
Oid adtid; /* type id */
short adtsize; /* type size */
- } PGresAttDesc;
+ } PGresAttDesc;
/* use char* for Attribute values,
ASCII tuples are guaranteed to be null-terminated
@@ -100,14 +100,14 @@ extern "C"
{
int len; /* length in bytes of the value */
char *value; /* actual value */
- } PGresAttValue;
+ } PGresAttValue;
typedef struct pgNotify
{
char relname[NAMEDATALEN]; /* name of relation
* containing data */
int be_pid; /* process id of backend */
- } PGnotify;
+ } PGnotify;
typedef struct pgLobjfuncs
{
@@ -120,7 +120,7 @@ extern "C"
Oid fn_lo_tell; /* OID of backend function lo_tell */
Oid fn_lo_read; /* OID of backend function LOread */
Oid fn_lo_write;/* OID of backend function LOwrite */
- } PGlobjfuncs;
+ } PGlobjfuncs;
/* PGconn encapsulates a connection to the backend */
typedef struct pg_conn
@@ -147,7 +147,7 @@ extern "C"
char *pgauth;
PGlobjfuncs *lobjfuncs; /* Backend function OID's for large object
* access */
- } PGconn;
+ } PGconn;
#define CMDSTATUS_LEN 40
@@ -167,7 +167,7 @@ extern "C"
int binary; /* binary tuple values if binary == 1,
* otherwise ASCII */
PGconn *conn;
- } PGresult;
+ } PGresult;
typedef char pqbool;
@@ -224,55 +224,55 @@ extern "C"
extern PGconn *PQsetdb(const char *pghost, const char *pgport, const char *pgoptions,
const char *pgtty, const char *dbName);
/* close the current connection and free the PGconn data structure */
- extern void PQfinish(PGconn * conn);
+ extern void PQfinish(PGconn *conn);
/*
* close the current connection and restablish a new one with the same
* parameters
*/
- extern void PQreset(PGconn * conn);
-
- extern char *PQdb(PGconn * conn);
- extern char *PQuser(PGconn * conn);
- extern char *PQhost(PGconn * conn);
- extern char *PQoptions(PGconn * conn);
- extern char *PQport(PGconn * conn);
- extern char *PQtty(PGconn * conn);
- extern ConnStatusType PQstatus(PGconn * conn);
- extern char *PQerrorMessage(PGconn * conn);
- extern void PQtrace(PGconn * conn, FILE * debug_port);
- extern void PQuntrace(PGconn * conn);
+ extern void PQreset(PGconn *conn);
+
+ extern char *PQdb(PGconn *conn);
+ extern char *PQuser(PGconn *conn);
+ extern char *PQhost(PGconn *conn);
+ extern char *PQoptions(PGconn *conn);
+ extern char *PQport(PGconn *conn);
+ extern char *PQtty(PGconn *conn);
+ extern ConnStatusType PQstatus(PGconn *conn);
+ extern char *PQerrorMessage(PGconn *conn);
+ extern void PQtrace(PGconn *conn, FILE *debug_port);
+ extern void PQuntrace(PGconn *conn);
/* === in fe-exec.c === */
- extern PGresult *PQexec(PGconn * conn, const char *query);
- extern int PQgetline(PGconn * conn, char *string, int length);
- extern int PQendcopy(PGconn * conn);
- extern void PQputline(PGconn * conn, const char *string);
- extern ExecStatusType PQresultStatus(PGresult * res);
- extern int PQntuples(PGresult * res);
- extern int PQnfields(PGresult * res);
- extern char *PQfname(PGresult * res, int field_num);
- extern int PQfnumber(PGresult * res, const char *field_name);
- extern Oid PQftype(PGresult * res, int field_num);
- extern short PQfsize(PGresult * res, int field_num);
- extern char *PQcmdStatus(PGresult * res);
- extern const char *PQoidStatus(PGresult * res);
- extern const char *PQcmdTuples(PGresult * res);
- extern char *PQgetvalue(PGresult * res, int tup_num, int field_num);
- extern int PQgetlength(PGresult * res, int tup_num, int field_num);
- extern int PQgetisnull(PGresult * res, int tup_num, int field_num);
- extern void PQclear(PGresult * res);
+ extern PGresult *PQexec(PGconn *conn, const char *query);
+ extern int PQgetline(PGconn *conn, char *string, int length);
+ extern int PQendcopy(PGconn *conn);
+ extern void PQputline(PGconn *conn, const char *string);
+ extern ExecStatusType PQresultStatus(PGresult *res);
+ extern int PQntuples(PGresult *res);
+ extern int PQnfields(PGresult *res);
+ extern char *PQfname(PGresult *res, int field_num);
+ extern int PQfnumber(PGresult *res, const char *field_name);
+ extern Oid PQftype(PGresult *res, int field_num);
+ extern short PQfsize(PGresult *res, int field_num);
+ extern char *PQcmdStatus(PGresult *res);
+ extern const char *PQoidStatus(PGresult *res);
+ extern const char *PQcmdTuples(PGresult *res);
+ extern char *PQgetvalue(PGresult *res, int tup_num, int field_num);
+ extern int PQgetlength(PGresult *res, int tup_num, int field_num);
+ extern int PQgetisnull(PGresult *res, int tup_num, int field_num);
+ extern void PQclear(PGresult *res);
/* PQdisplayTuples() is a better version of PQprintTuples() */
- extern void PQdisplayTuples(PGresult * res,
- FILE * fp, /* where to send the
+ extern void PQdisplayTuples(PGresult *res,
+ FILE *fp, /* where to send the
* output */
int fillAlign, /* pad the fields with
* spaces */
const char *fieldSep, /* field separator */
int printHeader, /* display headers? */
int quiet);
- extern void PQprintTuples(PGresult * res,
- FILE * fout, /* output stream */
+ extern void PQprintTuples(PGresult *res,
+ FILE *fout, /* output stream */
int printAttName, /* print attribute names
* or not */
int terseOutput, /* delimiter bars or
@@ -280,17 +280,17 @@ extern "C"
int width /* width of column, if
* 0, use variable width */
);
- extern void PQprint(FILE * fout, /* output stream */
- PGresult * res,
- PQprintOpt * ps /* option structure */
+ extern void PQprint(FILE *fout, /* output stream */
+ PGresult *res,
+ PQprintOpt *ps /* option structure */
);
- extern PGnotify *PQnotifies(PGconn * conn);
- extern PGresult *PQfn(PGconn * conn,
+ extern PGnotify *PQnotifies(PGconn *conn);
+ extern PGresult *PQfn(PGconn *conn,
int fnid,
int *result_buf,
int *result_len,
int result_is_int,
- PQArgBlock * args,
+ PQArgBlock *args,
int nargs);
/* === in fe-auth.c === */
extern MsgType fe_getauthsvc(char *PQerrormsg);
@@ -302,30 +302,30 @@ extern "C"
returns 0 if successful
if debug is non-null, debugging output is sent to that stream
*/
- extern int pqGets(char *s, int maxlen, FILE * stream, FILE * debug);
- extern int pqGetnchar(char *s, int maxlen, FILE * stream, FILE * debug);
- extern int pqPutnchar(const char *s, int maxlen, FILE * stream, FILE * debug);
- extern int pqPuts(const char *s, FILE * stream, FILE * debug);
- extern int pqGetc(FILE * stream, FILE * debug);
+ extern int pqGets(char *s, int maxlen, FILE *stream, FILE *debug);
+ extern int pqGetnchar(char *s, int maxlen, FILE *stream, FILE *debug);
+ extern int pqPutnchar(const char *s, int maxlen, FILE *stream, FILE *debug);
+ extern int pqPuts(const char *s, FILE *stream, FILE *debug);
+ extern int pqGetc(FILE *stream, FILE *debug);
/* get a n-byte integer from the stream into result */
/* returns 0 if successful */
- extern int pqGetInt(int *result, int bytes, FILE * stream, FILE * debug);
+ extern int pqGetInt(int *result, int bytes, FILE *stream, FILE *debug);
/* put a n-byte integer into the stream */
/* returns 0 if successful */
- extern int pqPutInt(const int n, int bytes, FILE * stream, FILE * debug);
- extern void pqFlush(FILE * stream, FILE * debug);
+ extern int pqPutInt(const int n, int bytes, FILE *stream, FILE *debug);
+ extern void pqFlush(FILE *stream, FILE *debug);
/* === in fe-lobj.c === */
- int lo_open(PGconn * conn, Oid lobjId, int mode);
- int lo_close(PGconn * conn, int fd);
- int lo_read(PGconn * conn, int fd, char *buf, int len);
- int lo_write(PGconn * conn, int fd, char *buf, int len);
- int lo_lseek(PGconn * conn, int fd, int offset, int whence);
- Oid lo_creat(PGconn * conn, int mode);
- int lo_tell(PGconn * conn, int fd);
- int lo_unlink(PGconn * conn, Oid lobjId);
- Oid lo_import(PGconn * conn, char *filename);
- int lo_export(PGconn * conn, Oid lobjId, char *filename);
+ int lo_open(PGconn *conn, Oid lobjId, int mode);
+ int lo_close(PGconn *conn, int fd);
+ int lo_read(PGconn *conn, int fd, char *buf, int len);
+ int lo_write(PGconn *conn, int fd, char *buf, int len);
+ int lo_lseek(PGconn *conn, int fd, int offset, int whence);
+ Oid lo_creat(PGconn *conn, int mode);
+ int lo_tell(PGconn *conn, int fd);
+ int lo_unlink(PGconn *conn, Oid lobjId);
+ Oid lo_import(PGconn *conn, char *filename);
+ int lo_export(PGconn *conn, Oid lobjId, char *filename);
/* max length of message to send */
#define MAX_MESSAGE_LEN 8193
diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 9cc3f463268eb11b9e8b48027c27b757c7f3faeb..d3a0d67ea3e0275c505ff48693fe8b8c0305d7fa 100644
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -8,7 +8,7 @@
#include "libpq-fe.h"
void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 7ee09a7e024a23bf613bb6c3b0b5b14080d6c2f0..c147170e7fb6836029dcc0b354f837e7361084b9 100644
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -22,7 +22,7 @@ INSERT INTO TBL1 values (10);
#include "libpq-fe.h"
void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index 4b75763b5f0890a1a86fc680bd4559112e4eb162..e11ad1a2f9d3dfaae4e9c8f712b5531e739b9abb 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -31,7 +31,7 @@ tuple 1: got
#include "utils/geo-decls.h" /* for the POLYGON type */
void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index 5b0c4196487556f845668a25e2a8f4e8ff586d04..831f765d4e831b83cca9482b30b0e23885a0fbe6 100644
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -9,7 +9,7 @@
#include "libpq-fe.h"
void
-exit_nicely(PGconn * conn1, PGconn * conn2)
+exit_nicely(PGconn *conn1, PGconn *conn2)
{
if (conn1)
PQfinish(conn1);
@@ -19,7 +19,7 @@ exit_nicely(PGconn * conn1, PGconn * conn2)
}
void
-check_conn(PGconn * conn)
+check_conn(PGconn *conn)
{
/* check to see that the backend connection was successfully made */
if (PQstatus(conn) == CONNECTION_BAD)
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 676dfe20a21b3189815205aab7dcc5377dd7939d..d7268284eb0a0823e32a1c1de1d24cb6d692ba54 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.5 1997/09/08 02:40:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.6 1997/09/08 21:55:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
*
*/
Oid
-importFile(PGconn * conn, char *filename)
+importFile(PGconn *conn, char *filename)
{
Oid lobjId;
int lobj_fd;
@@ -77,7 +77,7 @@ importFile(PGconn * conn, char *filename)
}
void
-pickout(PGconn * conn, Oid lobjId, int start, int len)
+pickout(PGconn *conn, Oid lobjId, int start, int len)
{
int lobj_fd;
char *buf;
@@ -107,7 +107,7 @@ pickout(PGconn * conn, Oid lobjId, int start, int len)
}
void
-overwrite(PGconn * conn, Oid lobjId, int start, int len)
+overwrite(PGconn *conn, Oid lobjId, int start, int len)
{
int lobj_fd;
char *buf;
@@ -146,7 +146,7 @@ overwrite(PGconn * conn, Oid lobjId, int start, int len)
*
*/
void
-exportFile(PGconn * conn, Oid lobjId, char *filename)
+exportFile(PGconn *conn, Oid lobjId, char *filename)
{
int lobj_fd;
char buf[BUFSIZE];
@@ -194,7 +194,7 @@ exportFile(PGconn * conn, Oid lobjId, char *filename)
}
void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
diff --git a/src/test/examples/testlo2.c b/src/test/examples/testlo2.c
index adaad5df00abc03a04437eaafe368f21d288630b..cb3baeb5d900a19eee71f5737b4b4311c74e6702 100644
--- a/src/test/examples/testlo2.c
+++ b/src/test/examples/testlo2.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.4 1997/09/08 02:40:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.5 1997/09/08 21:55:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
*
*/
Oid
-importFile(PGconn * conn, char *filename)
+importFile(PGconn *conn, char *filename)
{
Oid lobjId;
int lobj_fd;
@@ -71,7 +71,7 @@ importFile(PGconn * conn, char *filename)
}
void
-pickout(PGconn * conn, Oid lobjId, int start, int len)
+pickout(PGconn *conn, Oid lobjId, int start, int len)
{
int lobj_fd;
char *buf;
@@ -101,7 +101,7 @@ pickout(PGconn * conn, Oid lobjId, int start, int len)
}
void
-overwrite(PGconn * conn, Oid lobjId, int start, int len)
+overwrite(PGconn *conn, Oid lobjId, int start, int len)
{
int lobj_fd;
char *buf;
@@ -140,7 +140,7 @@ overwrite(PGconn * conn, Oid lobjId, int start, int len)
*
*/
void
-exportFile(PGconn * conn, Oid lobjId, char *filename)
+exportFile(PGconn *conn, Oid lobjId, char *filename)
{
int lobj_fd;
char buf[BUFSIZE];
@@ -188,7 +188,7 @@ exportFile(PGconn * conn, Oid lobjId, char *filename)
}
void
-exit_nicely(PGconn * conn)
+exit_nicely(PGconn *conn)
{
PQfinish(conn);
exit(1);
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 2258bbbd4a5189cd0520862dfecfe288a1b42065..020bf6685ea71278e66487914979bb9a8403e100 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
/*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.12 1997/09/08 20:59:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.13 1997/09/08 21:56:01 momjian Exp $
*/
#include <float.h> /* faked on sunos */
@@ -18,11 +18,11 @@
typedef void *TUPLE;
-extern double *regress_dist_ptpath(Point * pt, PATH * path);
-extern double *regress_path_dist(PATH * p1, PATH * p2);
-extern PATH *poly2path(POLYGON * poly);
-extern Point *interpt_pp(PATH * p1, PATH * p2);
-extern void regress_lseg_construct(LSEG * lseg, Point * pt1, Point * pt2);
+extern double *regress_dist_ptpath(Point *pt, PATH *path);
+extern double *regress_path_dist(PATH *p1, PATH *p2);
+extern PATH *poly2path(POLYGON *poly);
+extern Point *interpt_pp(PATH *p1, PATH *p2);
+extern void regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
extern char overpaid(TUPLE tuple);
extern int boxarea(BOX *box);
extern char *reverse_c16(char *string);
@@ -203,7 +203,7 @@ typedef struct
WIDGET *widget_in(char *str);
char *widget_out(WIDGET * widget);
-int pt_in_widget(Point * point, WIDGET * widget);
+int pt_in_widget(Point *point, WIDGET * widget);
#define NARGS 3
diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c
index c7b9ab6bb95429942bf0d4d274c3e3499946b54e..b94fdd3c504c749ac56b79ba783e3060df7343f3 100644
--- a/src/tools/entab/halt.c
+++ b/src/tools/entab/halt.c
@@ -42,17 +42,17 @@ va_dcl
fflush(stderr);
/* call one clean up function if defined */
- if ((sig_func = signal(SIGTERM, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ if ((sig_func = signal(SIGTERM, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGHUP, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGHUP, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGINT, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGINT, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
- else if ((sig_func = signal(SIGQUIT, SIG_DFL)) != SIG_DFL &&
- sig_func != SIG_IGN)
+ else if ((sig_func = signal(SIGQUIT, SIG_DFL)) !=SIG_DFL &&
+ sig_func !=SIG_IGN)
(*sig_func) (0);
exit(1);
}
diff --git a/src/tutorial/C-code/funcs.c b/src/tutorial/C-code/funcs.c
index 219a87c947256b098ff91eb38d9f63fca342e964..0033e124294911d30cd7fb5a228ac21e987b0021 100644
--- a/src/tutorial/C-code/funcs.c
+++ b/src/tutorial/C-code/funcs.c
@@ -18,8 +18,8 @@
*/
int add_one(int arg);
-char16 *concat16(char16 * arg1, char16 * arg2);
-text *copytext(text * t);
+char16 *concat16(char16 *arg1, char16 *arg2);
+text *copytext(text *t);
bool
c_overpaid(TUPLE t, /* the current instance of EMP */
@@ -34,7 +34,7 @@ add_one(int arg)
}
char16 *
-concat16(char16 * arg1, char16 * arg2)
+concat16(char16 *arg1, char16 *arg2)
{
char16 *new_c16 = (char16 *) palloc(sizeof(char16));
@@ -44,7 +44,7 @@ concat16(char16 * arg1, char16 * arg2)
}
text *
-copytext(text * t)
+copytext(text *t)
{
/*