From fcff1cdf4eadbc6dcba4b9a2cd09f38f466ffa31 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 25 May 1999 22:43:53 +0000
Subject: [PATCH] Another pgindent run. Sorry folks.
---
contrib/int8/int8.c | 93 ++--
contrib/os2client/config.h | 2 +-
src/backend/access/common/printtup.c | 24 +-
src/backend/access/common/tupdesc.c | 4 +-
src/backend/access/hash/hashfunc.c | 4 +-
src/backend/access/nbtree/nbtcompare.c | 4 +-
src/backend/commands/_deadcode/recipe.c | 26 +-
src/backend/commands/command.c | 4 +-
src/backend/executor/_deadcode/nodeTee.c | 12 +-
src/backend/executor/execMain.c | 14 +-
src/backend/executor/execQual.c | 8 +-
src/backend/executor/nodeAgg.c | 4 +-
src/backend/executor/nodeHashjoin.c | 8 +-
src/backend/executor/spi.c | 4 +-
src/backend/libpq/be-dumpdata.c | 4 +-
src/backend/nodes/copyfuncs.c | 28 +-
src/backend/nodes/equalfuncs.c | 12 +-
src/backend/nodes/freefuncs.c | 28 +-
src/backend/nodes/outfuncs.c | 22 +-
src/backend/optimizer/geqo/geqo_eval.c | 4 +-
src/backend/optimizer/geqo/geqo_misc.c | 4 +-
src/backend/optimizer/geqo/minspantree.c | 14 +-
.../optimizer/path/_deadcode/predmig.c | 4 +-
src/backend/optimizer/path/_deadcode/xfunc.c | 8 +-
src/backend/optimizer/path/allpaths.c | 6 +-
src/backend/optimizer/path/costsize.c | 6 +-
src/backend/optimizer/path/indxpath.c | 66 +--
src/backend/optimizer/path/joinpath.c | 34 +-
src/backend/optimizer/path/joinrels.c | 14 +-
src/backend/optimizer/path/orindxpath.c | 12 +-
src/backend/optimizer/path/prune.c | 6 +-
src/backend/optimizer/plan/createplan.c | 6 +-
src/backend/optimizer/plan/initsplan.c | 6 +-
src/backend/optimizer/plan/setrefs.c | 6 +-
src/backend/optimizer/util/clauses.c | 4 +-
src/backend/optimizer/util/indexnode.c | 4 +-
src/backend/optimizer/util/joininfo.c | 4 +-
src/backend/optimizer/util/keys.c | 4 +-
src/backend/optimizer/util/pathnode.c | 20 +-
src/backend/optimizer/util/restrictinfo.c | 4 +-
src/backend/optimizer/util/tlist.c | 4 +-
src/backend/storage/file/fd.c | 12 +-
src/backend/storage/lmgr/lmgr.c | 4 +-
src/backend/storage/lmgr/lock.c | 6 +-
src/backend/storage/lmgr/proc.c | 6 +-
src/backend/tcop/dest.c | 8 +-
src/backend/tioga/tgRecipe.h | 3 +-
src/backend/utils/adt/int8.c | 76 ++--
src/backend/utils/adt/numeric.c | 166 ++++----
src/backend/utils/adt/ruleutils.c | 40 +-
src/backend/utils/cache/syscache.c | 4 +-
src/backend/utils/cache/temprel.c | 4 +-
src/backend/utils/mb/big5.c | 10 +-
src/backend/utils/mb/conv.c | 4 +-
src/backend/utils/sort/psort.c | 14 +-
src/bin/pgtclsh/pgtclAppInit.c | 2 +-
src/bin/pgtclsh/pgtkAppInit.c | 2 +-
src/include/access/hash.h | 4 +-
src/include/access/htup.h | 4 +-
src/include/access/printtup.h | 8 +-
src/include/access/strat.h | 3 +-
src/include/access/transam.h | 4 +-
src/include/access/tupdesc.h | 4 +-
src/include/commands/command.h | 4 +-
src/include/commands/vacuum.h | 6 +-
src/include/executor/hashjoin.h | 4 +-
src/include/executor/nodeHashjoin.h | 4 +-
src/include/libpq/libpq.h | 4 +-
src/include/libpq/pqcomm.h | 4 +-
src/include/nodes/execnodes.h | 4 +-
src/include/nodes/memnodes.h | 6 +-
src/include/nodes/parsenodes.h | 14 +-
src/include/nodes/plannodes.h | 6 +-
src/include/nodes/primnodes.h | 4 +-
src/include/nodes/relation.h | 14 +-
src/include/optimizer/clauses.h | 4 +-
src/include/optimizer/cost.h | 6 +-
src/include/optimizer/geqo.h | 4 +-
src/include/optimizer/geqo_misc.h | 4 +-
src/include/optimizer/joininfo.h | 4 +-
src/include/optimizer/keys.h | 4 +-
src/include/optimizer/pathnode.h | 18 +-
src/include/optimizer/paths.h | 12 +-
src/include/optimizer/restrictinfo.h | 4 +-
src/include/optimizer/tlist.h | 4 +-
src/include/optimizer/xfunc.h | 12 +-
src/include/parser/parse_agg.h | 4 +-
src/include/parser/parse_coerce.h | 4 +-
src/include/storage/fd.h | 12 +-
src/include/storage/lmgr.h | 4 +-
src/include/storage/lock.h | 6 +-
src/include/storage/proc.h | 4 +-
src/include/storage/shmem.h | 4 +-
src/include/tcop/dest.h | 8 +-
src/include/utils/builtins.h | 4 +-
src/include/utils/inet.h | 6 +-
src/include/utils/int8.h | 90 ++--
src/include/utils/memutils.h | 6 +-
src/include/utils/numeric.h | 4 +-
src/include/utils/tqual.h | 4 +-
src/interfaces/libpgtcl/libpgtcl.h | 6 +-
src/interfaces/libpgtcl/pgtcl.c | 6 +-
src/interfaces/libpgtcl/pgtclCmds.c | 38 +-
src/interfaces/libpgtcl/pgtclCmds.h | 40 +-
src/interfaces/libpgtcl/pgtclId.c | 32 +-
src/interfaces/libpgtcl/pgtclId.h | 22 +-
src/interfaces/libpq/libpq-int.h | 4 +-
src/pl/tcl/pltcl.c | 30 +-
src/tools/pgindent/pgindent | 401 +++++++++++++++---
109 files changed, 1063 insertions(+), 759 deletions(-)
diff --git a/contrib/int8/int8.c b/contrib/int8/int8.c
index 4e04c993526..23c3a0c13c8 100644
--- a/contrib/int8/int8.c
+++ b/contrib/int8/int8.c
@@ -24,7 +24,8 @@
#endif
#ifndef HAVE_64BIT_INTS
-typedef char[8] int64;
+typedef char[8]
+int64;
#elif defined(__alpha)
typedef long int int64;
@@ -43,38 +44,38 @@ typedef long int int64;
#endif
int64 *int8in(char *str);
-char *int8out(int64 * val);
-
-bool int8eq(int64 * val1, int64 * val2);
-bool int8ne(int64 * val1, int64 * val2);
-bool int8lt(int64 * val1, int64 * val2);
-bool int8gt(int64 * val1, int64 * val2);
-bool int8le(int64 * val1, int64 * val2);
-bool int8ge(int64 * val1, int64 * val2);
-
-bool int84eq(int64 * val1, int32 val2);
-bool int84ne(int64 * val1, int32 val2);
-bool int84lt(int64 * val1, int32 val2);
-bool int84gt(int64 * val1, int32 val2);
-bool int84le(int64 * val1, int32 val2);
-bool int84ge(int64 * val1, int32 val2);
-
-int64 *int8um(int64 * val);
-int64 *int8pl(int64 * val1, int64 * val2);
-int64 *int8mi(int64 * val1, int64 * val2);
-int64 *int8mul(int64 * val1, int64 * val2);
-int64 *int8div(int64 * val1, int64 * val2);
+char *int8out(int64 *val);
+
+bool int8eq(int64 *val1, int64 *val2);
+bool int8ne(int64 *val1, int64 *val2);
+bool int8lt(int64 *val1, int64 *val2);
+bool int8gt(int64 *val1, int64 *val2);
+bool int8le(int64 *val1, int64 *val2);
+bool int8ge(int64 *val1, int64 *val2);
+
+bool int84eq(int64 *val1, int32 val2);
+bool int84ne(int64 *val1, int32 val2);
+bool int84lt(int64 *val1, int32 val2);
+bool int84gt(int64 *val1, int32 val2);
+bool int84le(int64 *val1, int32 val2);
+bool int84ge(int64 *val1, int32 val2);
+
+int64 *int8um(int64 *val);
+int64 *int8pl(int64 *val1, int64 *val2);
+int64 *int8mi(int64 *val1, int64 *val2);
+int64 *int8mul(int64 *val1, int64 *val2);
+int64 *int8div(int64 *val1, int64 *val2);
int64 *int48(int32 val);
-int32 int84(int64 * val);
+int32 int84(int64 *val);
#if FALSE
int64 *int28 (int16 val);
-int16 int82(int64 * val);
+int16 int82(int64 *val);
#endif
-float64 i8tod(int64 * val);
+float64 i8tod(int64 *val);
int64 *dtoi8(float64 val);
/***********************************************************************
@@ -113,7 +114,7 @@ int8in(char *str)
/* int8out()
*/
char *
-int8out(int64 * val)
+int8out(int64 *val)
{
char *result;
@@ -148,37 +149,37 @@ int8out(int64 * val)
* Is val1 relop val2?
*/
bool
-int8eq(int64 * val1, int64 * val2)
+int8eq(int64 *val1, int64 *val2)
{
return (*val1 == *val2);
} /* int8eq() */
bool
-int8ne(int64 * val1, int64 * val2)
+int8ne(int64 *val1, int64 *val2)
{
return (*val1 != *val2);
} /* int8ne() */
bool
-int8lt(int64 * val1, int64 * val2)
+int8lt(int64 *val1, int64 *val2)
{
return (*val1 < *val2);
} /* int8lt() */
bool
-int8gt(int64 * val1, int64 * val2)
+int8gt(int64 *val1, int64 *val2)
{
return (*val1 > *val2);
} /* int8gt() */
bool
-int8le(int64 * val1, int64 * val2)
+int8le(int64 *val1, int64 *val2)
{
return (*val1 <= *val2);
} /* int8le() */
bool
-int8ge(int64 * val1, int64 * val2)
+int8ge(int64 *val1, int64 *val2)
{
return (*val1 >= *val2);
} /* int8ge() */
@@ -188,37 +189,37 @@ int8ge(int64 * val1, int64 * val2)
* Is 64-bit val1 relop 32-bit val2?
*/
bool
-int84eq(int64 * val1, int32 val2)
+int84eq(int64 *val1, int32 val2)
{
return (*val1 == val2);
} /* int84eq() */
bool
-int84ne(int64 * val1, int32 val2)
+int84ne(int64 *val1, int32 val2)
{
return (*val1 != val2);
} /* int84ne() */
bool
-int84lt(int64 * val1, int32 val2)
+int84lt(int64 *val1, int32 val2)
{
return (*val1 < val2);
} /* int84lt() */
bool
-int84gt(int64 * val1, int32 val2)
+int84gt(int64 *val1, int32 val2)
{
return (*val1 > val2);
} /* int84gt() */
bool
-int84le(int64 * val1, int32 val2)
+int84le(int64 *val1, int32 val2)
{
return (*val1 <= val2);
} /* int84le() */
bool
-int84ge(int64 * val1, int32 val2)
+int84ge(int64 *val1, int32 val2)
{
return (*val1 >= val2);
} /* int84ge() */
@@ -229,7 +230,7 @@ int84ge(int64 * val1, int32 val2)
*---------------------------------------------------------*/
int64 *
-int8um(int64 * val)
+int8um(int64 *val)
{
int64 *result = palloc(sizeof(int64));
@@ -242,7 +243,7 @@ int8um(int64 * val)
} /* int8um() */
int64 *
-int8pl(int64 * val1, int64 * val2)
+int8pl(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -255,7 +256,7 @@ int8pl(int64 * val1, int64 * val2)
} /* int8pl() */
int64 *
-int8mi(int64 * val1, int64 * val2)
+int8mi(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -268,7 +269,7 @@ int8mi(int64 * val1, int64 * val2)
} /* int8mi() */
int64 *
-int8mul(int64 * val1, int64 * val2)
+int8mul(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -281,7 +282,7 @@ int8mul(int64 * val1, int64 * val2)
} /* int8mul() */
int64 *
-int8div(int64 * val1, int64 * val2)
+int8div(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -309,7 +310,7 @@ int48(int32 val)
} /* int48() */
int32
-int84(int64 * val)
+int84(int64 *val)
{
int32 result;
@@ -339,7 +340,7 @@ int28 (int16 val)
} /* int28() */
int16
-int82(int64 * val)
+int82(int64 *val)
{
int16 result;
@@ -354,7 +355,7 @@ int82(int64 * val)
#endif
float64
-i8tod(int64 * val)
+i8tod(int64 *val)
{
float64 result = palloc(sizeof(float64data));
diff --git a/contrib/os2client/config.h b/contrib/os2client/config.h
index ad492fb7d6b..afdcb4484c8 100644
--- a/contrib/os2client/config.h
+++ b/contrib/os2client/config.h
@@ -11,7 +11,7 @@
* DEF_PGPORT is the TCP port number on which the Postmaster listens by
* default. This can be overriden by command options, environment variables,
* and the postconfig hook. (set by build script)
- */
+ */
#define DEF_PGPORT "5432"
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 0a2eee932f5..d2d990421ba 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.46 1999/05/25 16:06:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47 1999/05/25 22:40:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,9 +25,9 @@
#include "libpq/pqformat.h"
#include "utils/syscache.h"
-static void printtup_setup(DestReceiver * self, TupleDesc typeinfo);
-static void printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self);
-static void printtup_cleanup(DestReceiver * self);
+static void printtup_setup(DestReceiver *self, TupleDesc typeinfo);
+static void printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self);
+static void printtup_cleanup(DestReceiver *self);
/* ----------------------------------------------------------------
* printtup / debugtup support
@@ -76,7 +76,7 @@ typedef struct
Oid typoutput; /* Oid for the attribute's type output fn */
Oid typelem; /* typelem value to pass to the output fn */
FmgrInfo finfo; /* Precomputed call info for typoutput */
-} PrinttupAttrInfo;
+} PrinttupAttrInfo;
typedef struct
{
@@ -84,7 +84,7 @@ typedef struct
TupleDesc attrinfo; /* The attr info we are set up for */
int nattrs;
PrinttupAttrInfo *myinfo; /* Cached info about each attr */
-} DR_printtup;
+} DR_printtup;
/* ----------------
* Initialize: create a DestReceiver for printtup
@@ -107,7 +107,7 @@ printtup_create_DR()
}
static void
-printtup_setup(DestReceiver * self, TupleDesc typeinfo)
+printtup_setup(DestReceiver *self, TupleDesc typeinfo)
{
/* ----------------
* We could set up the derived attr info at this time, but we postpone it
@@ -123,7 +123,7 @@ printtup_setup(DestReceiver * self, TupleDesc typeinfo)
}
static void
-printtup_prepare_info(DR_printtup * myState, TupleDesc typeinfo, int numAttrs)
+printtup_prepare_info(DR_printtup *myState, TupleDesc typeinfo, int numAttrs)
{
int i;
@@ -151,7 +151,7 @@ printtup_prepare_info(DR_printtup * myState, TupleDesc typeinfo, int numAttrs)
* ----------------
*/
static void
-printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
+printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{
DR_printtup *myState = (DR_printtup *) self;
StringInfoData buf;
@@ -228,7 +228,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
* ----------------
*/
static void
-printtup_cleanup(DestReceiver * self)
+printtup_cleanup(DestReceiver *self)
{
DR_printtup *myState = (DR_printtup *) self;
@@ -280,7 +280,7 @@ showatts(char *name, TupleDesc tupleDesc)
* ----------------
*/
void
-debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
+debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{
int i;
Datum attr;
@@ -316,7 +316,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
* ----------------
*/
void
-printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
+printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{
StringInfoData buf;
int i,
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 71e8db45a43..5692129d9ed 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.49 1999/05/25 16:06:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50 1999/05/25 22:40:48 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -75,7 +75,7 @@ CreateTemplateTupleDesc(int natts)
* ----------------------------------------------------------------
*/
TupleDesc
-CreateTupleDesc(int natts, Form_pg_attribute * attrs)
+CreateTupleDesc(int natts, Form_pg_attribute *attrs)
{
TupleDesc desc;
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index f5605a3f109..1f607dcb3fd 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.17 1999/05/25 16:06:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18 1999/05/25 22:40:49 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -34,7 +34,7 @@ hashint4(uint32 key)
}
uint32
-hashint8(int64 * key)
+hashint8(int64 *key)
{
return ~((uint32) *key);
}
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 796087f812f..505d4ab55d6 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.23 1999/05/25 16:07:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24 1999/05/25 22:40:50 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -40,7 +40,7 @@ btint4cmp(int32 a, int32 b)
}
int32
-btint8cmp(int64 * a, int64 * b)
+btint8cmp(int64 *a, int64 *b)
{
if (*a > *b)
return 1;
diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index 997c02d85da..487f55923df 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.3 1999/05/25 16:08:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.4 1999/05/25 22:40:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,11 +61,11 @@ typedef struct _teeInfo
TeePlanInfo *val;
} TeeInfo;
-QueryTreeList *appendQlist(QueryTreeList *q1, QueryTreeList *q2);
+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,
@@ -77,21 +77,21 @@ static void replaceSeqScan(Plan *plan,
Plan *tplan);
static void tg_rewriteQuery(TgRecipe * r, TgNode * n,
- QueryTreeList *q,
- QueryTreeList *inputQlist);
+ QueryTreeList * q,
+ QueryTreeList * inputQlist);
static Node *tg_replaceNumberedParam(Node *expression,
int pnum,
int rt_ind,
char *teeRelName);
static Node *tg_rewriteParamsInExpr(Node *expression,
- QueryTreeList *inputQlist);
+ QueryTreeList * inputQlist);
static QueryTreeList *tg_parseSubQuery(TgRecipe * r,
TgNode * n,
TeeInfo * teeInfo);
static QueryTreeList *tg_parseTeeNode(TgRecipe * r,
TgNode * n,
int i,
- QueryTreeList *qList,
+ QueryTreeList * qList,
TeeInfo * teeInfo);
@@ -309,8 +309,8 @@ beginRecipe(RecipeStmt *stmt)
static void
tg_rewriteQuery(TgRecipe * r,
TgNode * n,
- QueryTreeList *q,
- QueryTreeList *inputQlist)
+ QueryTreeList * q,
+ QueryTreeList * inputQlist)
{
Query *orig;
Query *inputQ;
@@ -563,7 +563,7 @@ tg_replaceNumberedParam(Node *expression,
*/
static Node *
-tg_rewriteParamsInExpr(Node *expression, QueryTreeList *inputQlist)
+tg_rewriteParamsInExpr(Node *expression, QueryTreeList * inputQlist)
{
List *tl;
TargetEntry *param_tle,
@@ -737,7 +737,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)
{
@@ -1122,7 +1122,7 @@ OffsetVarAttno(Node *node, int varno, int offset)
*/
QueryTreeList *
-appendQlist(QueryTreeList *q1, QueryTreeList *q2)
+appendQlist(QueryTreeList * q1, QueryTreeList * q2)
{
QueryTreeList *newq;
int i,
@@ -1152,7 +1152,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;
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index f4c0f2115a7..c5785b737e0 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.45 1999/05/25 16:08:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.46 1999/05/25 22:40:54 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -519,7 +519,7 @@ PerformAddAttribute(char *relationName,
}
void
-LockTableCommand(LockStmt * lockstmt)
+LockTableCommand(LockStmt *lockstmt)
{
Relation rel;
int aclresult;
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index 645a11cd11e..38b830ea6a1 100644
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -14,7 +14,7 @@
* ExecInitTee
* ExecEndTee
*
- * $Id: nodeTee.c,v 1.2 1999/05/25 16:08:50 momjian Exp $
+ * $Id: nodeTee.c,v 1.3 1999/05/25 22:41:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,7 +44,7 @@
* ------------------------------------------------------------------
*/
bool
-ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
+ExecInitTee(Tee * node, EState *currentEstate, Plan *parent)
{
TeeState *teeState;
Plan *outerPlan;
@@ -207,7 +207,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;
@@ -223,7 +223,7 @@ ExecCountSlotsTee(Tee *node)
* ----------------------------------------------------------------
*/
static void
-initTeeScanDescs(Tee *node)
+initTeeScanDescs(Tee * node)
{
TeeState *teeState;
Relation bufferRel;
@@ -285,7 +285,7 @@ initTeeScanDescs(Tee *node)
*/
TupleTableSlot *
-ExecTee(Tee *node, Plan *parent)
+ExecTee(Tee * node, Plan *parent)
{
EState *estate;
TeeState *teeState;
@@ -437,7 +437,7 @@ ExecTee(Tee *node, Plan *parent)
*/
void
-ExecEndTee(Tee *node, Plan *parent)
+ExecEndTee(Tee * node, Plan *parent)
{
EState *estate;
TeeState *teeState;
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index cab1b066246..e787c762c3b 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.84 1999/05/25 16:08:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.85 1999/05/25 22:40:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -71,9 +71,9 @@ static TupleTableSlot *ExecutePlan(EState *estate, Plan *plan,
int offsetTuples,
int numberTuples,
ScanDirection direction,
- DestReceiver * destfunc);
+ DestReceiver *destfunc);
static void ExecRetrieve(TupleTableSlot *slot,
- DestReceiver * destfunc,
+ DestReceiver *destfunc,
EState *estate);
static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
EState *estate);
@@ -548,7 +548,7 @@ typedef struct execRowMark
Relation relation;
Index rti;
char resname[32];
-} execRowMark;
+} execRowMark;
typedef struct evalPlanQual
{
@@ -556,7 +556,7 @@ typedef struct evalPlanQual
Index rti;
EState estate;
struct evalPlanQual *free;
-} evalPlanQual;
+} evalPlanQual;
/* ----------------------------------------------------------------
* InitPlan
@@ -884,7 +884,7 @@ ExecutePlan(EState *estate,
int offsetTuples,
int numberTuples,
ScanDirection direction,
- DestReceiver * destfunc)
+ DestReceiver *destfunc)
{
JunkFilter *junkfilter;
TupleTableSlot *slot;
@@ -1124,7 +1124,7 @@ lnext: ;
*/
static void
ExecRetrieve(TupleTableSlot *slot,
- DestReceiver * destfunc,
+ DestReceiver *destfunc,
EState *estate)
{
HeapTuple tuple;
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index d5a793e9728..3b5b9d6c48c 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.51 1999/05/25 16:08:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.52 1999/05/25 22:40:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -66,7 +66,7 @@ bool execConstByVal;
int execConstLen;
/* static functions decls */
-static Datum ExecEvalAggref(Aggref * aggref, ExprContext *econtext, bool *isNull);
+static Datum ExecEvalAggref(Aggref *aggref, ExprContext *econtext, bool *isNull);
static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
bool *isNull, bool *isDone);
static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
@@ -190,7 +190,7 @@ ExecEvalArrayRef(ArrayRef *arrayRef,
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalAggref(Aggref * aggref, ExprContext *econtext, bool *isNull)
+ExecEvalAggref(Aggref *aggref, ExprContext *econtext, bool *isNull)
{
*isNull = econtext->ecxt_nulls[aggref->aggno];
return econtext->ecxt_values[aggref->aggno];
@@ -1097,7 +1097,7 @@ ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull)
* ----------------------------------------------------------------
*/
static Datum
-ExecEvalCase(CaseExpr * caseExpr, ExprContext *econtext, bool *isNull)
+ExecEvalCase(CaseExpr *caseExpr, ExprContext *econtext, bool *isNull)
{
List *clauses;
List *clause;
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index f1e0433c39d..a47a9ad5492 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -45,7 +45,7 @@ typedef struct AggFuncInfo
FmgrInfo finalfn;
} AggFuncInfo;
-static Datum aggGetAttr(TupleTableSlot *tuple, Aggref * aggref, bool *isNull);
+static Datum aggGetAttr(TupleTableSlot *tuple, Aggref *aggref, bool *isNull);
/* ---------------------------------------
@@ -582,7 +582,7 @@ ExecEndAgg(Agg *node)
*/
static Datum
aggGetAttr(TupleTableSlot *slot,
- Aggref * aggref,
+ Aggref *aggref,
bool *isNull)
{
Datum result;
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 49f84294021..e494c620261 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.21 1999/05/25 16:08:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.22 1999/05/25 22:41:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,7 +25,7 @@
static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, Plan *parent,
HashJoinState *hjstate);
static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
- BufFile * file,
+ BufFile *file,
TupleTableSlot *tupleSlot);
static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable);
static int ExecHashJoinNewBatch(HashJoinState *hjstate);
@@ -478,7 +478,7 @@ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate)
static TupleTableSlot *
ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
- BufFile * file,
+ BufFile *file,
TupleTableSlot *tupleSlot)
{
HeapTupleData htup;
@@ -625,7 +625,7 @@ ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable)
void
ExecHashJoinSaveTuple(HeapTuple heapTuple,
- BufFile * file)
+ BufFile *file)
{
size_t written;
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index f807412018e..bda75d64973 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,7 +3,7 @@
* spi.c
* Server Programming Interface
*
- * $Id: spi.c,v 1.38 1999/05/25 16:08:48 momjian Exp $
+ * $Id: spi.c,v 1.39 1999/05/25 22:41:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -555,7 +555,7 @@ SPI_pfree(void *pointer)
*
*/
void
-spi_printtup(HeapTuple tuple, TupleDesc tupdesc, DestReceiver * self)
+spi_printtup(HeapTuple tuple, TupleDesc tupdesc, DestReceiver *self)
{
SPITupleTable *tuptable;
MemoryContext oldcxt;
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index ed70ab734a0..2a0a6a04a00 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: be-dumpdata.c,v 1.24 1999/05/25 16:08:57 momjian Exp $
+ * $Id: be-dumpdata.c,v 1.25 1999/05/25 22:41:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -208,7 +208,7 @@ be_typeinit(PortalEntry *entry,
* ----------------
*/
void
-be_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
+be_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{
int i;
Datum attr;
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 723e70b1e0c..ab9b21392f8 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.81 1999/05/25 16:09:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.82 1999/05/25 22:41:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -371,7 +371,7 @@ _copyHashJoin(HashJoin *from)
* ----------------
*/
static void
-CopyNonameFields(Noname * from, Noname * newnode)
+CopyNonameFields(Noname *from, Noname *newnode)
{
newnode->nonameid = from->nonameid;
newnode->keycount = from->keycount;
@@ -384,7 +384,7 @@ CopyNonameFields(Noname * from, Noname * newnode)
* ----------------
*/
static Noname *
-_copyNoname(Noname * from)
+_copyNoname(Noname *from)
{
Noname *newnode = makeNode(Noname);
@@ -862,7 +862,7 @@ _copyFunc(Func *from)
* ----------------
*/
static Aggref *
-_copyAggref(Aggref * from)
+_copyAggref(Aggref *from)
{
Aggref *newnode = makeNode(Aggref);
@@ -907,7 +907,7 @@ _copySubLink(SubLink *from)
* ----------------
*/
static CaseExpr *
-_copyCaseExpr(CaseExpr * from)
+_copyCaseExpr(CaseExpr *from)
{
CaseExpr *newnode = makeNode(CaseExpr);
@@ -929,7 +929,7 @@ _copyCaseExpr(CaseExpr * from)
* ----------------
*/
static CaseWhen *
-_copyCaseWhen(CaseWhen * from)
+_copyCaseWhen(CaseWhen *from)
{
CaseWhen *newnode = makeNode(CaseWhen);
@@ -1000,7 +1000,7 @@ _copyArrayRef(ArrayRef *from)
* -- JMH, 8/2/93
*/
static RelOptInfo *
-_copyRelOptInfo(RelOptInfo * from)
+_copyRelOptInfo(RelOptInfo *from)
{
RelOptInfo *newnode = makeNode(RelOptInfo);
int i,
@@ -1173,7 +1173,7 @@ _copyIndexPath(IndexPath *from)
* ----------------
*/
static void
-CopyNestPathFields(NestPath * from, NestPath * newnode)
+CopyNestPathFields(NestPath *from, NestPath *newnode)
{
Node_Copy(from, newnode, pathinfo);
Node_Copy(from, newnode, outerjoinpath);
@@ -1185,7 +1185,7 @@ CopyNestPathFields(NestPath * from, NestPath * newnode)
* ----------------
*/
static NestPath *
-_copyNestPath(NestPath * from)
+_copyNestPath(NestPath *from)
{
NestPath *newnode = makeNode(NestPath);
@@ -1319,7 +1319,7 @@ _copyMergeOrder(MergeOrder *from)
* ----------------
*/
static RestrictInfo *
-_copyRestrictInfo(RestrictInfo * from)
+_copyRestrictInfo(RestrictInfo *from)
{
RestrictInfo *newnode = makeNode(RestrictInfo);
@@ -1374,7 +1374,7 @@ _copyJoinMethod(JoinMethod *from)
* ----------------
*/
static HashInfo *
-_copyHashInfo(HashInfo * from)
+_copyHashInfo(HashInfo *from)
{
HashInfo *newnode = makeNode(HashInfo);
@@ -1393,7 +1393,7 @@ _copyHashInfo(HashInfo * from)
* ----------------
*/
static MergeInfo *
-_copyMergeInfo(MergeInfo * from)
+_copyMergeInfo(MergeInfo *from)
{
MergeInfo *newnode = makeNode(MergeInfo);
@@ -1412,7 +1412,7 @@ _copyMergeInfo(MergeInfo * from)
* ----------------
*/
static JoinInfo *
-_copyJoinInfo(JoinInfo * from)
+_copyJoinInfo(JoinInfo *from)
{
JoinInfo *newnode = makeNode(JoinInfo);
@@ -1496,7 +1496,7 @@ _copyRangeTblEntry(RangeTblEntry *from)
}
static RowMark *
-_copyRowMark(RowMark * from)
+_copyRowMark(RowMark *from)
{
RowMark *newnode = makeNode(RowMark);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 7f86933496e..e08787b79b9 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.37 1999/05/25 16:09:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.38 1999/05/25 22:41:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -283,7 +283,7 @@ _equalFunc(Func *a, Func *b)
* RestrictInfo is a subclass of Node.
*/
static bool
-_equalRestrictInfo(RestrictInfo * a, RestrictInfo * b)
+_equalRestrictInfo(RestrictInfo *a, RestrictInfo *b)
{
Assert(IsA(a, RestrictInfo));
Assert(IsA(b, RestrictInfo));
@@ -307,7 +307,7 @@ _equalRestrictInfo(RestrictInfo * a, RestrictInfo * b)
* RelOptInfo is a subclass of Node.
*/
static bool
-_equalRelOptInfo(RelOptInfo * a, RelOptInfo * b)
+_equalRelOptInfo(RelOptInfo *a, RelOptInfo *b)
{
Assert(IsA(a, RelOptInfo));
Assert(IsA(b, RelOptInfo));
@@ -392,7 +392,7 @@ _equalIndexPath(IndexPath *a, IndexPath *b)
}
static bool
-_equalNestPath(NestPath * a, NestPath * b)
+_equalNestPath(NestPath *a, NestPath *b)
{
Assert(IsA_JoinPath(a));
Assert(IsA_JoinPath(b));
@@ -477,7 +477,7 @@ _equalMergeOrder(MergeOrder *a, MergeOrder *b)
}
static bool
-_equalHashInfo(HashInfo * a, HashInfo * b)
+_equalHashInfo(HashInfo *a, HashInfo *b)
{
Assert(IsA(a, HashInfo));
Assert(IsA(b, HashInfo));
@@ -524,7 +524,7 @@ _equalSubPlan(SubPlan *a, SubPlan *b)
}
static bool
-_equalJoinInfo(JoinInfo * a, JoinInfo * b)
+_equalJoinInfo(JoinInfo *a, JoinInfo *b)
{
Assert(IsA(a, JoinInfo));
Assert(IsA(b, JoinInfo));
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 71bf12bcde6..50c8bd9f48d 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.17 1999/05/25 16:09:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.18 1999/05/25 22:41:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -302,7 +302,7 @@ _freeHashJoin(HashJoin *node)
* ----------------
*/
static void
-FreeNonameFields(Noname * node)
+FreeNonameFields(Noname *node)
{
return;
}
@@ -313,7 +313,7 @@ FreeNonameFields(Noname * node)
* ----------------
*/
static void
-_freeNoname(Noname * node)
+_freeNoname(Noname *node)
{
/* ----------------
* free node superclass fields
@@ -609,7 +609,7 @@ _freeFunc(Func *node)
* ----------------
*/
static void
-_freeAggref(Aggref * node)
+_freeAggref(Aggref *node)
{
/* ----------------
* free remainder of node
@@ -644,7 +644,7 @@ _freeSubLink(SubLink *node)
* ----------------
*/
static void
-_freeCaseExpr(CaseExpr * node)
+_freeCaseExpr(CaseExpr *node)
{
/* ----------------
* free remainder of node
@@ -662,7 +662,7 @@ _freeCaseExpr(CaseExpr * node)
* ----------------
*/
static void
-_freeCaseWhen(CaseWhen * node)
+_freeCaseWhen(CaseWhen *node)
{
/* ----------------
* free remainder of node
@@ -709,7 +709,7 @@ _freeArrayRef(ArrayRef *node)
* ----------------
*/
static void
-_freeRelOptInfo(RelOptInfo * node)
+_freeRelOptInfo(RelOptInfo *node)
{
/* ----------------
* free remainder of node
@@ -812,7 +812,7 @@ _freeIndexPath(IndexPath *node)
* ----------------
*/
static void
-FreeNestPathFields(NestPath * node)
+FreeNestPathFields(NestPath *node)
{
freeObject(node->pathinfo);
freeObject(node->outerjoinpath);
@@ -824,7 +824,7 @@ FreeNestPathFields(NestPath * node)
* ----------------
*/
static void
-_freeNestPath(NestPath * node)
+_freeNestPath(NestPath *node)
{
/* ----------------
* free the node superclass fields
@@ -933,7 +933,7 @@ _freeMergeOrder(MergeOrder *node)
* ----------------
*/
static void
-_freeRestrictInfo(RestrictInfo * node)
+_freeRestrictInfo(RestrictInfo *node)
{
/* ----------------
* free remainder of node
@@ -979,7 +979,7 @@ _freeJoinMethod(JoinMethod *node)
* ----------------
*/
static void
-_freeHashInfo(HashInfo * node)
+_freeHashInfo(HashInfo *node)
{
/* ----------------
* free remainder of node
@@ -995,7 +995,7 @@ _freeHashInfo(HashInfo * node)
* ----------------
*/
static void
-_freeMergeInfo(MergeInfo * node)
+_freeMergeInfo(MergeInfo *node)
{
/* ----------------
* free remainder of node
@@ -1012,7 +1012,7 @@ _freeMergeInfo(MergeInfo * node)
* ----------------
*/
static void
-_freeJoinInfo(JoinInfo * node)
+_freeJoinInfo(JoinInfo *node)
{
/* ----------------
* free remainder of node
@@ -1066,7 +1066,7 @@ _freeRangeTblEntry(RangeTblEntry *node)
}
static void
-_freeRowMark(RowMark * node)
+_freeRowMark(RowMark *node)
{
pfree(node);
}
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 43fa22e0451..1fdc83ecce7 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: outfuncs.c,v 1.85 1999/05/25 16:09:09 momjian Exp $
+ * $Id: outfuncs.c,v 1.86 1999/05/25 22:41:14 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -456,7 +456,7 @@ _outIndexScan(StringInfo str, IndexScan *node)
* Noname is a subclass of Plan
*/
static void
-_outNoname(StringInfo str, Noname * node)
+_outNoname(StringInfo str, Noname *node)
{
appendStringInfo(str, " NONAME ");
_outPlanInfo(str, (Plan *) node);
@@ -660,7 +660,7 @@ _outConst(StringInfo str, Const *node)
* Aggref
*/
static void
-_outAggref(StringInfo str, Aggref * node)
+_outAggref(StringInfo str, Aggref *node)
{
appendStringInfo(str,
" AGGREG :aggname %s :basetype %u :aggtype %u :target ",
@@ -816,7 +816,7 @@ _outEState(StringInfo str, EState *node)
* Stuff from relation.h
*/
static void
-_outRelOptInfo(StringInfo str, RelOptInfo * node)
+_outRelOptInfo(StringInfo str, RelOptInfo *node)
{
appendStringInfo(str, " RELOPTINFO :relids ");
_outIntList(str, node->relids);
@@ -879,7 +879,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node)
}
static void
-_outRowMark(StringInfo str, RowMark * node)
+_outRowMark(StringInfo str, RowMark *node)
{
appendStringInfo(str, " ROWMARK :rti %u :info %u", node->rti, node->info);
}
@@ -954,7 +954,7 @@ _outIndexPath(StringInfo str, IndexPath *node)
* NestPath is a subclass of Path
*/
static void
-_outNestPath(StringInfo str, NestPath * node)
+_outNestPath(StringInfo str, NestPath *node)
{
appendStringInfo(str,
" NESTPATH :pathtype %d :cost %f :pathkeys ",
@@ -1109,7 +1109,7 @@ _outMergeOrder(StringInfo str, MergeOrder *node)
* RestrictInfo is a subclass of Node.
*/
static void
-_outRestrictInfo(StringInfo str, RestrictInfo * node)
+_outRestrictInfo(StringInfo str, RestrictInfo *node)
{
appendStringInfo(str, " RESTRICTINFO :clause ");
_outNode(str, node->clause);
@@ -1144,7 +1144,7 @@ _outJoinMethod(StringInfo str, JoinMethod *node)
* HashInfo is a subclass of JoinMethod.
*/
static void
-_outHashInfo(StringInfo str, HashInfo * node)
+_outHashInfo(StringInfo str, HashInfo *node)
{
appendStringInfo(str, " HASHINFO :hashop %u :jmkeys ", node->hashop);
_outNode(str, node->jmethod.jmkeys);
@@ -1157,7 +1157,7 @@ _outHashInfo(StringInfo str, HashInfo * node)
* JoinInfo is a subclass of Node.
*/
static void
-_outJoinInfo(StringInfo str, JoinInfo * node)
+_outJoinInfo(StringInfo str, JoinInfo *node)
{
appendStringInfo(str, " JINFO :unjoined_relids ");
_outIntList(str, node->unjoined_relids);
@@ -1365,7 +1365,7 @@ _outConstraint(StringInfo str, Constraint *node)
}
static void
-_outCaseExpr(StringInfo str, CaseExpr * node)
+_outCaseExpr(StringInfo str, CaseExpr *node)
{
appendStringInfo(str, "CASE ");
_outNode(str, node->args);
@@ -1377,7 +1377,7 @@ _outCaseExpr(StringInfo str, CaseExpr * node)
}
static void
-_outCaseWhen(StringInfo str, CaseWhen * node)
+_outCaseWhen(StringInfo str, CaseWhen *node)
{
appendStringInfo(str, " WHEN ");
_outNode(str, node->expr);
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 69d568dbc35..e572c656870 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.38 1999/05/25 16:09:15 momjian Exp $
+ * $Id: geqo_eval.c,v 1.39 1999/05/25 22:41:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -130,7 +130,7 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
* Returns a new join relation incorporating all joins in a left-sided tree.
*/
RelOptInfo *
-gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo * old_rel)
+gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *old_rel)
{
RelOptInfo *inner_rel; /* current relation */
int base_rel_index;
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index dd4320a3d43..206ec2567d2 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.18 1999/05/25 16:09:17 momjian Exp $
+ * $Id: geqo_misc.c,v 1.19 1999/05/25 22:41:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -261,7 +261,7 @@ geqo_print_path(Query *root, Path *path, int indent)
}
void
-geqo_print_rel(Query *root, RelOptInfo * rel)
+geqo_print_rel(Query *root, RelOptInfo *rel)
{
List *l;
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index c49f135ce25..255602bcfab 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.11 1999/05/25 16:09:19 momjian Exp $
+* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.12 1999/05/25 22:41:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,7 +41,7 @@
*/
void
-minspantree(Query *root, List *join_rels, RelOptInfo * garel)
+minspantree(Query *root, List *join_rels, RelOptInfo *garel)
{
int number_of_rels = length(root->base_rel_list);
int number_of_joins = length(join_rels);
@@ -111,9 +111,9 @@ minspantree(Query *root, List *join_rels, RelOptInfo * garel)
else if (number_of_joins == 3)
{
- RelOptInfo *rel12 = (RelOptInfo *) & tmprel_array[1][2];
- RelOptInfo *rel13 = (RelOptInfo *) & tmprel_array[1][3];
- RelOptInfo *rel23 = (RelOptInfo *) & tmprel_array[2][3];
+ RelOptInfo *rel12 = (RelOptInfo *) &tmprel_array[1][2];
+ RelOptInfo *rel13 = (RelOptInfo *) &tmprel_array[1][3];
+ RelOptInfo *rel23 = (RelOptInfo *) &tmprel_array[2][3];
if (rel12->cheapestpath->path_cost > rel13->cheapestpath->path_cost)
{
@@ -159,9 +159,9 @@ minspantree(Query *root, List *join_rels, RelOptInfo * garel)
if (connectto[tempn] != 0)
{
if (n > tempn)
- joinrel = (RelOptInfo *) & tmprel_array[tempn][n];
+ joinrel = (RelOptInfo *) &tmprel_array[tempn][n];
else
- joinrel = (RelOptInfo *) & tmprel_array[n][tempn];
+ joinrel = (RelOptInfo *) &tmprel_array[n][tempn];
dist = joinrel->cheapestpath->path_cost;
if (dist < disttoconnect[tempn])
diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index 85c4952ab59..9c57e16536e 100644
--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.3 1999/05/25 22:04:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.4 1999/05/25 22:41:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -487,7 +487,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
}
-/* ------------------- UTILITY FUNCTIONS ------------------------- */
+/* ------------------- UTILITY FUNCTIONS ------------------------- */
/*
** xfunc_free_stream
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 7ee1c3616c5..3da0edba474 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.3 1999/05/25 16:09:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.4 1999/05/25 22:41:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -144,7 +144,7 @@ xfunc_shouldpull(Query *queryInfo,
Path childpath,
JoinPath parentpath,
int whichchild,
- RestrictInfo * maxcinfopt) /* Out: pointer to clause
+ RestrictInfo *maxcinfopt) /* Out: pointer to clause
* to pullup */
{
LispValue clauselist,
@@ -225,7 +225,7 @@ xfunc_shouldpull(Query *queryInfo,
|| (!is_join(childpath)
&& (whichchild == INNER)
&& IsA(parentpath, NestPath)
- && !IsA(parentpath, HashPath)
+ &&!IsA(parentpath, HashPath)
&&!IsA(parentpath, MergePath)))))
{
@@ -1423,7 +1423,7 @@ do { \
** Just like _copyRel, but doesn't copy the paths
*/
bool
-xfunc_copyrel(RelOptInfo from, RelOptInfo * to)
+xfunc_copyrel(RelOptInfo from, RelOptInfo *to)
{
RelOptInfo newnode;
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 8ebcc5d4794..d9b65c72fb9 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.45 1999/05/25 16:09:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46 1999/05/25 22:41:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ static RelOptInfo *make_one_rel_by_joins(Query *root, List *rels,
int levels_needed);
#ifdef OPTIMIZER_DEBUG
-static void debug_print_rel(Query *root, RelOptInfo * rel);
+static void debug_print_rel(Query *root, RelOptInfo *rel);
#endif
@@ -355,7 +355,7 @@ print_path(Query *root, Path *path, int indent)
}
static void
-debug_print_rel(Query *root, RelOptInfo * rel)
+debug_print_rel(Query *root, RelOptInfo *rel)
{
List *l;
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 327f58cf320..4d3e7d895ee 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.37 1999/05/25 16:09:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.38 1999/05/25 22:41:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -390,7 +390,7 @@ cost_hashjoin(Cost outercost,
* Returns the size.
*/
int
-compute_rel_size(RelOptInfo * rel)
+compute_rel_size(RelOptInfo *rel)
{
Cost temp;
int temp1;
@@ -413,7 +413,7 @@ compute_rel_size(RelOptInfo * rel)
* Returns the width of the tuple as a fixnum.
*/
int
-compute_rel_width(RelOptInfo * rel)
+compute_rel_width(RelOptInfo *rel)
{
return compute_targetlist_width(get_actual_tlist(rel->targetlist));
}
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 29694ed2587..4a2dbbb0fe5 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.55 1999/05/25 16:09:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.56 1999/05/25 22:41:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,32 +45,32 @@
#include "utils/lsyscache.h"
-static void match_index_orclauses(RelOptInfo * rel, RelOptInfo * index, int indexkey,
+static void match_index_orclauses(RelOptInfo *rel, RelOptInfo *index, int indexkey,
int xclass, List *restrictinfo_list);
static bool match_index_to_operand(int indexkey, Expr *operand,
- RelOptInfo * rel, RelOptInfo * index);
-static List *match_index_orclause(RelOptInfo * rel, RelOptInfo * index, int indexkey,
+ RelOptInfo *rel, RelOptInfo *index);
+static List *match_index_orclause(RelOptInfo *rel, RelOptInfo *index, int indexkey,
int xclass, List *or_clauses, List *other_matching_indices);
-static List *group_clauses_by_indexkey(RelOptInfo * rel, RelOptInfo * index,
+static List *group_clauses_by_indexkey(RelOptInfo *rel, RelOptInfo *index,
int *indexkeys, Oid *classes, List *restrictinfo_list);
-static List *group_clauses_by_ikey_for_joins(RelOptInfo * rel, RelOptInfo * index,
+static List *group_clauses_by_ikey_for_joins(RelOptInfo *rel, RelOptInfo *index,
int *indexkeys, Oid *classes, List *join_cinfo_list, List *restr_cinfo_list);
-static RestrictInfo *match_clause_to_indexkey(RelOptInfo * rel, RelOptInfo * index, int indexkey,
- int xclass, RestrictInfo * restrictInfo, bool join);
+static RestrictInfo *match_clause_to_indexkey(RelOptInfo *rel, RelOptInfo *index, int indexkey,
+ int xclass, RestrictInfo *restrictInfo, bool join);
static bool pred_test(List *predicate_list, List *restrictinfo_list,
List *joininfo_list);
static bool one_pred_test(Expr *predicate, List *restrictinfo_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(RelOptInfo * rel, RelOptInfo * index,
+static List *indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
List *joininfo_list, List *restrictinfo_list);
-static List *index_innerjoin(Query *root, RelOptInfo * rel,
- List *clausegroup_list, RelOptInfo * index);
-static List *create_index_path_group(Query *root, RelOptInfo * rel, RelOptInfo * index,
+static List *index_innerjoin(Query *root, RelOptInfo *rel,
+ List *clausegroup_list, RelOptInfo *index);
+static List *create_index_path_group(Query *root, RelOptInfo *rel, RelOptInfo *index,
List *clausegroup_list, bool join);
static List *add_index_paths(List *indexpaths, List *new_indexpaths);
-static bool function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo * index);
+static bool function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index);
/* find_index_paths()
@@ -100,7 +100,7 @@ static bool function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo
*/
List *
create_index_paths(Query *root,
- RelOptInfo * rel,
+ RelOptInfo *rel,
List *indices,
List *restrictinfo_list,
List *joininfo_list)
@@ -217,8 +217,8 @@ create_index_paths(Query *root,
*
*/
static void
-match_index_orclauses(RelOptInfo * rel,
- RelOptInfo * index,
+match_index_orclauses(RelOptInfo *rel,
+ RelOptInfo *index,
int indexkey,
int xclass,
List *restrictinfo_list)
@@ -253,8 +253,8 @@ match_index_orclauses(RelOptInfo * rel,
static bool
match_index_to_operand(int indexkey,
Expr *operand,
- RelOptInfo * rel,
- RelOptInfo * index)
+ RelOptInfo *rel,
+ RelOptInfo *index)
{
bool result;
@@ -296,8 +296,8 @@ match_index_to_operand(int indexkey,
* match the third, g,h match the fourth, etc.
*/
static List *
-match_index_orclause(RelOptInfo * rel,
- RelOptInfo * index,
+match_index_orclause(RelOptInfo *rel,
+ RelOptInfo *index,
int indexkey,
int xclass,
List *or_clauses,
@@ -387,8 +387,8 @@ match_index_orclause(RelOptInfo * rel,
*
*/
static List *
-group_clauses_by_indexkey(RelOptInfo * rel,
- RelOptInfo * index,
+group_clauses_by_indexkey(RelOptInfo *rel,
+ RelOptInfo *index,
int *indexkeys,
Oid *classes,
List *restrictinfo_list)
@@ -449,8 +449,8 @@ group_clauses_by_indexkey(RelOptInfo * rel,
*
*/
static List *
-group_clauses_by_ikey_for_joins(RelOptInfo * rel,
- RelOptInfo * index,
+group_clauses_by_ikey_for_joins(RelOptInfo *rel,
+ RelOptInfo *index,
int *indexkeys,
Oid *classes,
List *join_cinfo_list,
@@ -571,11 +571,11 @@ group_clauses_by_ikey_for_joins(RelOptInfo * rel,
*
*/
static RestrictInfo *
-match_clause_to_indexkey(RelOptInfo * rel,
- RelOptInfo * index,
+match_clause_to_indexkey(RelOptInfo *rel,
+ RelOptInfo *index,
int indexkey,
int xclass,
- RestrictInfo * restrictInfo,
+ RestrictInfo *restrictInfo,
bool join)
{
Expr *clause = restrictInfo->clause;
@@ -1183,7 +1183,7 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
*
*/
static List *
-indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index,
+indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
List *joininfo_list, List *restrictinfo_list)
{
JoinInfo *joininfo = (JoinInfo *) NULL;
@@ -1255,8 +1255,8 @@ extract_restrict_clauses(List *clausegroup)
*
*/
static List *
-index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list,
- RelOptInfo * index)
+index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
+ RelOptInfo *index)
{
List *clausegroup = NIL;
List *cg_list = NIL;
@@ -1343,8 +1343,8 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list,
*/
static List *
create_index_path_group(Query *root,
- RelOptInfo * rel,
- RelOptInfo * index,
+ RelOptInfo *rel,
+ RelOptInfo *index,
List *clausegroup_list,
bool join)
{
@@ -1386,7 +1386,7 @@ add_index_paths(List *indexpaths, List *new_indexpaths)
}
static bool
-function_index_operand(Expr *funcOpnd, RelOptInfo * rel, RelOptInfo * index)
+function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index)
{
Oid heapRelid = (Oid) lfirsti(rel->relids);
Func *function;
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index a6f22c40edc..3dade2c6326 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.37 1999/05/25 16:09:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38 1999/05/25 22:41:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,14 +30,14 @@
* _enable_mergejoin} */
static Path *best_innerjoin(List *join_paths, List *outer_relid);
-static List *sort_inner_and_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel,
+static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *mergeinfo_list);
-static List *match_unsorted_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel,
+static List *match_unsorted_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *outerpath_list, Path *cheapest_inner, Path *best_innerjoin,
List *mergeinfo_list);
-static List *match_unsorted_inner(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel,
+static List *match_unsorted_inner(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *innerpath_list, List *mergeinfo_list);
-static List *hash_inner_and_outer(RelOptInfo * joinrel, RelOptInfo * outerrel, RelOptInfo * innerrel,
+static List *hash_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
List *hashinfo_list);
/*
@@ -194,9 +194,9 @@ best_innerjoin(List *join_paths, Relids outer_relids)
* Returns a list of mergejoin paths.
*/
static List *
-sort_inner_and_outer(RelOptInfo * joinrel,
- RelOptInfo * outerrel,
- RelOptInfo * innerrel,
+sort_inner_and_outer(RelOptInfo *joinrel,
+ RelOptInfo *outerrel,
+ RelOptInfo *innerrel,
List *mergeinfo_list)
{
List *ms_list = NIL;
@@ -268,9 +268,9 @@ sort_inner_and_outer(RelOptInfo * joinrel,
* Returns a list of possible join path nodes.
*/
static List *
-match_unsorted_outer(RelOptInfo * joinrel,
- RelOptInfo * outerrel,
- RelOptInfo * innerrel,
+match_unsorted_outer(RelOptInfo *joinrel,
+ RelOptInfo *outerrel,
+ RelOptInfo *innerrel,
List *outerpath_list,
Path *cheapest_inner,
Path *best_innerjoin,
@@ -411,9 +411,9 @@ match_unsorted_outer(RelOptInfo * joinrel,
* Returns a list of possible merge paths.
*/
static List *
-match_unsorted_inner(RelOptInfo * joinrel,
- RelOptInfo * outerrel,
- RelOptInfo * innerrel,
+match_unsorted_inner(RelOptInfo *joinrel,
+ RelOptInfo *outerrel,
+ RelOptInfo *innerrel,
List *innerpath_list,
List *mergeinfo_list)
{
@@ -503,9 +503,9 @@ match_unsorted_inner(RelOptInfo * joinrel,
* Returns a list of hashjoin paths.
*/
static List *
-hash_inner_and_outer(RelOptInfo * joinrel,
- RelOptInfo * outerrel,
- RelOptInfo * innerrel,
+hash_inner_and_outer(RelOptInfo *joinrel,
+ RelOptInfo *outerrel,
+ RelOptInfo *innerrel,
List *hashinfo_list)
{
List *hjoin_list = NIL;
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 861f3cb2255..1a2c897502f 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.33 1999/05/25 16:09:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.34 1999/05/25 22:41:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,8 +26,8 @@
static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
static bool nonoverlap_sets(List *s1, List *s2);
static bool is_subset(List *s1, List *s2);
-static void set_joinrel_size(RelOptInfo * joinrel, RelOptInfo * outer_rel,
- RelOptInfo * inner_rel, JoinInfo * jinfo);
+static void set_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel,
+ RelOptInfo *inner_rel, JoinInfo *jinfo);
/*
* make_rels_by_joins
@@ -89,7 +89,7 @@ make_rels_by_joins(Query *root, List *old_rels)
* Returns a list of new join relations.
*/
List *
-make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel,
+make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
List *joininfo_list, Relids only_relids)
{
List *join_list = NIL;
@@ -159,7 +159,7 @@ make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel,
* Returns a list of new join relations.
*/
List *
-make_rels_by_clauseless_joins(RelOptInfo * old_rel, List *inner_rels)
+make_rels_by_clauseless_joins(RelOptInfo *old_rel, List *inner_rels)
{
RelOptInfo *inner_rel;
List *t_list = NIL;
@@ -192,7 +192,7 @@ make_rels_by_clauseless_joins(RelOptInfo * old_rel, List *inner_rels)
* Returns the new join relation node.
*/
RelOptInfo *
-make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo)
+make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo)
{
RelOptInfo *joinrel = makeNode(RelOptInfo);
List *joinrel_joininfo_list = NIL;
@@ -436,7 +436,7 @@ is_subset(List *s1, List *s2)
}
static void
-set_joinrel_size(RelOptInfo * joinrel, RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * jinfo)
+set_joinrel_size(RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *jinfo)
{
int ntuples;
float selec;
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 4c257212185..0b9dd397d74 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.24 1999/05/25 16:09:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25 1999/05/25 22:41:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,9 +31,9 @@
#include "parser/parsetree.h"
-static void best_or_subclause_indices(Query *root, RelOptInfo * rel, List *subclauses,
+static void best_or_subclause_indices(Query *root, RelOptInfo *rel, List *subclauses,
List *indices, List **indexids, Cost *cost, Cost *selec);
-static void best_or_subclause_index(Query *root, RelOptInfo * rel, Expr *subclause,
+static void best_or_subclause_index(Query *root, RelOptInfo *rel, Expr *subclause,
List *indices, int *indexid, Cost *cost, Cost *selec);
@@ -49,7 +49,7 @@ static void best_or_subclause_index(Query *root, RelOptInfo * rel, Expr *subclau
*/
List *
create_or_index_paths(Query *root,
- RelOptInfo * rel, List *clauses)
+ RelOptInfo *rel, List *clauses)
{
List *t_list = NIL;
List *clist;
@@ -156,7 +156,7 @@ create_or_index_paths(Query *root,
*/
static void
best_or_subclause_indices(Query *root,
- RelOptInfo * rel,
+ RelOptInfo *rel,
List *subclauses,
List *indices,
List **indexids, /* return value */
@@ -205,7 +205,7 @@ best_or_subclause_indices(Query *root,
*/
static void
best_or_subclause_index(Query *root,
- RelOptInfo * rel,
+ RelOptInfo *rel,
Expr *subclause,
List *indices,
int *retIndexid, /* return value */
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index da52363cc87..ba8880daa26 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.38 1999/05/25 16:09:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39 1999/05/25 22:41:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
#include "utils/elog.h"
-static List *merge_rel_with_same_relids(RelOptInfo * rel, Relids unjoined_relids);
+static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);
/*
* merge_rels_with_same_relids
@@ -59,7 +59,7 @@ merge_rels_with_same_relids(List *rel_list)
*
*/
static List *
-merge_rel_with_same_relids(RelOptInfo * rel, Relids unjoined_relids)
+merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids)
{
List *i = NIL;
List *result = NIL;
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index c72d31ca10a..cc08b17bb20 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.56 1999/05/25 16:09:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.57 1999/05/25 22:41:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,7 +53,7 @@ static SeqScan *create_seqscan_node(Path *best_path, List *tlist,
List *scan_clauses);
static IndexScan *create_indexscan_node(IndexPath *best_path, List *tlist,
List *scan_clauses);
-static NestLoop *create_nestloop_node(NestPath * best_path, List *tlist,
+static NestLoop *create_nestloop_node(NestPath *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,
@@ -418,7 +418,7 @@ create_indexscan_node(IndexPath *best_path,
*****************************************************************************/
static NestLoop *
-create_nestloop_node(NestPath * best_path,
+create_nestloop_node(NestPath *best_path,
List *tlist,
List *clauses,
Plan *outer_node,
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 592f6e02031..059f52e5bf4 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.30 1999/05/25 16:09:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.31 1999/05/25 22:41:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@
extern int Quiet;
static void add_restrict_and_join_to_rel(Query *root, List *clause);
-static void add_join_info_to_rels(Query *root, RestrictInfo * restrictinfo,
+static void add_join_info_to_rels(Query *root, RestrictInfo *restrictinfo,
Relids join_relids);
static void add_vars_to_targetlist(Query *root, List *vars, Relids join_relids);
@@ -240,7 +240,7 @@ add_restrict_and_join_to_rel(Query *root, List *clause)
*
*/
static void
-add_join_info_to_rels(Query *root, RestrictInfo * restrictinfo,
+add_join_info_to_rels(Query *root, RestrictInfo *restrictinfo,
Relids join_relids)
{
List *join_relid;
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 31d1205a45c..2e433c4d41d 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.47 1999/05/25 16:09:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.48 1999/05/25 22:41:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
static void set_join_tlist_references(Join *join);
static void set_nonamescan_tlist_references(SeqScan *nonamescan);
-static void set_noname_tlist_references(Noname * noname);
+static void set_noname_tlist_references(Noname *noname);
static Node *replace_clause_joinvar_refs(Node *clause,
List *outer_tlist,
List *inner_tlist);
@@ -161,7 +161,7 @@ set_nonamescan_tlist_references(SeqScan *nonamescan)
*
*/
static void
-set_noname_tlist_references(Noname * noname)
+set_noname_tlist_references(Noname *noname)
{
Plan *source = ((Plan *) noname)->lefttree;
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 8d02a66e76b..6b6389267ca 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.34 1999/05/25 16:09:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.35 1999/05/25 22:41:46 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -369,7 +369,7 @@ pull_constant_clauses(List *quals, List **constantQual)
*
*/
void
-clause_get_relids_vars(Node *clause, Relids * relids, List **vars)
+clause_get_relids_vars(Node *clause, Relids *relids, List **vars)
{
List *clvars = pull_var_clause(clause);
List *var_list = NIL;
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 7d4cf825db7..4fe91eb8656 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.15 1999/05/25 16:09:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.16 1999/05/25 22:41:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@ static List *find_secondary_index(Query *root, Oid relid);
*
*/
List *
-find_relation_indices(Query *root, RelOptInfo * rel)
+find_relation_indices(Query *root, RelOptInfo *rel)
{
if (rel->indexed)
return find_secondary_index(root, lfirsti(rel->relids));
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index e9d919c436e..82602c13aa4 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.20 1999/05/25 16:09:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.21 1999/05/25 22:41:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -62,7 +62,7 @@ joininfo_member(List *join_relids, List *joininfo_list)
*
*/
JoinInfo *
-find_joininfo_node(RelOptInfo * this_rel, Relids join_relids)
+find_joininfo_node(RelOptInfo *this_rel, Relids join_relids)
{
JoinInfo *joininfo = joininfo_member(join_relids,
this_rel->joininfo);
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 84528e7d064..88236173a57 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.20 1999/05/25 16:09:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.21 1999/05/25 22:41:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -54,7 +54,7 @@ static bool equal_indexkey_var(int index_key, Var *var);
*
*/
bool
-match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel)
+match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel)
{
if (IsA(operand, Var) &&
(lfirsti(rel->relids) == operand->varno) &&
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 7e9b8e30903..2cc98e7a871 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.41 1999/05/25 16:09:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.42 1999/05/25 22:41:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -62,7 +62,7 @@ path_is_cheaper(Path *path1, Path *path2)
*
*/
Path *
-set_cheapest(RelOptInfo * parent_rel, List *pathlist)
+set_cheapest(RelOptInfo *parent_rel, List *pathlist)
{
List *p;
Path *cheapest_so_far;
@@ -99,7 +99,7 @@ set_cheapest(RelOptInfo * parent_rel, List *pathlist)
*
*/
List *
-add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths)
+add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
{
List *p1;
@@ -278,7 +278,7 @@ better_path(Path *new_path, List *unique_paths, bool *is_new)
*
*/
Path *
-create_seqscan_path(RelOptInfo * rel)
+create_seqscan_path(RelOptInfo *rel)
{
int relid = 0;
@@ -326,8 +326,8 @@ create_seqscan_path(RelOptInfo * rel)
*/
IndexPath *
create_index_path(Query *root,
- RelOptInfo * rel,
- RelOptInfo * index,
+ RelOptInfo *rel,
+ RelOptInfo *index,
List *restriction_clauses,
bool is_join_scan)
{
@@ -473,8 +473,8 @@ create_index_path(Query *root,
*
*/
NestPath *
-create_nestloop_path(RelOptInfo * joinrel,
- RelOptInfo * outer_rel,
+create_nestloop_path(RelOptInfo *joinrel,
+ RelOptInfo *outer_rel,
Path *outer_path,
Path *inner_path,
List *pathkeys)
@@ -541,7 +541,7 @@ create_nestloop_path(RelOptInfo * joinrel,
*
*/
MergePath *
-create_mergejoin_path(RelOptInfo * joinrel,
+create_mergejoin_path(RelOptInfo *joinrel,
int outersize,
int innersize,
int outerwidth,
@@ -604,7 +604,7 @@ create_mergejoin_path(RelOptInfo * joinrel,
*
*/
HashPath *
-create_hashjoin_path(RelOptInfo * joinrel,
+create_hashjoin_path(RelOptInfo *joinrel,
int outersize,
int innersize,
int outerwidth,
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 5c59e0fdf88..504652db8e1 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.3 1999/05/25 16:10:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.4 1999/05/25 22:41:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
*
*/
bool
-valid_or_clause(RestrictInfo * restrictinfo)
+valid_or_clause(RestrictInfo *restrictinfo)
{
if (restrictinfo != NULL &&
!single_node((Node *) restrictinfo->clause) &&
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 497bb78b3b4..8a331a99052 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.32 1999/05/25 16:10:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.33 1999/05/25 22:41:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -93,7 +93,7 @@ matching_tlist_var(Var *var, List *targetlist)
* CREATES: new var_node iff no matching var_node exists in targetlist
*/
void
-add_var_to_tlist(RelOptInfo * rel, Var *var)
+add_var_to_tlist(RelOptInfo *rel, Var *var)
{
Expr *oldvar;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index eade2f1c642..190a5769564 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.40 1999/05/25 16:11:03 momjian Exp $
+ * $Id: fd.c,v 1.41 1999/05/25 22:41:57 momjian Exp $
*
* NOTES:
*
@@ -1064,7 +1064,7 @@ BufFileCreate(File file)
* Like fclose(), this also implicitly FileCloses the underlying File.
*/
void
-BufFileClose(BufFile * file)
+BufFileClose(BufFile *file)
{
/* flush any unwritten data */
BufFileFlush(file);
@@ -1079,7 +1079,7 @@ BufFileClose(BufFile * file)
* Like fread() except we assume 1-byte element size.
*/
size_t
-BufFileRead(BufFile * file, void *ptr, size_t size)
+BufFileRead(BufFile *file, void *ptr, size_t size)
{
size_t nread = 0;
size_t nthistime;
@@ -1125,7 +1125,7 @@ BufFileRead(BufFile * file, void *ptr, size_t size)
* Like fwrite() except we assume 1-byte element size.
*/
size_t
-BufFileWrite(BufFile * file, void *ptr, size_t size)
+BufFileWrite(BufFile *file, void *ptr, size_t size)
{
size_t nwritten = 0;
size_t nthistime;
@@ -1169,7 +1169,7 @@ BufFileWrite(BufFile * file, void *ptr, size_t size)
* Like fflush()
*/
int
-BufFileFlush(BufFile * file)
+BufFileFlush(BufFile *file)
{
if (file->dirty)
{
@@ -1187,7 +1187,7 @@ BufFileFlush(BufFile * file)
* the new file offset (or -1 in case of error).
*/
long
-BufFileSeek(BufFile * file, long offset, int whence)
+BufFileSeek(BufFile *file, long offset, int whence)
{
if (BufFileFlush(file) < 0)
return -1L;
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 3cebcb9ba0a..d8da2e60ad5 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.24 1999/05/25 16:11:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.25 1999/05/25 22:42:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -92,7 +92,7 @@ static int LockPrios[] = {
7
};
-LOCKMETHOD LockTableId = (LOCKMETHOD) NULL;
+LOCKMETHOD LockTableId = (LOCKMETHOD) NULL;
LOCKMETHOD LongTermTableId = (LOCKMETHOD) NULL;
/*
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 9860abca7e4..15d55ab647f 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.53 1999/05/25 16:11:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.54 1999/05/25 22:42:03 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -231,7 +231,7 @@ LockDisable(int status)
* Notes: just copying. Should only be called once.
*/
static void
-LockMethodInit(LOCKMETHODTABLE * lockMethodTable,
+LockMethodInit(LOCKMETHODTABLE *lockMethodTable,
MASK *conflictsP,
int *prioP,
int numModes)
@@ -1843,7 +1843,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
if (is_user_lock)
{
TPRINTF(TRACE_USERLOCKS, "LockOwners: user lock tag [%u]",
- locktag->objId.blkno;
+ locktag->objId.blkno);
}
#endif
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 3c0b96713ad..d88ded9a7a8 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.56 1999/05/25 16:11:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 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.56 1999/05/25 16:11:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -492,7 +492,7 @@ ProcQueueInit(PROC_QUEUE *queue)
*/
int
ProcSleep(PROC_QUEUE *waitQueue,/* lock->waitProcs */
- LOCKMETHODCTL * lockctl,
+ LOCKMETHODCTL *lockctl,
int token, /* lockmode */
LOCK *lock)
{
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index dce9425e197..f9e96a2f270 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.30 1999/05/25 16:11:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.31 1999/05/25 22:42:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,17 +60,17 @@ static char CommandInfo[32] = {0};
* ----------------
*/
static void
-donothingReceive(HeapTuple tuple, TupleDesc typeinfo, DestReceiver * self)
+donothingReceive(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
{
}
static void
-donothingSetup(DestReceiver * self, TupleDesc typeinfo)
+donothingSetup(DestReceiver *self, TupleDesc typeinfo)
{
}
static void
-donothingCleanup(DestReceiver * self)
+donothingCleanup(DestReceiver *self)
{
}
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index 18275c21234..b5faa82cb2b 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.10 1999/05/25 22:04:36 momjian Exp $
+ * $Id: tgRecipe.h,v 1.11 1999/05/25 22:42:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,6 +37,7 @@ typedef struct
*
*
*
+ *
* geo-decls.h */
#endif /* TIOGA_FRONTEND */
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 289aed674ba..ba609865db8 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -71,7 +71,7 @@ int8in(char *str)
/* int8out()
*/
char *
-int8out(int64 * val)
+int8out(int64 *val)
{
char *result;
@@ -100,37 +100,37 @@ int8out(int64 * val)
* Is val1 relop val2?
*/
bool
-int8eq(int64 * val1, int64 * val2)
+int8eq(int64 *val1, int64 *val2)
{
return *val1 == *val2;
} /* int8eq() */
bool
-int8ne(int64 * val1, int64 * val2)
+int8ne(int64 *val1, int64 *val2)
{
return *val1 != *val2;
} /* int8ne() */
bool
-int8lt(int64 * val1, int64 * val2)
+int8lt(int64 *val1, int64 *val2)
{
return *val1 < *val2;
} /* int8lt() */
bool
-int8gt(int64 * val1, int64 * val2)
+int8gt(int64 *val1, int64 *val2)
{
return *val1 > *val2;
} /* int8gt() */
bool
-int8le(int64 * val1, int64 * val2)
+int8le(int64 *val1, int64 *val2)
{
return *val1 <= *val2;
} /* int8le() */
bool
-int8ge(int64 * val1, int64 * val2)
+int8ge(int64 *val1, int64 *val2)
{
return *val1 >= *val2;
} /* int8ge() */
@@ -140,37 +140,37 @@ int8ge(int64 * val1, int64 * val2)
* Is 64-bit val1 relop 32-bit val2?
*/
bool
-int84eq(int64 * val1, int32 val2)
+int84eq(int64 *val1, int32 val2)
{
return *val1 == val2;
} /* int84eq() */
bool
-int84ne(int64 * val1, int32 val2)
+int84ne(int64 *val1, int32 val2)
{
return *val1 != val2;
} /* int84ne() */
bool
-int84lt(int64 * val1, int32 val2)
+int84lt(int64 *val1, int32 val2)
{
return *val1 < val2;
} /* int84lt() */
bool
-int84gt(int64 * val1, int32 val2)
+int84gt(int64 *val1, int32 val2)
{
return *val1 > val2;
} /* int84gt() */
bool
-int84le(int64 * val1, int32 val2)
+int84le(int64 *val1, int32 val2)
{
return *val1 <= val2;
} /* int84le() */
bool
-int84ge(int64 * val1, int32 val2)
+int84ge(int64 *val1, int32 val2)
{
return *val1 >= val2;
} /* int84ge() */
@@ -180,37 +180,37 @@ int84ge(int64 * val1, int32 val2)
* Is 32-bit val1 relop 64-bit val2?
*/
bool
-int48eq(int32 val1, int64 * val2)
+int48eq(int32 val1, int64 *val2)
{
return val1 == *val2;
} /* int48eq() */
bool
-int48ne(int32 val1, int64 * val2)
+int48ne(int32 val1, int64 *val2)
{
return val1 != *val2;
} /* int48ne() */
bool
-int48lt(int32 val1, int64 * val2)
+int48lt(int32 val1, int64 *val2)
{
return val1 < *val2;
} /* int48lt() */
bool
-int48gt(int32 val1, int64 * val2)
+int48gt(int32 val1, int64 *val2)
{
return val1 > *val2;
} /* int48gt() */
bool
-int48le(int32 val1, int64 * val2)
+int48le(int32 val1, int64 *val2)
{
return val1 <= *val2;
} /* int48le() */
bool
-int48ge(int32 val1, int64 * val2)
+int48ge(int32 val1, int64 *val2)
{
return val1 >= *val2;
} /* int48ge() */
@@ -221,7 +221,7 @@ int48ge(int32 val1, int64 * val2)
*---------------------------------------------------------*/
int64 *
-int8um(int64 * val)
+int8um(int64 *val)
{
int64 temp = 0;
int64 *result = palloc(sizeof(int64));
@@ -236,7 +236,7 @@ int8um(int64 * val)
int64 *
-int8pl(int64 * val1, int64 * val2)
+int8pl(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -249,7 +249,7 @@ int8pl(int64 * val1, int64 * val2)
} /* int8pl() */
int64 *
-int8mi(int64 * val1, int64 * val2)
+int8mi(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -262,7 +262,7 @@ int8mi(int64 * val1, int64 * val2)
} /* int8mi() */
int64 *
-int8mul(int64 * val1, int64 * val2)
+int8mul(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -275,7 +275,7 @@ int8mul(int64 * val1, int64 * val2)
} /* int8mul() */
int64 *
-int8div(int64 * val1, int64 * val2)
+int8div(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -288,7 +288,7 @@ int8div(int64 * val1, int64 * val2)
} /* int8div() */
int64 *
-int8larger(int64 * val1, int64 * val2)
+int8larger(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -301,7 +301,7 @@ int8larger(int64 * val1, int64 * val2)
} /* int8larger() */
int64 *
-int8smaller(int64 * val1, int64 * val2)
+int8smaller(int64 *val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -315,7 +315,7 @@ int8smaller(int64 * val1, int64 * val2)
int64 *
-int84pl(int64 * val1, int32 val2)
+int84pl(int64 *val1, int32 val2)
{
int64 *result = palloc(sizeof(int64));
@@ -328,7 +328,7 @@ int84pl(int64 * val1, int32 val2)
} /* int84pl() */
int64 *
-int84mi(int64 * val1, int32 val2)
+int84mi(int64 *val1, int32 val2)
{
int64 *result = palloc(sizeof(int64));
@@ -341,7 +341,7 @@ int84mi(int64 * val1, int32 val2)
} /* int84mi() */
int64 *
-int84mul(int64 * val1, int32 val2)
+int84mul(int64 *val1, int32 val2)
{
int64 *result = palloc(sizeof(int64));
@@ -354,7 +354,7 @@ int84mul(int64 * val1, int32 val2)
} /* int84mul() */
int64 *
-int84div(int64 * val1, int32 val2)
+int84div(int64 *val1, int32 val2)
{
int64 *result = palloc(sizeof(int64));
@@ -368,7 +368,7 @@ int84div(int64 * val1, int32 val2)
int64 *
-int48pl(int32 val1, int64 * val2)
+int48pl(int32 val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -381,7 +381,7 @@ int48pl(int32 val1, int64 * val2)
} /* int48pl() */
int64 *
-int48mi(int32 val1, int64 * val2)
+int48mi(int32 val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -394,7 +394,7 @@ int48mi(int32 val1, int64 * val2)
} /* int48mi() */
int64 *
-int48mul(int32 val1, int64 * val2)
+int48mul(int32 val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -407,7 +407,7 @@ int48mul(int32 val1, int64 * val2)
} /* int48mul() */
int64 *
-int48div(int32 val1, int64 * val2)
+int48div(int32 val1, int64 *val2)
{
int64 *result = palloc(sizeof(int64));
@@ -435,7 +435,7 @@ int48(int32 val)
} /* int48() */
int32
-int84(int64 * val)
+int84(int64 *val)
{
int32 result;
@@ -473,7 +473,7 @@ int28 (int16 val)
} /* int28() */
int16
-int82(int64 * val)
+int82(int64 *val)
{
int16 result;
@@ -491,7 +491,7 @@ int82(int64 * val)
#endif
float64
-i8tod(int64 * val)
+i8tod(int64 *val)
{
float64 result = palloc(sizeof(float64data));
@@ -546,7 +546,7 @@ text_int8(text *str)
/* int8_text()
*/
text *
-int8_text(int64 * val)
+int8_text(int64 *val)
{
text *result;
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index e8a8c129a43..da720f0f196 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -5,7 +5,7 @@
*
* 1998 Jan Wieck
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.15 1999/05/25 22:04:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.16 1999/05/25 22:42:13 momjian Exp $
*
* ----------
*/
@@ -63,7 +63,7 @@ typedef struct NumericDigitBuf
struct NumericDigitBuf *prev;
struct NumericDigitBuf *next;
int size;
-} NumericDigitBuf;
+} NumericDigitBuf;
typedef struct NumericVar
{
@@ -74,7 +74,7 @@ typedef struct NumericVar
int sign;
NumericDigitBuf *buf;
NumericDigit *digits;
-} NumericVar;
+} NumericVar;
/* ----------
@@ -114,7 +114,7 @@ static NumericVar const_nan =
#ifdef NUMERIC_DEBUG
static void dump_numeric(char *str, Numeric num);
-static void dump_var(char *str, NumericVar * var);
+static void dump_var(char *str, NumericVar *var);
#else
#define dump_numeric(s,n)
@@ -122,37 +122,37 @@ static void dump_var(char *str, NumericVar * var);
#endif
static NumericDigitBuf *digitbuf_alloc(int size);
-static void digitbuf_free(NumericDigitBuf * buf);
+static void digitbuf_free(NumericDigitBuf *buf);
#define init_var(v) memset(v,0,sizeof(NumericVar))
-static void free_var(NumericVar * var);
+static void free_var(NumericVar *var);
static void free_allvars(void);
-static void set_var_from_str(char *str, NumericVar * dest);
-static void set_var_from_num(Numeric value, NumericVar * dest);
-static void set_var_from_var(NumericVar * value, NumericVar * dest);
-static Numeric make_result(NumericVar * var);
+static void set_var_from_str(char *str, NumericVar *dest);
+static void set_var_from_num(Numeric value, NumericVar *dest);
+static void set_var_from_var(NumericVar *value, NumericVar *dest);
+static Numeric make_result(NumericVar *var);
-static void apply_typmod(NumericVar * var, int32 typmod);
+static void apply_typmod(NumericVar *var, int32 typmod);
-static int cmp_var(NumericVar * var1, NumericVar * var2);
-static void add_var(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void div_var(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void ceil_var(NumericVar * var, NumericVar * result);
-static void floor_var(NumericVar * var, NumericVar * result);
+static int cmp_var(NumericVar *var1, NumericVar *var2);
+static void add_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void div_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void ceil_var(NumericVar *var, NumericVar *result);
+static void floor_var(NumericVar *var, NumericVar *result);
-static void sqrt_var(NumericVar * arg, NumericVar * result);
-static void exp_var(NumericVar * arg, NumericVar * result);
-static void ln_var(NumericVar * arg, NumericVar * result);
-static void log_var(NumericVar * base, NumericVar * num, NumericVar * result);
-static void power_var(NumericVar * base, NumericVar * exp, NumericVar * result);
+static void sqrt_var(NumericVar *arg, NumericVar *result);
+static void exp_var(NumericVar *arg, NumericVar *result);
+static void ln_var(NumericVar *arg, NumericVar *result);
+static void log_var(NumericVar *base, NumericVar *num, NumericVar *result);
+static void power_var(NumericVar *base, NumericVar *exp, NumericVar *result);
-static int cmp_abs(NumericVar * var1, NumericVar * var2);
-static void add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result);
-static void sub_abs(NumericVar * var1, NumericVar * var2, NumericVar * result);
+static int cmp_abs(NumericVar *var1, NumericVar *var2);
+static void add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
@@ -1835,7 +1835,7 @@ dump_numeric(char *str, Numeric num)
* ----------
*/
static void
-dump_var(char *str, NumericVar * var)
+dump_var(char *str, NumericVar *var)
{
int i;
@@ -1962,7 +1962,7 @@ digitbuf_alloc(int size)
* ----------
*/
static void
-digitbuf_free(NumericDigitBuf * buf)
+digitbuf_free(NumericDigitBuf *buf)
{
NumericDigitBuf *smallest;
@@ -2048,7 +2048,7 @@ digitbuf_free(NumericDigitBuf * buf)
* ----------
*/
static void
-free_var(NumericVar * var)
+free_var(NumericVar *var)
{
if (var->buf != NULL)
{
@@ -2096,7 +2096,7 @@ free_allvars(void)
* ----------
*/
static void
-set_var_from_str(char *str, NumericVar * dest)
+set_var_from_str(char *str, NumericVar *dest)
{
char *cp = str;
bool have_dp = FALSE;
@@ -2238,7 +2238,7 @@ set_var_from_str(char *str, NumericVar * dest)
*
*/
static void
-set_var_from_num(Numeric num, NumericVar * dest)
+set_var_from_num(Numeric num, NumericVar *dest)
{
NumericDigit *digit;
int i;
@@ -2275,7 +2275,7 @@ set_var_from_num(Numeric num, NumericVar * dest)
* ----------
*/
static void
-set_var_from_var(NumericVar * value, NumericVar * dest)
+set_var_from_var(NumericVar *value, NumericVar *dest)
{
NumericDigitBuf *newbuf;
NumericDigit *newdigits;
@@ -2299,7 +2299,7 @@ set_var_from_var(NumericVar * value, NumericVar * dest)
* ----------
*/
static Numeric
-make_result(NumericVar * var)
+make_result(NumericVar *var)
{
Numeric result;
NumericDigit *digit = var->digits;
@@ -2368,7 +2368,7 @@ make_result(NumericVar * var)
* ----------
*/
static void
-apply_typmod(NumericVar * var, int32 typmod)
+apply_typmod(NumericVar *var, int32 typmod)
{
int precision;
int scale;
@@ -2439,7 +2439,7 @@ apply_typmod(NumericVar * var, int32 typmod)
* ----------
*/
static int
-cmp_var(NumericVar * var1, NumericVar * var2)
+cmp_var(NumericVar *var1, NumericVar *var2)
{
if (var1->ndigits == 0)
{
@@ -2478,7 +2478,7 @@ cmp_var(NumericVar * var1, NumericVar * var2)
* ----------
*/
static void
-add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
+add_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
/* ----------
* Decide on the signs of the two variables what to do
@@ -2506,10 +2506,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2))
{
case 0: /* ----------
- * ABS(var1) == ABS(var2)
- * result = ZERO
- * ----------
- */
+ * ABS(var1) == ABS(var2)
+ * result = ZERO
+ * ----------
+ */
digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0);
result->ndigits = 0;
@@ -2522,10 +2522,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break;
case 1: /* ----------
- * ABS(var1) > ABS(var2)
- * result = +(ABS(var1) - ABS(var2))
- * ----------
- */
+ * ABS(var1) > ABS(var2)
+ * result = +(ABS(var1) - ABS(var2))
+ * ----------
+ */
sub_abs(var1, var2, result);
result->sign = NUMERIC_POS;
break;
@@ -2553,10 +2553,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2))
{
case 0: /* ----------
- * ABS(var1) == ABS(var2)
- * result = ZERO
- * ----------
- */
+ * ABS(var1) == ABS(var2)
+ * result = ZERO
+ * ----------
+ */
digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0);
result->ndigits = 0;
@@ -2569,10 +2569,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break;
case 1: /* ----------
- * ABS(var1) > ABS(var2)
- * result = -(ABS(var1) - ABS(var2))
- * ----------
- */
+ * ABS(var1) > ABS(var2)
+ * result = -(ABS(var1) - ABS(var2))
+ * ----------
+ */
sub_abs(var1, var2, result);
result->sign = NUMERIC_NEG;
break;
@@ -2609,7 +2609,7 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
+sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
/* ----------
* Decide on the signs of the two variables what to do
@@ -2637,10 +2637,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2))
{
case 0: /* ----------
- * ABS(var1) == ABS(var2)
- * result = ZERO
- * ----------
- */
+ * ABS(var1) == ABS(var2)
+ * result = ZERO
+ * ----------
+ */
digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0);
result->ndigits = 0;
@@ -2653,10 +2653,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break;
case 1: /* ----------
- * ABS(var1) > ABS(var2)
- * result = +(ABS(var1) - ABS(var2))
- * ----------
- */
+ * ABS(var1) > ABS(var2)
+ * result = +(ABS(var1) - ABS(var2))
+ * ----------
+ */
sub_abs(var1, var2, result);
result->sign = NUMERIC_POS;
break;
@@ -2684,10 +2684,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
switch (cmp_abs(var1, var2))
{
case 0: /* ----------
- * ABS(var1) == ABS(var2)
- * result = ZERO
- * ----------
- */
+ * ABS(var1) == ABS(var2)
+ * result = ZERO
+ * ----------
+ */
digitbuf_free(result->buf);
result->buf = digitbuf_alloc(0);
result->ndigits = 0;
@@ -2700,10 +2700,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
break;
case 1: /* ----------
- * ABS(var1) > ABS(var2)
- * result = -(ABS(var1) - ABS(var2))
- * ----------
- */
+ * ABS(var1) > ABS(var2)
+ * result = -(ABS(var1) - ABS(var2))
+ * ----------
+ */
sub_abs(var1, var2, result);
result->sign = NUMERIC_NEG;
break;
@@ -2740,7 +2740,7 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
+mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
NumericDigitBuf *res_buf;
NumericDigit *res_digits;
@@ -2825,7 +2825,7 @@ mul_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-div_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
+div_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
NumericDigit *res_digits;
int res_ndigits;
@@ -3046,7 +3046,7 @@ div_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
+mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
NumericVar tmp;
int save_global_rscale;
@@ -3083,7 +3083,7 @@ mod_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-ceil_var(NumericVar * var, NumericVar * result)
+ceil_var(NumericVar *var, NumericVar *result)
{
NumericVar tmp;
@@ -3108,7 +3108,7 @@ ceil_var(NumericVar * var, NumericVar * result)
* ----------
*/
static void
-floor_var(NumericVar * var, NumericVar * result)
+floor_var(NumericVar *var, NumericVar *result)
{
NumericVar tmp;
@@ -3132,7 +3132,7 @@ floor_var(NumericVar * var, NumericVar * result)
* ----------
*/
static void
-sqrt_var(NumericVar * arg, NumericVar * result)
+sqrt_var(NumericVar *arg, NumericVar *result)
{
NumericVar tmp_arg;
NumericVar tmp_val;
@@ -3210,7 +3210,7 @@ sqrt_var(NumericVar * arg, NumericVar * result)
* ----------
*/
static void
-exp_var(NumericVar * arg, NumericVar * result)
+exp_var(NumericVar *arg, NumericVar *result)
{
NumericVar x;
NumericVar xpow;
@@ -3304,7 +3304,7 @@ exp_var(NumericVar * arg, NumericVar * result)
* ----------
*/
static void
-ln_var(NumericVar * arg, NumericVar * result)
+ln_var(NumericVar *arg, NumericVar *result)
{
NumericVar x;
NumericVar xx;
@@ -3382,7 +3382,7 @@ ln_var(NumericVar * arg, NumericVar * result)
* ----------
*/
static void
-log_var(NumericVar * base, NumericVar * num, NumericVar * result)
+log_var(NumericVar *base, NumericVar *num, NumericVar *result)
{
NumericVar ln_base;
NumericVar ln_num;
@@ -3411,7 +3411,7 @@ log_var(NumericVar * base, NumericVar * num, NumericVar * result)
* ----------
*/
static void
-power_var(NumericVar * base, NumericVar * exp, NumericVar * result)
+power_var(NumericVar *base, NumericVar *exp, NumericVar *result)
{
NumericVar ln_base;
NumericVar ln_num;
@@ -3455,7 +3455,7 @@ power_var(NumericVar * base, NumericVar * exp, NumericVar * result)
* ----------
*/
static int
-cmp_abs(NumericVar * var1, NumericVar * var2)
+cmp_abs(NumericVar *var1, NumericVar *var2)
{
int i1 = 0;
int i2 = 0;
@@ -3513,7 +3513,7 @@ cmp_abs(NumericVar * var1, NumericVar * var2)
* ----------
*/
static void
-add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result)
+add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
NumericDigitBuf *res_buf;
NumericDigit *res_digits;
@@ -3582,7 +3582,7 @@ add_abs(NumericVar * var1, NumericVar * var2, NumericVar * result)
* ----------
*/
static void
-sub_abs(NumericVar * var1, NumericVar * var2, NumericVar * result)
+sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
{
NumericDigitBuf *res_buf;
NumericDigit *res_digits;
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 8687c1346ef..36d6b2e2b99 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.16 1999/05/25 22:04:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.17 1999/05/25 22:42:13 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -67,7 +67,7 @@ typedef struct QryHier
{
struct QryHier *parent;
Query *query;
-} QryHier;
+} QryHier;
/* ----------
@@ -101,16 +101,16 @@ NameData *pg_get_userbyid(int4 uid);
*/
static char *make_ruledef(HeapTuple ruletup, TupleDesc rulettc);
static char *make_viewdef(HeapTuple ruletup, TupleDesc rulettc);
-static char *get_query_def(Query *query, QryHier * parentqh);
-static char *get_select_query_def(Query *query, QryHier * qh);
-static char *get_insert_query_def(Query *query, QryHier * qh);
-static char *get_update_query_def(Query *query, QryHier * qh);
-static char *get_delete_query_def(Query *query, QryHier * qh);
-static char *get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix);
-static char *get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix);
-static char *get_tle_expr(QryHier * qh, int rt_index, TargetEntry *tle, bool varprefix);
+static char *get_query_def(Query *query, QryHier *parentqh);
+static char *get_select_query_def(Query *query, QryHier *qh);
+static char *get_insert_query_def(Query *query, QryHier *qh);
+static char *get_update_query_def(Query *query, QryHier *qh);
+static char *get_delete_query_def(Query *query, QryHier *qh);
+static char *get_rule_expr(QryHier *qh, int rt_index, Node *node, bool varprefix);
+static char *get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix);
+static char *get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix);
static char *get_const_expr(Const *constval);
-static char *get_sublink_expr(QryHier * qh, int rt_index, Node *node, bool varprefix);
+static char *get_sublink_expr(QryHier *qh, int rt_index, Node *node, bool varprefix);
static char *get_relation_name(Oid relid);
static char *get_attribute_name(Oid relid, int2 attnum);
static bool check_if_rte_used(int rt_index, Node *node, int sup);
@@ -806,7 +806,7 @@ make_viewdef(HeapTuple ruletup, TupleDesc rulettc)
* ----------
*/
static char *
-get_query_def(Query *query, QryHier * parentqh)
+get_query_def(Query *query, QryHier *parentqh)
{
QryHier qh;
@@ -850,7 +850,7 @@ get_query_def(Query *query, QryHier * parentqh)
* ----------
*/
static char *
-get_select_query_def(Query *query, QryHier * qh)
+get_select_query_def(Query *query, QryHier *qh)
{
char buf[BUFSIZE];
char *sep;
@@ -1020,7 +1020,7 @@ get_select_query_def(Query *query, QryHier * qh)
* ----------
*/
static char *
-get_insert_query_def(Query *query, QryHier * qh)
+get_insert_query_def(Query *query, QryHier *qh)
{
char buf[BUFSIZE];
char *sep;
@@ -1130,7 +1130,7 @@ get_insert_query_def(Query *query, QryHier * qh)
* ----------
*/
static char *
-get_update_query_def(Query *query, QryHier * qh)
+get_update_query_def(Query *query, QryHier *qh)
{
char buf[BUFSIZE];
char *sep;
@@ -1183,7 +1183,7 @@ get_update_query_def(Query *query, QryHier * qh)
* ----------
*/
static char *
-get_delete_query_def(Query *query, QryHier * qh)
+get_delete_query_def(Query *query, QryHier *qh)
{
char buf[BUFSIZE];
RangeTblEntry *rte;
@@ -1217,7 +1217,7 @@ get_delete_query_def(Query *query, QryHier * qh)
* ----------
*/
static char *
-get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix)
+get_rule_expr(QryHier *qh, int rt_index, Node *node, bool varprefix)
{
char buf[BUFSIZE];
@@ -1417,7 +1417,7 @@ get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix)
* ----------
*/
static char *
-get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix)
+get_func_expr(QryHier *qh, int rt_index, Expr *expr, bool varprefix)
{
char buf[BUFSIZE];
HeapTuple proctup;
@@ -1496,7 +1496,7 @@ get_func_expr(QryHier * qh, int rt_index, Expr *expr, bool varprefix)
* ----------
*/
static char *
-get_tle_expr(QryHier * qh, int rt_index, TargetEntry *tle, bool varprefix)
+get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix)
{
HeapTuple proctup;
Form_pg_proc procStruct;
@@ -1605,7 +1605,7 @@ get_const_expr(Const *constval)
* ----------
*/
static char *
-get_sublink_expr(QryHier * qh, int rt_index, Node *node, bool varprefix)
+get_sublink_expr(QryHier *qh, int rt_index, Node *node, bool varprefix)
{
SubLink *sublink = (SubLink *) node;
Query *query = (Query *) (sublink->subselect);
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 6eb0ed3527d..390a6d2f26f 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.25 1999/05/25 16:12:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.26 1999/05/25 22:42:15 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
@@ -205,7 +205,7 @@ static struct cachedesc cacheinfo[] = {
0,
0
},
- offsetof(FormData_pg_type, typalign) + sizeof(char),
+ offsetof(FormData_pg_type, typalign) +sizeof(char),
TypeNameIndex,
TypeNameIndexScan},
{TypeRelationName, /* TYPOID */
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 9e9faaf8ab2..70d23b6c29c 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.3 1999/05/25 16:12:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.4 1999/05/25 22:42:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ typedef struct TempTable
{
char *user_relname;
HeapTuple pg_class_tuple;
-} TempTable;
+} TempTable;
void
diff --git a/src/backend/utils/mb/big5.c b/src/backend/utils/mb/big5.c
index 5950c5a5f04..4d89dfb6e15 100644
--- a/src/backend/utils/mb/big5.c
+++ b/src/backend/utils/mb/big5.c
@@ -7,7 +7,7 @@
*
* 1999/1/15 Tatsuo Ishii
*
- * $Id: big5.c,v 1.3 1999/05/25 22:04:45 momjian Exp $
+ * $Id: big5.c,v 1.4 1999/05/25 22:42:19 momjian Exp $
*/
#include "mb/pg_wchar.h"
@@ -218,7 +218,7 @@ static unsigned short BinarySearchRange
{
if (0 == array[mid].peer)
return 0;
- if (code >= (unsigned)0xa140)
+ if (code >= (unsigned) 0xa140)
{
/* big5 to cns */
tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8;
@@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
unsigned short cns = 0;
int i;
- if (big5 < (unsigned)0xc940)
+ if (big5 < (unsigned) 0xc940)
{
/* level 1 */
@@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
if (b1c4[i][0] == big5)
{
*lc = LC_CNS11643_4;
- return (b1c4[i][1] | (unsigned)0x8080);
+ return (b1c4[i][1] | (unsigned) 0x8080);
}
}
if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5)))
*lc = LC_CNS11643_1;
}
- else if (big5 == (unsigned)0xc94a)
+ else if (big5 == (unsigned) 0xc94a)
{
/* level 2 */
*lc = LC_CNS11643_1;
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index b4fb5ed7029..7963b86658b 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -2,7 +2,7 @@
* conversion between client encoding and server internal encoding
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
- * $Id: conv.c,v 1.9 1999/05/25 22:04:47 momjian Exp $
+ * $Id: conv.c,v 1.10 1999/05/25 22:42:20 momjian Exp $
*/
#include <stdio.h>
#include <string.h>
@@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
while (len > 0 && (c1 = *big5++))
{
- if (c1 <= (unsigned)0x7f)
+ if (c1 <= (unsigned) 0x7f)
{ /* ASCII */
len--;
*p++ = c1;
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 497dceff07e..d26785a9405 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: psort.c,v 1.52 1999/05/25 16:12:59 momjian Exp $
+ * $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -55,9 +55,9 @@
#include "utils/rel.h"
static bool createfirstrun(Sort *node);
-static bool createrun(Sort *node, BufFile * file);
-static void destroytape(BufFile * file);
-static void dumptuples(BufFile * file, Sort *node);
+static bool createrun(Sort *node, BufFile *file);
+static void destroytape(BufFile *file);
+static void dumptuples(BufFile *file, Sort *node);
static BufFile *gettape(void);
static void initialrun(Sort *node);
static void inittapes(Sort *node);
@@ -473,7 +473,7 @@ createfirstrun(Sort *node)
* Tuples contains the tuples for the following run upon exit
*/
static bool
-createrun(Sort *node, BufFile * file)
+createrun(Sort *node, BufFile *file)
{
HeapTuple lasttuple;
HeapTuple tup;
@@ -720,7 +720,7 @@ merge(Sort *node, struct tape * dest)
* dumptuples - stores all the tuples in tree into file
*/
static void
-dumptuples(BufFile * file, Sort *node)
+dumptuples(BufFile *file, Sort *node)
{
struct leftist *tp;
struct leftist *newp;
@@ -996,7 +996,7 @@ gettape()
* destroytape - unlinks the tape
*/
static void
-destroytape(BufFile * file)
+destroytape(BufFile *file)
{
BufFileClose(file);
}
diff --git a/src/bin/pgtclsh/pgtclAppInit.c b/src/bin/pgtclsh/pgtclAppInit.c
index 1b8e3c12741..baebf4ce526 100644
--- a/src/bin/pgtclsh/pgtclAppInit.c
+++ b/src/bin/pgtclsh/pgtclAppInit.c
@@ -73,7 +73,7 @@ main(int argc, char **argv)
*/
int
-Tcl_AppInit(Tcl_Interp * interp)
+Tcl_AppInit(Tcl_Interp *interp)
{
if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR;
diff --git a/src/bin/pgtclsh/pgtkAppInit.c b/src/bin/pgtclsh/pgtkAppInit.c
index 27e177b77f7..2c70b741cd6 100644
--- a/src/bin/pgtclsh/pgtkAppInit.c
+++ b/src/bin/pgtclsh/pgtkAppInit.c
@@ -72,7 +72,7 @@ main(int argc, char **argv)
*/
int
-Tcl_AppInit(Tcl_Interp * interp)
+Tcl_AppInit(Tcl_Interp *interp)
{
if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR;
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 6250ead85a2..685acee3f59 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.23 1999/05/25 16:13:27 momjian Exp $
+ * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -265,7 +265,7 @@ extern void hashdelete(Relation rel, ItemPointer tid);
/* hashfunc.c */
extern uint32 hashint2(int16 key);
extern uint32 hashint4(uint32 key);
-extern uint32 hashint8(int64 * key);
+extern uint32 hashint8(int64 *key);
extern uint32 hashfloat4(float32 keyp);
extern uint32 hashfloat8(float64 keyp);
extern uint32 hashoid(Oid key);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 4586f6118a4..996d2c158c6 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.15 1999/05/25 16:13:31 momjian Exp $
+ * $Id: htup.h,v 1.16 1999/05/25 22:42:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ typedef struct HeapTupleHeaderData
/* bit map of domains */
/* MORE DATA FOLLOWS AT END OF STRUCT */
-} HeapTupleHeaderData;
+} HeapTupleHeaderData;
typedef HeapTupleHeaderData *HeapTupleHeader;
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 6b5a538b5e6..0fce96e73a2 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: printtup.h,v 1.9 1999/05/25 16:13:33 momjian Exp $
+ * $Id: printtup.h,v 1.10 1999/05/25 22:42:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,13 +18,13 @@
extern DestReceiver *printtup_create_DR(void);
extern void showatts(char *name, TupleDesc attinfo);
extern void debugtup(HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver * self);
+ DestReceiver *self);
extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver * self);
+ DestReceiver *self);
/* XXX this one is really in executor/spi.c */
extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc,
- DestReceiver * self);
+ DestReceiver *self);
extern int getTypeOutAndElem(Oid type, Oid *typOutput, Oid *typElem);
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 94069535c32..b1e58f08dbe 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.14 1999/05/25 22:04:56 momjian Exp $
+ * $Id: strat.h,v 1.15 1999/05/25 22:42:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,6 +33,7 @@ typedef struct StrategyTransformMapData
*
*
*
+ *
* STRUCTURE */
typedef StrategyTransformMapData *StrategyTransformMap;
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 221a7456f92..23fc2b59f0b 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.20 1999/05/25 16:13:35 momjian Exp $
+ * $Id: transam.h,v 1.21 1999/05/25 22:42:35 momjian Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -128,7 +128,7 @@ typedef struct VariableCacheData
TransactionId nextXid;
uint32 oid_count; /* not implemented, yet */
Oid nextOid;
-} VariableCacheData;
+} VariableCacheData;
typedef VariableCacheData *VariableCache;
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 450529560a8..f338723d5f1 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.21 1999/02/13 23:20:59 momjian Exp $
+ * $Id: tupdesc.h,v 1.22 1999/05/25 22:42:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ typedef struct tupleDesc
extern TupleDesc CreateTemplateTupleDesc(int natts);
-extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute * attrs);
+extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs);
extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
diff --git a/src/include/commands/command.h b/src/include/commands/command.h
index 68bdd93e15a..207ee4da429 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.13 1999/05/25 16:13:49 momjian Exp $
+ * $Id: command.h,v 1.14 1999/05/25 22:42:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,6 +44,6 @@ extern void PortalCleanup(Portal portal);
extern void PerformAddAttribute(char *relationName, char *userName,
bool inh, ColumnDef *colDef);
-extern void LockTableCommand(LockStmt * lockstmt);
+extern void LockTableCommand(LockStmt *lockstmt);
#endif /* COMMAND_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 8efe1ba3864..f9461885670 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.19 1999/05/25 16:13:50 momjian Exp $
+ * $Id: vacuum.h,v 1.20 1999/05/25 22:42:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -99,7 +99,7 @@ typedef struct VTupleLinkData
{
ItemPointerData new_tid;
ItemPointerData this_tid;
-} VTupleLinkData;
+} VTupleLinkData;
typedef VTupleLinkData *VTupleLink;
@@ -108,7 +108,7 @@ typedef struct VTupleMoveData
ItemPointerData tid; /* tuple ID */
VPageDescr vpd; /* where to move */
bool cleanVpd; /* clean vpd before using */
-} VTupleMoveData;
+} VTupleMoveData;
typedef VTupleMoveData *VTupleMove;
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 493210ba012..e98c99d99fb 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.12 1999/05/25 16:13:54 momjian Exp $
+ * $Id: hashjoin.h,v 1.13 1999/05/25 22:42:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,7 +44,7 @@ typedef struct HashJoinTupleData
struct HashJoinTupleData *next; /* link to next tuple in same
* bucket */
HeapTupleData htup; /* tuple header */
-} HashJoinTupleData;
+} HashJoinTupleData;
typedef HashJoinTupleData *HashJoinTuple;
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index a6fff84b682..336e9b4d1f6 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeHashjoin.h,v 1.13 1999/05/25 16:13:56 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.14 1999/05/25 22:42:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node);
extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
extern int ExecCountSlotsHashJoin(HashJoin *node);
extern void ExecEndHashJoin(HashJoin *node);
-extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile * file);
+extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file);
extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent);
#endif /* NODEHASHJOIN_H */
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index cd9f1ccde62..e8fb31b10ff 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.29 1999/05/25 16:14:00 momjian Exp $
+ * $Id: libpq.h,v 1.30 1999/05/25 22:42:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -220,7 +220,7 @@ extern PortalEntry *be_newportal(void);
extern void be_typeinit(PortalEntry *entry, TupleDesc attrs,
int natts);
extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver * self);
+ DestReceiver *self);
/* in be-pqexec.c */
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 12024b720f4..1b37c064a4f 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -8,7 +8,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.35 1999/05/03 19:10:24 momjian Exp $
+ * $Id: pqcomm.h,v 1.36 1999/05/25 22:42:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -156,6 +156,6 @@ typedef struct CancelRequestPacket
* request */
uint32 backendPID; /* PID of client's backend */
uint32 cancelAuthCode; /* secret key to authorize cancel */
-} CancelRequestPacket;
+} CancelRequestPacket;
#endif /* PQCOMM_H */
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 134fa3e833f..21114d2455d 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.29 1999/05/25 16:14:07 momjian Exp $
+ * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -698,7 +698,7 @@ typedef struct TeeState
MemoryContext tee_mcxt;
HeapScanDesc tee_leftScanDesc,
tee_rightScanDesc;
-} TeeState;
+} TeeState;
#endif
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index 7259cb1b0f7..76f99204c20 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.12 1999/05/25 16:14:09 momjian Exp $
+ * $Id: memnodes.h,v 1.13 1999/05/25 22:42:55 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.
@@ -60,7 +60,7 @@ typedef struct MemoryContextData
{
NodeTag type;
MemoryContextMethods method;
-} MemoryContextData;
+} MemoryContextData;
/* utils/mcxt.h contains typedef struct MemoryContextData *MemoryContext */
@@ -73,7 +73,7 @@ typedef struct GlobalMemoryData
AllocSetData setData;
char *name;
OrderedElemData elemData;
-} GlobalMemoryData;
+} GlobalMemoryData;
/* utils/mcxt.h contains typedef struct GlobalMemoryData *GlobalMemory */
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 441ffd9b01c..c427e2a8a71 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.73 1999/05/25 16:14:09 momjian Exp $
+ * $Id: parsenodes.h,v 1.74 1999/05/25 22:42:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -457,7 +457,7 @@ typedef struct UnlistenStmt
{
NodeTag type;
char *relname; /* relation to unlisten on */
-} UnlistenStmt;
+} UnlistenStmt;
/* ----------------------
* {Begin|Abort|End} Transaction Statement
@@ -590,7 +590,7 @@ typedef struct LockStmt
NodeTag type;
char *relname; /* relation to lock */
int mode; /* lock mode */
-} LockStmt;
+} LockStmt;
/*****************************************************************************
* Optimizable Statements
@@ -748,7 +748,7 @@ typedef struct CaseExpr
Node *arg; /* implicit equality comparison argument */
List *args; /* the arguments (list of WHEN clauses) */
Node *defresult; /* the default result (ELSE clause) */
-} CaseExpr;
+} CaseExpr;
/*
* CaseWhen - an argument to a CASE expression
@@ -758,7 +758,7 @@ typedef struct CaseWhen
NodeTag type;
Node *expr; /* comparison expression */
Node *result; /* substitution result */
-} CaseWhen;
+} CaseWhen;
/*
* ColumnDef - column definition (used in various creates)
@@ -896,7 +896,7 @@ typedef struct JoinExpr
RangeVar *larg;
Node *rarg;
List *quals;
-} JoinExpr;
+} JoinExpr;
/****************************************************************************
@@ -972,6 +972,6 @@ typedef struct RowMark
NodeTag type;
Index rti; /* index in Query->rtable */
bits8 info; /* as above */
-} RowMark;
+} RowMark;
#endif /* PARSENODES_H */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index ffa45b0bfe9..5c94d02932b 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.26 1999/05/25 16:14:10 momjian Exp $
+ * $Id: plannodes.h,v 1.27 1999/05/25 22:42:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -264,7 +264,7 @@ typedef struct Noname
Plan plan;
Oid nonameid;
int keycount;
-} Noname;
+} Noname;
/* ----------------
* materialization node
@@ -338,7 +338,7 @@ typedef struct Tee
List *rtentries; /* the range table for the plan below the
* Tee may be different than the parent
* plans */
-} Tee;
+} Tee;
#endif
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 8028e07a94c..3b0cadfcdcd 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.28 1999/05/25 16:14:11 momjian Exp $
+ * $Id: primnodes.h,v 1.29 1999/05/25 22:42:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -273,7 +273,7 @@ typedef struct Aggref
Node *target;
int aggno;
bool usenulls;
-} Aggref;
+} Aggref;
/* ----------------
* SubLink
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 4f45a6cafcc..5f629dd0e63 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.31 1999/05/25 16:14:12 momjian Exp $
+ * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -100,7 +100,7 @@ typedef struct RelOptInfo
List *restrictinfo; /* RestrictInfo structures */
List *joininfo; /* JoinInfo structures */
List *innerjoin;
-} RelOptInfo;
+} RelOptInfo;
extern Var *get_expr(TargetEntry *foo);
extern Var *get_groupclause_expr(GroupClause *groupClause, List *targetList);
@@ -167,7 +167,7 @@ typedef struct NestPath
List *pathinfo;
Path *outerjoinpath;
Path *innerjoinpath;
-} NestPath;
+} NestPath;
typedef NestPath JoinPath;
@@ -223,7 +223,7 @@ typedef struct RestrictInfo
/* hashjoin only */
Oid hashjoinoperator;
Relids restrictinfojoinid;
-} RestrictInfo;
+} RestrictInfo;
typedef struct JoinMethod
{
@@ -236,13 +236,13 @@ typedef struct HashInfo
{
JoinMethod jmethod;
Oid hashop;
-} HashInfo;
+} HashInfo;
typedef struct MergeInfo
{
JoinMethod jmethod;
MergeOrder *m_ordering;
-} MergeInfo;
+} MergeInfo;
typedef struct JoinInfo
{
@@ -251,7 +251,7 @@ typedef struct JoinInfo
List *jinfo_restrictinfo;
bool mergejoinable;
bool hashjoinable;
-} JoinInfo;
+} JoinInfo;
typedef struct Iter
{
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 5766e8933e0..78605c20c96 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.17 1999/05/25 16:14:15 momjian Exp $
+ * $Id: clauses.h,v 1.18 1999/05/25 22:43:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ extern Expr *make_andclause(List *andclauses);
extern bool case_clause(Node *clause);
extern List *pull_constant_clauses(List *quals, List **constantQual);
-extern void clause_get_relids_vars(Node *clause, Relids * relids, List **vars);
+extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars);
extern int NumRelids(Node *clause);
extern bool contains_not(Node *clause);
extern bool is_joinable(Node *clause);
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 5146900e4d7..e7f8452f246 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.19 1999/05/25 16:14:16 momjian Exp $
+ * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,8 +43,8 @@ extern Cost cost_mergejoin(Cost outercost, Cost innercost,
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(RelOptInfo * rel);
-extern int compute_rel_width(RelOptInfo * rel);
+extern int compute_rel_size(RelOptInfo *rel);
+extern int compute_rel_width(RelOptInfo *rel);
extern int compute_joinrel_size(JoinPath *joinpath);
extern int page_size(int tuples, int width);
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index c2eba475035..f02510e21e9 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.15 1999/05/25 16:14:16 momjian Exp $
+ * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -72,6 +72,6 @@ extern void geqo_params(int string_length);
extern void geqo_eval_startup(void);
extern Cost geqo_eval(Query *root, Gene *tour, int num_gene);
extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count,
- int num_gene, RelOptInfo * old_rel);
+ int num_gene, RelOptInfo *old_rel);
#endif /* GEQO_H */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 1e610ba8d08..9fadc318d44 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.10 1999/05/25 16:14:17 momjian Exp $
+ * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@ 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, RelOptInfo * rel);
+extern void geqo_print_rel(Query *root, RelOptInfo *rel);
extern void geqo_print_path(Query *root, Path *path, int indent);
extern void geqo_print_joinclauses(Query *root, List *clauses);
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 2b4e214e24e..3a4451dd356 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: joininfo.h,v 1.11 1999/05/25 16:14:19 momjian Exp $
+ * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "nodes/primnodes.h"
extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
-extern JoinInfo *find_joininfo_node(RelOptInfo * this_rel, List *join_relids);
+extern JoinInfo *find_joininfo_node(RelOptInfo *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 cccdb7bfbbb..423b8e42161 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: keys.h,v 1.14 1999/05/25 16:14:19 momjian Exp $
+ * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@
#include "nodes/nodes.h"
#include "nodes/relation.h"
-extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel);
+extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel);
extern Var *extract_join_key(JoinKey *jk, int outer_or_inner);
extern bool pathkeys_match(List *keys1, List *keys2, int *better_key);
extern List *collect_index_pathkeys(int *index_keys, List *tlist);
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 2a864d591a5..d7019fc4461 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.16 1999/05/25 16:14:20 momjian Exp $
+ * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,20 +21,20 @@
* prototypes for pathnode.c
*/
extern bool path_is_cheaper(Path *path1, Path *path2);
-extern Path *set_cheapest(RelOptInfo * parent_rel, List *pathlist);
-extern List *add_pathlist(RelOptInfo * parent_rel, List *unique_paths,
+extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist);
+extern List *add_pathlist(RelOptInfo *parent_rel, List *unique_paths,
List *new_paths);
-extern Path *create_seqscan_path(RelOptInfo * rel);
-extern IndexPath *create_index_path(Query *root, RelOptInfo * rel, RelOptInfo * index,
+extern Path *create_seqscan_path(RelOptInfo *rel);
+extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index,
List *restriction_clauses, bool is_join_scan);
-extern NestPath *create_nestloop_path(RelOptInfo * joinrel, RelOptInfo * outer_rel,
+extern NestPath *create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel,
Path *outer_path, Path *inner_path, List *pathkeys);
-extern MergePath *create_mergejoin_path(RelOptInfo * joinrel, int outersize,
+extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *pathkeys, MergeOrder *order,
List *mergeclauses, List *outersortkeys, List *innersortkeys);
-extern HashPath *create_hashjoin_path(RelOptInfo * joinrel, int outersize,
+extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *pathkeys, Oid operator, List *hashclauses,
List *outerkeys, List *innerkeys);
@@ -49,6 +49,6 @@ extern RelOptInfo *get_join_rel(Query *root, Relids relid);
/*
* prototypes for indexnode.h
*/
-extern List *find_relation_indices(Query *root, RelOptInfo * rel);
+extern List *find_relation_indices(Query *root, RelOptInfo *rel);
#endif /* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 1a92130e860..203a988327e 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.28 1999/05/25 16:14:21 momjian Exp $
+ * $Id: paths.h,v 1.29 1999/05/25 22:43:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@ extern RelOptInfo *make_one_rel(Query *root, List *rels);
* indxpath.h
* routines to generate index paths
*/
-extern List *create_index_paths(Query *root, RelOptInfo * rel, List *indices,
+extern List *create_index_paths(Query *root, RelOptInfo *rel, List *indices,
List *restrictinfo_list,
List *joininfo_list);
@@ -41,7 +41,7 @@ extern void update_rels_pathlist_for_joins(Query *root, List *joinrels);
/*
* orindxpath.h
*/
-extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses);
+extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses);
/*
* hashutils.h
@@ -79,11 +79,11 @@ extern MergeInfo *match_order_mergeinfo(PathOrder *ordering,
* routines to determine which relations to join
*/
extern List *make_rels_by_joins(Query *root, List *old_rels);
-extern List *make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel,
+extern List *make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
List *joininfo_list, Relids only_relids);
-extern List *make_rels_by_clauseless_joins(RelOptInfo * old_rel,
+extern List *make_rels_by_clauseless_joins(RelOptInfo *old_rel,
List *inner_rels);
-extern RelOptInfo *make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo);
+extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo);
extern List *new_join_tlist(List *tlist, int first_resdomno);
extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list);
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index 9b1346c31d0..0d1e741bc21 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: restrictinfo.h,v 1.3 1999/05/25 16:14:22 momjian Exp $
+ * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@
#include "nodes/pg_list.h"
#include "nodes/relation.h"
-extern bool valid_or_clause(RestrictInfo * restrictinfo);
+extern bool valid_or_clause(RestrictInfo *restrictinfo);
extern List *get_actual_clauses(List *restrictinfo_list);
extern void get_relattvals(List *restrictinfo_list, List **attnos,
List **values, List **flags);
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index b4d3d212562..de57eb59ddb 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tlist.h,v 1.17 1999/05/25 16:14:23 momjian Exp $
+ * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
extern Expr *matching_tlist_var(Var *var, List *targetlist);
-extern void add_var_to_tlist(RelOptInfo * rel, Var *var);
+extern void add_var_to_tlist(RelOptInfo *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);
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index 7c5082746c6..41414dba4df 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.17 1999/05/25 16:14:23 momjian Exp $
+ * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,10 +49,10 @@ 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(RelOptInfo * rel);
+extern void xfunc_trypullup(RelOptInfo *rel);
extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
- int whichchild, RestrictInfo * maxcinfopt);
-extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo * cinfo,
+ int whichchild, RestrictInfo *maxcinfopt);
+extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo *cinfo,
int whichchild, int clausetype);
extern Cost xfunc_rank(Expr *clause);
extern Cost xfunc_expense(Query *queryInfo, Expr *clause);
@@ -69,7 +69,7 @@ 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, RelOptInfo * rel, int varno);
+extern void xfunc_fixvars(Expr *clause, RelOptInfo *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);
@@ -78,7 +78,7 @@ 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(RelOptInfo * from, RelOptInfo ** to);
+extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to);
/*
* function prototypes for path/predmig.c
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 125b1109772..0801592882b 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_agg.h,v 1.9 1999/05/25 16:14:26 momjian Exp $
+ * $Id: parse_agg.h,v 1.10 1999/05/25 22:43:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include <nodes/primnodes.h>
#include <parser/parse_node.h>
-extern void AddAggToParseState(ParseState *pstate, Aggref * aggref);
+extern void AddAggToParseState(ParseState *pstate, Aggref *aggref);
extern void parseCheckAggregates(ParseState *pstate, Query *qry);
extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
List *target, int precedence);
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 2a664ed8c12..6b634f13d9a 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_coerce.h,v 1.11 1999/05/25 16:14:26 momjian Exp $
+ * $Id: parse_coerce.h,v 1.12 1999/05/25 22:43:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@ typedef enum CATEGORY
NETWORK_TYPE,
USER_TYPE,
MIXED_TYPE
-} CATEGORY;
+} CATEGORY;
/* IS_BUILTIN_TYPE()
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 0493b3ccc7b..94db91af02b 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fd.h,v 1.14 1999/05/25 16:14:41 momjian Exp $
+ * $Id: fd.h,v 1.15 1999/05/25 22:43:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,11 +91,11 @@ extern void FreeFile(FILE *);
* atop virtual Files...
*/
extern BufFile *BufFileCreate(File file);
-extern void BufFileClose(BufFile * file);
-extern size_t BufFileRead(BufFile * file, void *ptr, size_t size);
-extern size_t BufFileWrite(BufFile * file, void *ptr, size_t size);
-extern int BufFileFlush(BufFile * file);
-extern long BufFileSeek(BufFile * file, long offset, int whence);
+extern void BufFileClose(BufFile *file);
+extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
+extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
+extern int BufFileFlush(BufFile *file);
+extern long BufFileSeek(BufFile *file, long offset, int whence);
/* Miscellaneous support routines */
extern int FileNameUnlink(char *filename);
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 3af0071d468..6027785fabf 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.19 1999/05/07 01:23:05 vadim Exp $
+ * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ typedef struct LockRelId
{
Oid relId; /* a relation identifier */
Oid dbId; /* a database identifier */
-} LockRelId;
+} LockRelId;
typedef struct LockInfoData
{
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 744ff537c0a..20fbdff9090 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.27 1999/05/25 16:14:42 momjian Exp $
+ * $Id: lock.h,v 1.28 1999/05/25 22:43:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -100,7 +100,7 @@ typedef struct LOCKMETHODCTL
int conflictTab[MAX_LOCKMODES];
int prio[MAX_LOCKMODES];
SPINLOCK masterLock;
-} LOCKMETHODCTL;
+} LOCKMETHODCTL;
/*
* lockHash -- hash table on lock Ids,
@@ -113,7 +113,7 @@ typedef struct LOCKMETHODTABLE
HTAB *lockHash;
HTAB *xidHash;
LOCKMETHODCTL *ctl;
-} LOCKMETHODTABLE;
+} LOCKMETHODTABLE;
/* -----------------------
* A transaction never conflicts with its own locks. Hence, if
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 0caef8fa90c..f62106e1ce2 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.23 1999/05/25 16:14:45 momjian Exp $
+ * $Id: proc.h,v 1.24 1999/05/25 22:43:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -119,7 +119,7 @@ extern bool ProcRemove(int pid);
/* make static in storage/lmgr/proc.c -- jolly */
extern void ProcQueueInit(PROC_QUEUE *queue);
-extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL * lockctl, int token,
+extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL *lockctl, int token,
LOCK *lock);
extern PROC *ProcWakeup(PROC *proc, int errType);
extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod,
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index e39e3e3bd7b..66365b4a9a7 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.17 1999/05/25 16:14:45 momjian Exp $
+ * $Id: shmem.h,v 1.18 1999/05/25 22:43:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -90,7 +90,7 @@ typedef struct
char key[SHMEM_INDEX_KEYSIZE]; /* string name */
unsigned long location; /* location in shared mem */
unsigned long size; /* numbytes allocated for the structure */
-} ShmemIndexEnt;
+} ShmemIndexEnt;
/*
* prototypes for functions in shmqueue.c
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index dd5e447bccb..f46f9b32484 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -44,7 +44,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dest.h,v 1.19 1999/05/25 16:14:47 momjian Exp $
+ * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -82,10 +82,10 @@ struct _DestReceiver
{
/* Called for each tuple to be output: */
void (*receiveTuple) (HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver * self);
+ DestReceiver *self);
/* Initialization and teardown: */
- void (*setup) (DestReceiver * self, TupleDesc typeinfo);
- void (*cleanup) (DestReceiver * self);
+ void (*setup) (DestReceiver *self, TupleDesc typeinfo);
+ void (*cleanup) (DestReceiver *self);
/* Private fields might appear beyond this point... */
};
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 0fe0487b474..1d434bf3f28 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.79 1999/05/25 16:14:52 momjian Exp $
+ * $Id: builtins.h,v 1.80 1999/05/25 22:43:31 momjian Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@@ -164,7 +164,7 @@ extern void ltoa(int32 l, char *a);
*/
extern int32 btint2cmp(int16 a, int16 b);
extern int32 btint4cmp(int32 a, int32 b);
-extern int32 btint8cmp(int64 * a, int64 * b);
+extern int32 btint8cmp(int64 *a, int64 *b);
extern int32 btint24cmp(int16 a, int32 b);
extern int32 btint42cmp(int32 a, int16 b);
extern int32 btfloat4cmp(float32 a, float32 b);
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index 252d1dd1053..9d0c69b0f9b 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: inet.h,v 1.4 1999/05/25 16:14:54 momjian Exp $
+ * $Id: inet.h,v 1.5 1999/05/25 22:43:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@ typedef struct
unsigned int ipv4_addr; /* network byte order */
/* add IPV6 address type here */
} addr;
-} inet_struct;
+} inet_struct;
typedef struct varlena inet;
@@ -51,7 +51,7 @@ typedef struct manufacturer
unsigned char b;
unsigned char c;
char *name;
-} manufacturer;
+} manufacturer;
extern manufacturer manufacturers[];
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index 6a1f134bbf6..3412cabd2e7 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: int8.h,v 1.13 1999/05/25 16:14:55 momjian Exp $
+ * $Id: int8.h,v 1.14 1999/05/25 22:43:35 momjian Exp $
*
* NOTES
* These data types are supported on all 64-bit architectures, and may
@@ -47,60 +47,60 @@ typedef long int int64;
extern int64 *int8in(char *str);
-extern char *int8out(int64 * val);
-
-extern bool int8eq(int64 * val1, int64 * val2);
-extern bool int8ne(int64 * val1, int64 * val2);
-extern bool int8lt(int64 * val1, int64 * val2);
-extern bool int8gt(int64 * val1, int64 * val2);
-extern bool int8le(int64 * val1, int64 * val2);
-extern bool int8ge(int64 * val1, int64 * val2);
-
-extern bool int84eq(int64 * val1, int32 val2);
-extern bool int84ne(int64 * val1, int32 val2);
-extern bool int84lt(int64 * val1, int32 val2);
-extern bool int84gt(int64 * val1, int32 val2);
-extern bool int84le(int64 * val1, int32 val2);
-extern bool int84ge(int64 * val1, int32 val2);
-
-extern bool int48eq(int32 val1, int64 * val2);
-extern bool int48ne(int32 val1, int64 * val2);
-extern bool int48lt(int32 val1, int64 * val2);
-extern bool int48gt(int32 val1, int64 * val2);
-extern bool int48le(int32 val1, int64 * val2);
-extern bool int48ge(int32 val1, int64 * val2);
-
-extern int64 *int8um(int64 * val);
-extern int64 *int8pl(int64 * val1, int64 * val2);
-extern int64 *int8mi(int64 * val1, int64 * val2);
-extern int64 *int8mul(int64 * val1, int64 * val2);
-extern int64 *int8div(int64 * val1, int64 * val2);
-extern int64 *int8larger(int64 * val1, int64 * val2);
-extern int64 *int8smaller(int64 * val1, int64 * val2);
-
-extern int64 *int84pl(int64 * val1, int32 val2);
-extern int64 *int84mi(int64 * val1, int32 val2);
-extern int64 *int84mul(int64 * val1, int32 val2);
-extern int64 *int84div(int64 * val1, int32 val2);
-
-extern int64 *int48pl(int32 val1, int64 * val2);
-extern int64 *int48mi(int32 val1, int64 * val2);
-extern int64 *int48mul(int32 val1, int64 * val2);
-extern int64 *int48div(int32 val1, int64 * val2);
+extern char *int8out(int64 *val);
+
+extern bool int8eq(int64 *val1, int64 *val2);
+extern bool int8ne(int64 *val1, int64 *val2);
+extern bool int8lt(int64 *val1, int64 *val2);
+extern bool int8gt(int64 *val1, int64 *val2);
+extern bool int8le(int64 *val1, int64 *val2);
+extern bool int8ge(int64 *val1, int64 *val2);
+
+extern bool int84eq(int64 *val1, int32 val2);
+extern bool int84ne(int64 *val1, int32 val2);
+extern bool int84lt(int64 *val1, int32 val2);
+extern bool int84gt(int64 *val1, int32 val2);
+extern bool int84le(int64 *val1, int32 val2);
+extern bool int84ge(int64 *val1, int32 val2);
+
+extern bool int48eq(int32 val1, int64 *val2);
+extern bool int48ne(int32 val1, int64 *val2);
+extern bool int48lt(int32 val1, int64 *val2);
+extern bool int48gt(int32 val1, int64 *val2);
+extern bool int48le(int32 val1, int64 *val2);
+extern bool int48ge(int32 val1, int64 *val2);
+
+extern int64 *int8um(int64 *val);
+extern int64 *int8pl(int64 *val1, int64 *val2);
+extern int64 *int8mi(int64 *val1, int64 *val2);
+extern int64 *int8mul(int64 *val1, int64 *val2);
+extern int64 *int8div(int64 *val1, int64 *val2);
+extern int64 *int8larger(int64 *val1, int64 *val2);
+extern int64 *int8smaller(int64 *val1, int64 *val2);
+
+extern int64 *int84pl(int64 *val1, int32 val2);
+extern int64 *int84mi(int64 *val1, int32 val2);
+extern int64 *int84mul(int64 *val1, int32 val2);
+extern int64 *int84div(int64 *val1, int32 val2);
+
+extern int64 *int48pl(int32 val1, int64 *val2);
+extern int64 *int48mi(int32 val1, int64 *val2);
+extern int64 *int48mul(int32 val1, int64 *val2);
+extern int64 *int48div(int32 val1, int64 *val2);
extern int64 *int48(int32 val);
-extern int32 int84(int64 * val);
+extern int32 int84(int64 *val);
#if NOT_USED
extern int64 *int28 (int16 val);
-extern int16 int82(int64 * val);
+extern int16 int82(int64 *val);
#endif
-extern float64 i8tod(int64 * val);
+extern float64 i8tod(int64 *val);
extern int64 *dtoi8(float64 val);
-extern text *int8_text(int64 * val);
+extern text *int8_text(int64 *val);
extern int64 *text_int8(text *str);
#endif /* INT8_H */
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 59f473b910a..26483f06fc8 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: memutils.h,v 1.25 1999/05/25 16:14:56 momjian Exp $
+ * $Id: memutils.h,v 1.26 1999/05/25 22:43:36 momjian Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -168,7 +168,7 @@ typedef struct AllocBlockData
struct AllocBlockData *next;
char *freeptr;
char *endptr;
-} AllocBlockData;
+} AllocBlockData;
typedef AllocBlockData *AllocBlock;
@@ -182,7 +182,7 @@ typedef struct AllocChunkData
void *aset;
/* size is always the chunk size */
Size size;
-} AllocChunkData;
+} AllocChunkData;
typedef AllocChunkData *AllocChunk;
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 888677f71ac..2cbf5f0c723 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
*
* 1998 Jan Wieck
*
- * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.5 1999/05/25 16:14:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6 1999/05/25 22:43:37 momjian Exp $
*
* ----------
*/
@@ -58,7 +58,7 @@ typedef struct NumericData
uint16 n_rscale; /* Result scale */
uint16 n_sign_dscale; /* Sign + display scale */
unsigned char n_data[1]; /* Digit data */
-} NumericData;
+} NumericData;
typedef NumericData *Numeric;
#define NUMERIC_HDRSZ (sizeof(int32) + sizeof(uint16) * 3)
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 1cc67f0ea5b..1bec1aff7b4 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tqual.h,v 1.21 1999/05/25 16:14:58 momjian Exp $
+ * $Id: tqual.h,v 1.22 1999/05/25 22:43:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@ typedef struct SnapshotData
uint32 xcnt; /* # of xact below */
TransactionId *xip; /* array of xacts in progress */
ItemPointerData tid; /* required for Dirty snapshot -:( */
-} SnapshotData;
+} SnapshotData;
typedef SnapshotData *Snapshot;
diff --git a/src/interfaces/libpgtcl/libpgtcl.h b/src/interfaces/libpgtcl/libpgtcl.h
index 46fe501c9f2..b85b4e116fd 100644
--- a/src/interfaces/libpgtcl/libpgtcl.h
+++ b/src/interfaces/libpgtcl/libpgtcl.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpgtcl.h,v 1.7 1999/02/13 23:22:36 momjian Exp $
+ * $Id: libpgtcl.h,v 1.8 1999/05/25 22:43:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
#include "tcl.h"
-extern int Pgtcl_Init(Tcl_Interp * interp);
-extern int Pgtcl_SafeInit(Tcl_Interp * interp);
+extern int Pgtcl_Init(Tcl_Interp *interp);
+extern int Pgtcl_SafeInit(Tcl_Interp *interp);
#endif /* LIBPGTCL_H */
diff --git a/src/interfaces/libpgtcl/pgtcl.c b/src/interfaces/libpgtcl/pgtcl.c
index eeaea74ccf3..0a8f3265a8f 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.14 1999/02/13 23:22:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.15 1999/05/25 22:43:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,7 +28,7 @@
*/
int
-Pgtcl_Init(Tcl_Interp * interp)
+Pgtcl_Init(Tcl_Interp *interp)
{
/*
@@ -133,7 +133,7 @@ Pgtcl_Init(Tcl_Interp * interp)
int
-Pgtcl_SafeInit(Tcl_Interp * interp)
+Pgtcl_SafeInit(Tcl_Interp *interp)
{
return Pgtcl_Init(interp);
}
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 0c2b184ed6a..e8a1e09ef50 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.43 1999/05/25 16:15:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.44 1999/05/25 22:43:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -237,7 +237,7 @@ tcl_value(char *value)
**********************************/
int
-Pg_conndefaults(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
+Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
{
PQconninfoOption *option;
Tcl_DString result;
@@ -276,7 +276,7 @@ Pg_conndefaults(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
**********************************/
int
-Pg_connect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_connect(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
char *pghost = NULL;
char *pgtty = NULL;
@@ -387,7 +387,7 @@ Pg_connect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************************/
int
-Pg_disconnect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_disconnect(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
Tcl_Channel conn_chan;
@@ -420,7 +420,7 @@ Pg_disconnect(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************************/
int
-Pg_exec(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_exec(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
Pg_ConnectionId *connid;
PGconn *conn;
@@ -520,7 +520,7 @@ Pg_exec(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************************/
int
-Pg_result(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_result(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGresult *result;
char *opt;
@@ -777,7 +777,7 @@ Pg_result_errReturn:
**********************/
int
-Pg_lo_open(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_open(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int lobjId;
@@ -847,7 +847,7 @@ Pg_lo_open(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************/
int
-Pg_lo_close(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_close(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int fd;
@@ -880,7 +880,7 @@ Pg_lo_close(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************/
int
-Pg_lo_read(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_read(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int fd;
@@ -931,7 +931,7 @@ Pg_lo_write
***********************************/
int
-Pg_lo_write(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_write(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
char *buf;
@@ -978,7 +978,7 @@ whence can be either
"SEEK_CUR", "SEEK_END", or "SEEK_SET"
***********************************/
int
-Pg_lo_lseek(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_lseek(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int fd;
@@ -1031,7 +1031,7 @@ for now, we don't support any additional storage managers.
***********************************/
int
-Pg_lo_creat(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_creat(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
char *modeStr;
@@ -1091,7 +1091,7 @@ Pg_lo_tell
***********************************/
int
-Pg_lo_tell(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_tell(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int fd;
@@ -1124,7 +1124,7 @@ Pg_lo_unlink
***********************************/
int
-Pg_lo_unlink(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_unlink(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
int lobjId;
@@ -1166,7 +1166,7 @@ Pg_lo_import
***********************************/
int
-Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_import(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
char *filename;
@@ -1205,7 +1205,7 @@ Pg_lo_export
***********************************/
int
-Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_lo_export(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
PGconn *conn;
char *filename;
@@ -1257,7 +1257,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
**********************************/
int
-Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
+Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
{
Pg_ConnectionId *connid;
PGconn *conn;
@@ -1375,7 +1375,7 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
*/
static int
-Pg_have_listener(Pg_ConnectionId * connid, const char *relname)
+Pg_have_listener(Pg_ConnectionId *connid, const char *relname)
{
Pg_TclNotifies *notifies;
Tcl_HashEntry *entry;
@@ -1414,7 +1414,7 @@ Pg_listen
vwait or update can be used to enter the Tcl event loop.
***********************************/
int
-Pg_listen(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
+Pg_listen(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
{
char *origrelname;
char *caserelname;
diff --git a/src/interfaces/libpgtcl/pgtclCmds.h b/src/interfaces/libpgtcl/pgtclCmds.h
index 495bf19e330..e30243e4628 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.h
+++ b/src/interfaces/libpgtcl/pgtclCmds.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pgtclCmds.h,v 1.14 1999/05/25 16:15:07 momjian Exp $
+ * $Id: pgtclCmds.h,v 1.15 1999/05/25 22:43:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@ typedef struct Pg_TclNotifies_s
* got round to deleting the Pg_TclNotifies structure.
*/
Tcl_HashTable notify_hash; /* Active pg_listen requests */
-} Pg_TclNotifies;
+} Pg_TclNotifies;
typedef struct Pg_ConnectionId_s
{
@@ -55,7 +55,7 @@ typedef struct Pg_ConnectionId_s
Pg_TclNotifies *notify_list;/* head of list of notify info */
int notifier_running; /* notify event source is live */
int notifier_socket;/* PQsocket on which notifier is listening */
-} Pg_ConnectionId;
+} Pg_ConnectionId;
/* Values of res_copyStatus */
#define RES_COPY_NONE 0
@@ -67,38 +67,38 @@ typedef struct Pg_ConnectionId_s
/* registered Tcl functions */
/* **************************/
extern int Pg_conndefaults(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_connect(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_disconnect(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_exec(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_select(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_result(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_open(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_close(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_read(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_write(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_lseek(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_creat(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_tell(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_unlink(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_import(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_lo_export(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
extern int Pg_listen(
- ClientData cData, Tcl_Interp * interp, int argc, char *argv[]);
+ ClientData cData, Tcl_Interp *interp, int argc, char *argv[]);
#endif /* PGTCLCMDS_H */
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index b8d30ce4f40..2dee00573fb 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -12,7 +12,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.19 1999/05/25 16:15:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.20 1999/05/25 22:43:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
static int
-PgEndCopy(Pg_ConnectionId * connid, int *errorCodePtr)
+PgEndCopy(Pg_ConnectionId *connid, int *errorCodePtr)
{
connid->res_copyStatus = RES_COPY_NONE;
if (PQendcopy(connid->conn))
@@ -156,7 +156,7 @@ Tcl_ChannelType Pg_ConnType = {
* Create and register a new channel for the connection
*/
void
-PgSetConnectionId(Tcl_Interp * interp, PGconn *conn)
+PgSetConnectionId(Tcl_Interp *interp, PGconn *conn)
{
Tcl_Channel conn_chan;
Pg_ConnectionId *connid;
@@ -198,7 +198,7 @@ PgSetConnectionId(Tcl_Interp * interp, PGconn *conn)
* Get back the connection from the Id
*/
PGconn *
-PgGetConnectionId(Tcl_Interp * interp, char *id, Pg_ConnectionId ** connid_p)
+PgGetConnectionId(Tcl_Interp *interp, char *id, Pg_ConnectionId **connid_p)
{
Tcl_Channel conn_chan;
Pg_ConnectionId *connid;
@@ -283,7 +283,7 @@ PgDelConnectionId(DRIVER_DEL_PROTO)
* is probably just not clearing result handles like they should.
*/
int
-PgSetResultId(Tcl_Interp * interp, char *connid_c, PGresult *res)
+PgSetResultId(Tcl_Interp *interp, char *connid_c, PGresult *res)
{
Tcl_Channel conn_chan;
Pg_ConnectionId *connid;
@@ -334,7 +334,7 @@ PgSetResultId(Tcl_Interp * interp, char *connid_c, PGresult *res)
}
static int
-getresid(Tcl_Interp * interp, char *id, Pg_ConnectionId ** connid_p)
+getresid(Tcl_Interp *interp, char *id, Pg_ConnectionId **connid_p)
{
Tcl_Channel conn_chan;
char *mark;
@@ -376,7 +376,7 @@ getresid(Tcl_Interp * interp, char *id, Pg_ConnectionId ** connid_p)
* Get back the result pointer from the Id
*/
PGresult *
-PgGetResultId(Tcl_Interp * interp, char *id)
+PgGetResultId(Tcl_Interp *interp, char *id)
{
Pg_ConnectionId *connid;
int resid;
@@ -394,7 +394,7 @@ PgGetResultId(Tcl_Interp * interp, char *id)
* Remove a result Id from the hash tables
*/
void
-PgDelResultId(Tcl_Interp * interp, char *id)
+PgDelResultId(Tcl_Interp *interp, char *id)
{
Pg_ConnectionId *connid;
int resid;
@@ -410,7 +410,7 @@ PgDelResultId(Tcl_Interp * interp, char *id)
* Get the connection Id from the result Id
*/
int
-PgGetConnByResultId(Tcl_Interp * interp, char *resid_c)
+PgGetConnByResultId(Tcl_Interp *interp, char *resid_c)
{
char *mark;
Tcl_Channel conn_chan;
@@ -478,12 +478,12 @@ typedef struct
Tcl_Event header; /* Standard Tcl event info */
PGnotify info; /* Notify name from SQL server */
Pg_ConnectionId *connid; /* Connection for server */
-} NotifyEvent;
+} NotifyEvent;
/* Dispatch a NotifyEvent that has reached the front of the event queue */
static int
-Pg_Notify_EventProc(Tcl_Event * evPtr, int flags)
+Pg_Notify_EventProc(Tcl_Event *evPtr, int flags)
{
NotifyEvent *event = (NotifyEvent *) evPtr;
Pg_TclNotifies *notifies;
@@ -570,7 +570,7 @@ Pg_Notify_EventProc(Tcl_Event * evPtr, int flags)
*/
void
-PgNotifyTransferEvents(Pg_ConnectionId * connid)
+PgNotifyTransferEvents(Pg_ConnectionId *connid)
{
PGnotify *notify;
@@ -605,7 +605,7 @@ PgNotifyTransferEvents(Pg_ConnectionId * connid)
*/
void
-PgNotifyInterpDelete(ClientData clientData, Tcl_Interp * interp)
+PgNotifyInterpDelete(ClientData clientData, Tcl_Interp *interp)
{
/* Mark the interpreter dead, but don't do anything else yet */
Pg_TclNotifies *notifies = (Pg_TclNotifies *) clientData;
@@ -626,7 +626,7 @@ PgNotifyInterpDelete(ClientData clientData, Tcl_Interp * interp)
* events are executed.
*/
static int
-NotifyEventDeleteProc(Tcl_Event * evPtr, ClientData clientData)
+NotifyEventDeleteProc(Tcl_Event *evPtr, ClientData clientData)
{
Pg_ConnectionId *connid = (Pg_ConnectionId *) clientData;
@@ -679,7 +679,7 @@ Pg_Notify_FileHandler(ClientData clientData, int mask)
*/
void
-PgStartNotifyEventSource(Pg_ConnectionId * connid)
+PgStartNotifyEventSource(Pg_ConnectionId *connid)
{
/* Start the notify event source if it isn't already running */
if (!connid->notifier_running)
@@ -706,7 +706,7 @@ PgStartNotifyEventSource(Pg_ConnectionId * connid)
}
void
-PgStopNotifyEventSource(Pg_ConnectionId * connid)
+PgStopNotifyEventSource(Pg_ConnectionId *connid)
{
/* Remove the event source */
if (connid->notifier_running)
diff --git a/src/interfaces/libpgtcl/pgtclId.h b/src/interfaces/libpgtcl/pgtclId.h
index 046ab39a086..0d74a0b674f 100644
--- a/src/interfaces/libpgtcl/pgtclId.h
+++ b/src/interfaces/libpgtcl/pgtclId.h
@@ -9,12 +9,12 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pgtclId.h,v 1.11 1999/05/25 16:15:08 momjian Exp $
+ * $Id: pgtclId.h,v 1.12 1999/05/25 22:43:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-extern void PgSetConnectionId(Tcl_Interp * interp, PGconn *conn);
+extern void PgSetConnectionId(Tcl_Interp *interp, PGconn *conn);
#if TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION == 5
/* Only Tcl 7.5 had drivers with this signature */
@@ -33,19 +33,19 @@ extern void PgSetConnectionId(Tcl_Interp * interp, PGconn *conn);
#define DRIVER_DEL_PROTO ClientData cData, Tcl_Interp *interp
#endif
-extern PGconn *PgGetConnectionId(Tcl_Interp * interp, char *id,
+extern PGconn *PgGetConnectionId(Tcl_Interp *interp, char *id,
Pg_ConnectionId **);
extern PgDelConnectionId(DRIVER_DEL_PROTO);
extern int PgOutputProc(DRIVER_OUTPUT_PROTO);
extern PgInputProc(DRIVER_INPUT_PROTO);
-extern int PgSetResultId(Tcl_Interp * interp, char *connid, PGresult *res);
-extern PGresult *PgGetResultId(Tcl_Interp * interp, char *id);
-extern void PgDelResultId(Tcl_Interp * interp, char *id);
-extern int PgGetConnByResultId(Tcl_Interp * interp, char *resid);
-extern void PgStartNotifyEventSource(Pg_ConnectionId * connid);
-extern void PgStopNotifyEventSource(Pg_ConnectionId * connid);
-extern void PgNotifyTransferEvents(Pg_ConnectionId * connid);
-extern void PgNotifyInterpDelete(ClientData clientData, Tcl_Interp * interp);
+extern int PgSetResultId(Tcl_Interp *interp, char *connid, PGresult *res);
+extern PGresult *PgGetResultId(Tcl_Interp *interp, char *id);
+extern void PgDelResultId(Tcl_Interp *interp, char *id);
+extern int PgGetConnByResultId(Tcl_Interp *interp, char *resid);
+extern void PgStartNotifyEventSource(Pg_ConnectionId *connid);
+extern void PgStopNotifyEventSource(Pg_ConnectionId *connid);
+extern void PgNotifyTransferEvents(Pg_ConnectionId *connid);
+extern void PgNotifyInterpDelete(ClientData clientData, Tcl_Interp *interp);
/* GetFileProc is needed in Tcl 7.6 *only* ... it went away again in 8.0 */
#if TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 6
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 351d9fac2ba..ac56e2711ab 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq-int.h,v 1.8 1999/05/25 16:15:14 momjian Exp $
+ * $Id: libpq-int.h,v 1.9 1999/05/25 22:43:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -142,7 +142,7 @@ typedef enum
PGASYNC_READY, /* result ready for PQgetResult */
PGASYNC_COPY_IN, /* Copy In data transfer in progress */
PGASYNC_COPY_OUT /* Copy Out data transfer in progress */
-} PGAsyncStatusType;
+} PGAsyncStatusType;
/* large-object-access data ... allocated only if large-object code is used. */
typedef struct pgLobjfuncs
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 3e40b82ecd5..5d05566ad4b 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -3,7 +3,7 @@
* procedural language (PL)
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.10 1999/05/25 16:15:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.11 1999/05/25 22:43:51 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -121,22 +121,22 @@ static Datum pltcl_func_handler(FmgrInfo *proinfo,
static HeapTuple pltcl_trigger_handler(FmgrInfo *proinfo);
-static int pltcl_elog(ClientData cdata, Tcl_Interp * interp,
+static int pltcl_elog(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[]);
-static int pltcl_quote(ClientData cdata, Tcl_Interp * interp,
+static int pltcl_quote(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[]);
-static int pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp,
+static int pltcl_SPI_exec(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[]);
-static int pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp,
+static int pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[]);
-static int pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp,
+static int pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[]);
-static void pltcl_set_tuple_values(Tcl_Interp * interp, char *arrayname,
+static void pltcl_set_tuple_values(Tcl_Interp *interp, char *arrayname,
int tupno, HeapTuple tuple, TupleDesc tupdesc);
static void pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc,
- Tcl_DString * retval);
+ Tcl_DString *retval);
/**********************************************************************
* pltcl_init_all() - Initialize all
@@ -1167,7 +1167,7 @@ pltcl_trigger_handler(FmgrInfo *proinfo)
* pltcl_elog() - elog() support for PLTcl
**********************************************************************/
static int
-pltcl_elog(ClientData cdata, Tcl_Interp * interp,
+pltcl_elog(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[])
{
int level;
@@ -1233,7 +1233,7 @@ pltcl_elog(ClientData cdata, Tcl_Interp * interp,
* be used in SPI_exec query strings
**********************************************************************/
static int
-pltcl_quote(ClientData cdata, Tcl_Interp * interp,
+pltcl_quote(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[])
{
char *tmp;
@@ -1287,7 +1287,7 @@ pltcl_quote(ClientData cdata, Tcl_Interp * interp,
* for the safe interpreter
**********************************************************************/
static int
-pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp,
+pltcl_SPI_exec(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[])
{
int spi_rc;
@@ -1519,7 +1519,7 @@ pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp,
* and not save the plan currently.
**********************************************************************/
static int
-pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp,
+pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[])
{
int nargs;
@@ -1700,7 +1700,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp,
* pltcl_SPI_execp() - Execute a prepared plan
**********************************************************************/
static int
-pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp,
+pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp,
int argc, char *argv[])
{
int spi_rc;
@@ -2085,7 +2085,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp,
* of a given tuple
**********************************************************************/
static void
-pltcl_set_tuple_values(Tcl_Interp * interp, char *arrayname,
+pltcl_set_tuple_values(Tcl_Interp *interp, char *arrayname,
int tupno, HeapTuple tuple, TupleDesc tupdesc)
{
int i;
@@ -2181,7 +2181,7 @@ pltcl_set_tuple_values(Tcl_Interp * interp, char *arrayname,
**********************************************************************/
static void
pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc,
- Tcl_DString * retval)
+ Tcl_DString *retval)
{
int i;
char *outputstr;
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index b5e47b543ab..ef5fde701a2 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -36,7 +36,6 @@ do
# We get the list of typedef's from /src/tools/find_typedef
indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
-lp -nip -npro $EXTRA_OPTS \
--TACL \
-TA_Const \
-TA_Expr \
-TA_Indices \
@@ -51,9 +50,11 @@ do
-TAggFuncInfo \
-TAggInfo \
-TAggState \
--TAggreg \
--TAllocElem \
--TAllocElemData \
+-TAggref \
+-TAllocBlock \
+-TAllocBlockData \
+-TAllocChunk \
+-TAllocChunkData \
-TAllocMode \
-TAllocPointer \
-TAllocSet \
@@ -65,11 +66,11 @@ do
-TArray \
-TArrayRef \
-TArrayType \
+-TAtom \
-TAttr \
-TAttrDefault \
-TAttrNumber \
-TAttributeSize \
--TAttributeTupleForm \
-TAuthRequest \
-TAuthRequestPacket \
-TBOX \
@@ -94,7 +95,6 @@ do
-TBackend \
-TBackendId \
-TBackendTag \
--TBindingEnt \
-TBitArray \
-TBitIndex \
-TBlock \
@@ -103,6 +103,7 @@ do
-TBlockNumber \
-TBoolPtr \
-TBucket \
+-TBufFile \
-TBufFlags \
-TBuffer \
-TBufferBlock \
@@ -110,24 +111,27 @@ do
-TBufferHdr \
-TBufferLock \
-TBufferTag \
+-TCATEGORY \
-TCHUNK_INFO \
-TCIRCLE \
--TCInfo \
-TCPFunction \
-TCPPFunction \
+-TCancelRequestPacket \
-TCandidateList \
+-TCaseExpr \
+-TCaseWhen \
-TCash \
-TCatCTup \
-TCatCache \
-TCatalogInvalidationData \
-TChangeACLStmt \
--TChar16 \
--TChoose \
-TChromosome \
-TCity \
+-TClientData \
-TClosePortalStmt \
-TClusterStmt \
-TCmdType \
+-TColormap \
-TColumnDef \
-TCommandDest \
-TCommandId \
@@ -146,6 +150,9 @@ do
-TCreateTrigStmt \
-TCreateUserStmt \
-TCreatedbStmt \
+-TCursor \
+-TDIR \
+-TDR_printtup \
-TDateADT \
-TDateTime \
-TDatum \
@@ -153,10 +160,15 @@ do
-TDefElem \
-TDefineStmt \
-TDeleteStmt \
+-TDepth \
+-TDestReceiver \
-TDestroyStmt \
-TDestroydbStmt \
+-TDisplay \
+-TDl_info \
-TDlelem \
-TDllist \
+-TDrawable \
-TDropPLangStmt \
-TDropTrigStmt \
-TDropUserStmt \
@@ -194,6 +206,7 @@ do
-TFmgrCall \
-TFmgrInfo \
-TFmgrValues \
+-TFont \
-TFormData_pg_aggregate \
-TFormData_pg_am \
-TFormData_pg_amop \
@@ -215,9 +228,10 @@ do
-TFormData_pg_relcheck \
-TFormData_pg_rewrite \
-TFormData_pg_sequence \
+-TFormData_pg_shadow \
-TFormData_pg_statistic \
-TFormData_pg_trigger \
--TFormData_pg_user \
+-TFormData_pg_type \
-TFormData_pg_variable \
-TFormData_pg_version \
-TForm_pg_aggregate \
@@ -225,20 +239,27 @@ do
-TForm_pg_amop \
-TForm_pg_amproc \
-TForm_pg_attrdef \
+-TForm_pg_attribute \
-TForm_pg_class \
-TForm_pg_database \
-TForm_pg_group \
+-TForm_pg_index \
+-TForm_pg_inherits \
-TForm_pg_ipl \
-TForm_pg_language \
-TForm_pg_log \
-TForm_pg_opclass \
+-TForm_pg_operator \
-TForm_pg_proc \
-TForm_pg_relcheck \
-TForm_pg_rewrite \
+-TForm_pg_sequence \
+-TForm_pg_shadow \
-TForm_pg_statistic \
-TForm_pg_trigger \
--TForm_pg_user \
+-TForm_pg_type \
-TForm_pg_variable \
+-TForm_pg_version \
-TFunc \
-TFuncCall \
-TFuncIndexInfo \
@@ -247,6 +268,8 @@ do
-TFunction \
-TFunctionCache \
-TFunctionCachePtr \
+-TGC \
+-TGContext \
-TGISTENTRY \
-TGISTPageOpaque \
-TGISTPageOpaqueData \
@@ -259,6 +282,7 @@ do
-TGIST_SPLITVEC \
-TGene \
-TGlobalMemory \
+-TGlobalMemoryData \
-TGroup \
-TGroupBuffer \
-TGroupClause \
@@ -268,16 +292,16 @@ do
-THHDR \
-THISTORY_STATE \
-THIST_ENTRY \
--THInfo \
-THTAB \
-THash \
--THashBucket \
--THashBucketData \
+-THashInfo \
-THashItem \
-THashItemData \
-THashJoin \
-THashJoinState \
-THashJoinTable \
+-THashJoinTuple \
+-THashJoinTupleData \
-THashMetaPage \
-THashMetaPageData \
-THashPageOpaque \
@@ -298,6 +322,8 @@ do
-THeapScanDescData \
-THeapTuple \
-THeapTupleData \
+-THeapTupleHeader \
+-THeapTupleHeaderData \
-TINTRANGE \
-TIPCKey \
-TIdList \
@@ -322,10 +348,8 @@ do
-TIndexStrategyData \
-TIndexTuple \
-TIndexTupleData \
--TIndexTupleForm \
-TInhInfo \
-TInhPaths \
--TInheritsTupleForm \
-TInsertIndexResult \
-TInsertIndexResultData \
-TInsertStmt \
@@ -350,8 +374,9 @@ do
-TItemPointer \
-TItemPointerData \
-TIter \
--TJInfo \
-TJoin \
+-TJoinExpr \
+-TJoinInfo \
-TJoinKey \
-TJoinMethod \
-TJoinPath \
@@ -359,15 +384,16 @@ do
-TJunkFilter \
-TKEYMAP_ENTRY \
-TKEYMAP_ENTRY_ARRAY \
+-TKeyCode \
+-TKeySym \
-TKeymap \
-TLINE \
-TLOCK \
--TLOCKCTL \
--TLOCKT \
--TLOCKTAB \
+-TLOCKMETHOD \
+-TLOCKMETHODCTL \
+-TLOCKMETHODTABLE \
+-TLOCKMODE \
-TLOCKTAG \
--TLOCK_TYPE \
--TLRelId \
-TLSEG \
-TLargeObjectDesc \
-TLeftistContext \
@@ -380,18 +406,21 @@ do
-TLocationIndex \
-TLockInfo \
-TLockInfoData \
--TLockTableId \
+-TLockRelId \
+-TLockStmt \
-TLogRelationContents \
-TLogRelationContentsData \
-TLookupEnt \
-TMASK \
--TMInfo \
-TMarkData \
+-TMask \
-TMaterial \
-TMaterialState \
-TMdfdVec \
-TMemoryContext \
+-TMemoryContextData \
-TMemoryContextMethods \
+-TMergeInfo \
-TMergeJoin \
-TMergeJoinState \
-TMergeOrder \
@@ -401,24 +430,25 @@ do
-TNameData \
-TNestLoop \
-TNestLoopState \
+-TNestPath \
-TNode \
-TNodeTag \
+-TNoname \
+-TNotifyEvent \
-TNotifyStmt \
+-TNumeric \
+-TNumericData \
+-TNumericDigit \
+-TNumericDigitBuf \
+-TNumericVar \
-TOffset \
-TOffsetNumber \
-TOid \
--TOidInt2 \
--TOidInt2Data \
--TOidInt4 \
--TOidInt4Data \
--TOidName \
--TOidNameData \
-TOpType \
-TOpaque \
-TOpaqueData \
-TOper \
-TOperator \
--TOperatorTupleForm \
-TOprInfo \
-TOrderKey \
-TOrderType \
@@ -427,9 +457,8 @@ do
-TOrderedSet \
-TOrderedSetData \
-TOverflowPageAddress \
--TOverflowTuple \
--TOverflowTupleData \
-TPATH \
+-TPGAsyncStatusType \
-TPG_LOCK_LEVEL \
-TPGconn \
-TPGlobjfuncs \
@@ -437,15 +466,17 @@ do
-TPGresAttDesc \
-TPGresAttValue \
-TPGresult \
+-TPGresult_data \
-TPOLYGON \
-TPQArgBlock \
--TPQNotifyList \
-TPQconninfoOption \
+-TPQnoticeProcessor \
-TPQprintOpt \
-TPROC \
-TPROC_HDR \
-TPROC_QUEUE \
-TPacket \
+-TPacketDoneProc \
-TPacketLen \
-TPacketState \
-TPage \
@@ -464,6 +495,9 @@ do
-TPasswordPacketV0 \
-TPath \
-TPathOrder \
+-TPg_ConnectionId \
+-TPg_TclNotifies \
+-TPixmap \
-TPlan \
-TPoint \
-TPointer \
@@ -480,6 +514,7 @@ do
-TPortalMemoryContext \
-TPortalVariableMemory \
-TPredInfo \
+-TPrinttupAttrInfo \
-TPrivateMem \
-TProcState \
-TProcedureStmt \
@@ -488,9 +523,9 @@ do
-TProtocolVersion \
-TPsortstate \
-TPsqlSettings \
+-TQryHier \
-TQuery \
-TQueryDesc \
--TQueryTreeList \
-TREAD_ROUTINE \
-TRTSTACK \
-TRTSTATE \
@@ -504,10 +539,10 @@ do
-TRangeVar \
-TRecipeStmt \
-TRegProcedure \
--TRel \
-TRelExpr \
-TRelIdCacheEnt \
-TRelNameCacheEnt \
+-TRelOptInfo \
-TRelation \
-TRelationBuildDescInfo \
-TRelationData \
@@ -515,9 +550,8 @@ do
-TRelationInvalidationData \
-TRelationList \
-TRelationPtr \
--TRelativeAddr \
-TRelativeTime \
--TRelid \
+-TRelids \
-TRemoveAggrStmt \
-TRemoveFuncStmt \
-TRemoveOperStmt \
@@ -525,12 +559,14 @@ do
-TRenameStmt \
-TResTarget \
-TResdom \
+-TRestrictInfo \
-TResult \
-TResultState \
-TRetrieveIndexResult \
-TRetrieveIndexResultData \
-TRewriteInfo \
-TRewriteRule \
+-TRowMark \
-TRuleLock \
-TRuleStmt \
-TSEGMENT \
@@ -551,14 +587,19 @@ do
-TScanKey \
-TScanKeyData \
-TScanKeyword \
+-TScreen \
+-TScreenFormat \
-TSelectStmt \
-TSeqScan \
-TSeqTable \
-TSeqTableData \
--TSequenceTupleForm \
-TSharedInvalid \
-TSharedInvalidData \
+-TShmemIndexEnt \
+-TSigHandler \
-TSize \
+-TSnapshot \
+-TSnapshotData \
-TSockAddr \
-TSort \
-TSortClause \
@@ -588,19 +629,145 @@ do
-TSubPlan \
-TSuperQE \
-TSystemPortAddress \
--TTUPLE \
-TTXTRANGE \
-TTableID \
-TTableInfo \
-TTargetEntry \
--TTee \
--TTeeState \
--TTemp \
+-TTcl_AppInitProc \
+-TTcl_AsyncHandler \
+-TTcl_AsyncProc \
+-TTcl_CallFrame \
+-TTcl_Channel \
+-TTcl_ChannelProc \
+-TTcl_ChannelType \
+-TTcl_CloseProc \
+-TTcl_CmdDeleteProc \
+-TTcl_CmdInfo \
+-TTcl_CmdProc \
+-TTcl_CmdTraceProc \
+-TTcl_Command \
+-TTcl_DString \
+-TTcl_DriverBlockModeProc \
+-TTcl_DriverCloseProc \
+-TTcl_DriverGetHandleProc \
+-TTcl_DriverGetOptionProc \
+-TTcl_DriverInputProc \
+-TTcl_DriverOutputProc \
+-TTcl_DriverSeekProc \
+-TTcl_DriverSetOptionProc \
+-TTcl_DriverWatchProc \
+-TTcl_DupInternalRepProc \
+-TTcl_EolTranslation \
+-TTcl_Event \
+-TTcl_EventCheckProc \
+-TTcl_EventDeleteProc \
+-TTcl_EventProc \
+-TTcl_EventSetupProc \
+-TTcl_ExitProc \
+-TTcl_FileFreeProc \
+-TTcl_FileProc \
+-TTcl_FreeInternalRepProc \
+-TTcl_FreeProc \
+-TTcl_HashEntry \
+-TTcl_HashSearch \
+-TTcl_HashTable \
+-TTcl_IdleProc \
+-TTcl_Interp \
+-TTcl_InterpDeleteProc \
+-TTcl_MathProc \
+-TTcl_Namespace \
+-TTcl_NamespaceDeleteProc \
+-TTcl_Obj \
+-TTcl_ObjCmdProc \
+-TTcl_ObjType \
+-TTcl_PackageInitProc \
+-TTcl_PathType \
+-TTcl_Pid \
+-TTcl_QueuePosition \
+-TTcl_RegExp \
+-TTcl_SetFromAnyProc \
+-TTcl_TcpAcceptProc \
+-TTcl_Time \
+-TTcl_TimerProc \
+-TTcl_TimerToken \
+-TTcl_Trace \
+-TTcl_UpdateStringProc \
+-TTcl_Value \
+-TTcl_ValueType \
+-TTcl_Var \
+-TTcl_VarTraceProc \
-TTempRelList \
+-TTempTable \
+-TTime \
-TTimeADT \
-TTimeInterval \
-TTimeIntervalData \
-TTimeSpan \
+-TTk_3DBorder \
+-TTk_Anchor \
+-TTk_ArgvInfo \
+-TTk_BindingTable \
+-TTk_Canvas \
+-TTk_CanvasTextInfo \
+-TTk_ConfigSpec \
+-TTk_Cursor \
+-TTk_CustomOption \
+-TTk_ErrorHandler \
+-TTk_ErrorProc \
+-TTk_EventProc \
+-TTk_FakeWin \
+-TTk_Font \
+-TTk_FontMetrics \
+-TTk_GenericProc \
+-TTk_GeomLostSlaveProc \
+-TTk_GeomMgr \
+-TTk_GeomRequestProc \
+-TTk_GetSelProc \
+-TTk_Image \
+-TTk_ImageChangedProc \
+-TTk_ImageCreateProc \
+-TTk_ImageDeleteProc \
+-TTk_ImageDisplayProc \
+-TTk_ImageFileMatchProc \
+-TTk_ImageFileReadProc \
+-TTk_ImageFileWriteProc \
+-TTk_ImageFreeProc \
+-TTk_ImageGetProc \
+-TTk_ImageMaster \
+-TTk_ImageStringMatchProc \
+-TTk_ImageStringReadProc \
+-TTk_ImageStringWriteProc \
+-TTk_ImageType \
+-TTk_Item \
+-TTk_ItemAreaProc \
+-TTk_ItemConfigureProc \
+-TTk_ItemCoordProc \
+-TTk_ItemCreateProc \
+-TTk_ItemCursorProc \
+-TTk_ItemDCharsProc \
+-TTk_ItemDeleteProc \
+-TTk_ItemDisplayProc \
+-TTk_ItemIndexProc \
+-TTk_ItemInsertProc \
+-TTk_ItemPointProc \
+-TTk_ItemPostscriptProc \
+-TTk_ItemScaleProc \
+-TTk_ItemSelectionProc \
+-TTk_ItemTranslateProc \
+-TTk_ItemType \
+-TTk_Justify \
+-TTk_LostSelProc \
+-TTk_OptionParseProc \
+-TTk_OptionPrintProc \
+-TTk_PhotoHandle \
+-TTk_PhotoImageBlock \
+-TTk_PhotoImageFormat \
+-TTk_RestrictAction \
+-TTk_RestrictProc \
+-TTk_SelectionProc \
+-TTk_TextLayout \
+-TTk_Uid \
+-TTk_Window \
-TTransactionId \
-TTransactionState \
-TTransactionStateData \
@@ -619,11 +786,10 @@ do
-TTypeBlock \
-TTypeInfo \
-TTypeName \
--TTypeTupleForm \
--TTypeTupleFormData \
-TUNDO_LIST \
-TUnique \
-TUniqueState \
+-TUnlistenStmt \
-TUpdateStmt \
-TUserAuth \
-TVAttList \
@@ -636,32 +802,159 @@ do
-TVRelList \
-TVRelListData \
-TVRelStats \
+-TVTupleLink \
+-TVTupleLinkData \
+-TVTupleMove \
+-TVTupleMoveData \
-TVacAttrStats \
-TVacuumStmt \
-TValue \
-TVar \
+-TVariableCache \
+-TVariableCacheData \
-TVariableRelationContents \
-TVariableRelationContentsData \
-TVariableResetStmt \
-TVariableSetStmt \
-TVariableShowStmt \
-TVersionStmt \
--TVersionTupleForm \
-TVfd \
-TViewStmt \
+-TVisual \
+-TVisualID \
+-TWindow \
+-TXActivateDeactivateEvent \
+-TXActivateEvent \
+-TXAnyEvent \
+-TXArc \
+-TXButtonEvent \
+-TXButtonPressedEvent \
+-TXButtonReleasedEvent \
+-TXChar2b \
+-TXCharStruct \
+-TXCirculateEvent \
+-TXCirculateRequestEvent \
+-TXClientMessageEvent \
+-TXColor \
+-TXColormapEvent \
+-TXConfigureEvent \
+-TXConfigureRequestEvent \
+-TXConnectionWatchProc \
+-TXCreateWindowEvent \
+-TXCrossingEvent \
+-TXDeactivateEvent \
+-TXDestroyWindowEvent \
+-TXEDataObject \
+-TXEnterWindowEvent \
+-TXErrorEvent \
+-TXErrorHandler \
+-TXEvent \
+-TXExposeEvent \
+-TXExtCodes \
+-TXExtData \
+-TXFocusChangeEvent \
+-TXFocusInEvent \
+-TXFocusOutEvent \
+-TXFontProp \
+-TXFontSet \
+-TXFontSetExtents \
+-TXFontStruct \
+-TXGCValues \
+-TXGraphicsExposeEvent \
+-TXGravityEvent \
+-TXHostAddress \
+-TXIC \
+-TXICCallback \
+-TXICProc \
+-TXID \
-TXIDLookupEnt \
+-TXIDProc \
-TXIDTAG \
+-TXIM \
+-TXIMCallback \
+-TXIMCaretDirection \
+-TXIMCaretStyle \
+-TXIMFeedback \
+-TXIMHotKeyState \
+-TXIMHotKeyTrigger \
+-TXIMHotKeyTriggers \
+-TXIMPreeditCaretCallbackStruct \
+-TXIMPreeditDrawCallbackStruct \
+-TXIMPreeditState \
+-TXIMPreeditStateNotifyCallbackStruct \
+-TXIMProc \
+-TXIMResetState \
+-TXIMStatusDataType \
+-TXIMStatusDrawCallbackStruct \
+-TXIMStringConversionCallbackStruct \
+-TXIMStringConversionFeedback \
+-TXIMStringConversionOperation \
+-TXIMStringConversionPosition \
+-TXIMStringConversionText \
+-TXIMStringConversionType \
+-TXIMStyle \
+-TXIMStyles \
+-TXIMText \
+-TXIMValuesList \
+-TXIOErrorHandler \
+-TXImage \
+-TXKeyEvent \
+-TXKeyPressedEvent \
+-TXKeyReleasedEvent \
+-TXKeyboardControl \
+-TXKeyboardState \
+-TXKeymapEvent \
+-TXLeaveWindowEvent \
+-TXMapEvent \
+-TXMapRequestEvent \
+-TXMappingEvent \
+-TXModifierKeymap \
+-TXMotionEvent \
+-TXNoExposeEvent \
+-TXOC \
+-TXOM \
+-TXOMCharSetList \
+-TXOMFontInfo \
+-TXOMOrientation \
+-TXOrientation \
+-TXPixmapFormatValues \
+-TXPoint \
+-TXPointer \
+-TXPointerMovedEvent \
+-TXPropertyEvent \
+-TXRectangle \
+-TXReparentEvent \
+-TXResizeRequestEvent \
+-TXSegment \
+-TXSelectionClearEvent \
+-TXSelectionEvent \
+-TXSelectionRequestEvent \
+-TXSetWindowAttributes \
+-TXTextItem \
+-TXTextItem16 \
+-TXTimeCoord \
+-TXUnmapEvent \
+-TXVaNestedList \
+-TXVirtualEvent \
+-TXVisibilityEvent \
+-TXWindowAttributes \
+-TXWindowChanges \
-TXidStatus \
+-TXmbTextItem \
+-TXwcTextItem \
-TYYSTYPE \
-TYY_BUFFER_STATE \
-TYY_CHAR \
+-T_LIB_VERSION_TYPE \
-T_LockId_ \
-T_RuneEntry \
-T_RuneLocale \
-T_RuneRange \
-T_SPI_connection \
-T_SPI_plan \
+-T_XPrivDisplay \
-Taclitem \
+-Tassoc_list \
-Tbits16 \
-Tbits32 \
-Tbits8 \
@@ -674,7 +967,6 @@ do
-Tcat_t \
-Tcc_t \
-Tchar \
--TcharPP \
-Tclock_t \
-Tclockid_t \
-Tcset \
@@ -684,6 +976,8 @@ do
-Tdhalloc_ptr \
-Tdiv_t \
-Tdouble \
+-TevalPlanQual \
+-TexecRowMark \
-Texecution_state \
-Tf_smgr \
-Tfd_mask \
@@ -700,6 +994,10 @@ do
-Tfunc_ptr \
-Tgid_t \
-Thashnode \
+-Tin_addr_t \
+-Tin_port_t \
+-Tinet \
+-Tinet_struct \
-Tino_t \
-Tint \
-Tint16 \
@@ -711,15 +1009,17 @@ do
-Tint32_t \
-Tint32m_t \
-Tint4 \
+-Tint64 \
-Tint64_t \
-Tint64m_t \
-Tint8 \
-Tint8_t \
-Tint8m_t \
--TintP \
-Tjmp_buf \
-Tkey_t \
-Tldiv_t \
+-Tmacaddr \
+-Tmanufacturer \
-Tmode_t \
-Tnlink_t \
-Toff_t \
@@ -737,16 +1037,19 @@ do
-Tregoff_t \
-Tregproc \
-Trune_t \
+-Tsa_family_t \
-Tsegsz_t \
-Tsequence_magic \
-Tsig_atomic_t \
-Tsig_func \
-Tsig_t \
+-Tsighandler_cxt \
-Tsigjmp_buf \
-Tsigset_t \
-Tsize_t \
-Tslock_t \
-Tsmgrid \
+-Tsocklen_t \
-Tsop \
-Tsopno \
-Tspeed_t \
@@ -786,8 +1089,6 @@ do
-Tword8 \
-Tyy_size_t \
-Tyy_state_type \
--Tinet \
--Tmacaddr \
/tmp/$$a >/tmp/$$ 2>&1
if [ "$?" -ne 0 -o -s /tmp/$$ ]
then echo "$FILE"
--
GitLab