summaryrefslogtreecommitdiff
path: root/src/backend/nodes
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/nodes')
-rw-r--r--src/backend/nodes/copyfuncs.c12
-rw-r--r--src/backend/nodes/makefuncs.c4
-rw-r--r--src/backend/nodes/outfuncs.c23
-rw-r--r--src/backend/nodes/print.c12
-rw-r--r--src/backend/nodes/readfuncs.c35
5 files changed, 44 insertions, 42 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 8a69af3de5..2964085e0a 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -15,7 +15,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.210 2002/09/02 02:13:01 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.211 2002/09/04 20:31:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1518,7 +1518,7 @@ _copyAExpr(A_Expr *from)
static ColumnRef *
_copyColumnRef(ColumnRef *from)
{
- ColumnRef *newnode = makeNode(ColumnRef);
+ ColumnRef *newnode = makeNode(ColumnRef);
Node_Copy(from, newnode, fields);
Node_Copy(from, newnode, indirection);
@@ -1529,7 +1529,7 @@ _copyColumnRef(ColumnRef *from)
static ParamRef *
_copyParamRef(ParamRef *from)
{
- ParamRef *newnode = makeNode(ParamRef);
+ ParamRef *newnode = makeNode(ParamRef);
newnode->number = from->number;
Node_Copy(from, newnode, fields);
@@ -1595,7 +1595,7 @@ _copyAIndices(A_Indices *from)
static ExprFieldSelect *
_copyExprFieldSelect(ExprFieldSelect *from)
{
- ExprFieldSelect *newnode = makeNode(ExprFieldSelect);
+ ExprFieldSelect *newnode = makeNode(ExprFieldSelect);
Node_Copy(from, newnode, arg);
Node_Copy(from, newnode, fields);
@@ -1688,7 +1688,7 @@ _copyRangeSubselect(RangeSubselect *from)
static RangeFunction *
_copyRangeFunction(RangeFunction *from)
{
- RangeFunction *newnode = makeNode(RangeFunction);
+ RangeFunction *newnode = makeNode(RangeFunction);
Node_Copy(from, newnode, funccallnode);
Node_Copy(from, newnode, alias);
@@ -2223,7 +2223,7 @@ _copyTransactionStmt(TransactionStmt *from)
static CompositeTypeStmt *
_copyCompositeTypeStmt(CompositeTypeStmt *from)
{
- CompositeTypeStmt *newnode = makeNode(CompositeTypeStmt);
+ CompositeTypeStmt *newnode = makeNode(CompositeTypeStmt);
Node_Copy(from, newnode, typevar);
Node_Copy(from, newnode, coldeflist);
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index ee716a5a84..8363fccfa6 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.33 2002/06/20 20:29:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.34 2002/09/04 20:31:19 momjian Exp $
*/
#include "postgres.h"
@@ -233,7 +233,7 @@ makeRelabelType(Node *arg, Oid rtype, int32 rtypmod)
RangeVar *
makeRangeVar(char *schemaname, char *relname)
{
- RangeVar *r = makeNode(RangeVar);
+ RangeVar *r = makeNode(RangeVar);
r->catalogname = NULL;
r->schemaname = schemaname;
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 8c25505806..8873c4e3d2 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.172 2002/08/31 22:10:43 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.173 2002/09/04 20:31:19 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -232,10 +232,10 @@ _outQuery(StringInfo str, Query *node)
/*
* Hack to work around missing outfuncs routines for a lot of the
- * utility-statement node types. (The only one we actually *need*
- * for rules support is NotifyStmt.) Someday we ought to support
- * 'em all, but for the meantime do this to avoid getting lots of
- * warnings when running with debug_print_parse on.
+ * utility-statement node types. (The only one we actually *need* for
+ * rules support is NotifyStmt.) Someday we ought to support 'em all,
+ * but for the meantime do this to avoid getting lots of warnings when
+ * running with debug_print_parse on.
*/
if (node->utilityStmt)
{
@@ -832,13 +832,13 @@ static void
_outArrayRef(StringInfo str, ArrayRef *node)
{
appendStringInfo(str,
- " ARRAYREF :refrestype %u :refattrlength %d :refelemlength %d ",
+ " ARRAYREF :refrestype %u :refattrlength %d :refelemlength %d ",
node->refrestype,
node->refattrlength,
node->refelemlength);
appendStringInfo(str,
- ":refelembyval %s :refelemalign %c :refupperindexpr ",
+ ":refelembyval %s :refelemalign %c :refupperindexpr ",
booltostr(node->refelembyval),
node->refelemalign);
_outNode(str, node->refupperindexpr);
@@ -860,7 +860,7 @@ static void
_outFunc(StringInfo str, Func *node)
{
appendStringInfo(str,
- " FUNC :funcid %u :funcresulttype %u :funcretset %s ",
+ " FUNC :funcid %u :funcresulttype %u :funcretset %s ",
node->funcid,
node->funcresulttype,
booltostr(node->funcretset));
@@ -873,7 +873,7 @@ static void
_outOper(StringInfo str, Oper *node)
{
appendStringInfo(str,
- " OPER :opno %u :opid %u :opresulttype %u :opretset %s ",
+ " OPER :opno %u :opid %u :opresulttype %u :opretset %s ",
node->opno,
node->opid,
node->opresulttype,
@@ -1324,6 +1324,7 @@ static void
_outRangeVar(StringInfo str, RangeVar *node)
{
appendStringInfo(str, " RANGEVAR :relation ");
+
/*
* we deliberately ignore catalogname here, since it is presently not
* semantically meaningful
@@ -1332,8 +1333,8 @@ _outRangeVar(StringInfo str, RangeVar *node)
appendStringInfo(str, " . ");
_outToken(str, node->relname);
appendStringInfo(str, " :inhopt %d :istemp %s",
- (int) node->inhOpt,
- booltostr(node->istemp));
+ (int) node->inhOpt,
+ booltostr(node->istemp));
appendStringInfo(str, " :alias ");
_outNode(str, node->alias);
}
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 4e81ed14f2..e8afda6b20 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.56 2002/06/20 20:29:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.57 2002/09/04 20:31:20 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -97,7 +97,7 @@ char *
format_node_dump(const char *dump)
{
#define LINELEN 78
- char line[LINELEN+1];
+ char line[LINELEN + 1];
StringInfoData str;
int i;
int j;
@@ -118,13 +118,13 @@ format_node_dump(const char *dump)
}
else
{
- for (k = j-1; k > 0; k--)
+ for (k = j - 1; k > 0; k--)
if (line[k] == ' ')
break;
if (k > 0)
{
/* back up; will reprint all after space */
- i -= (j-k-1);
+ i -= (j - k - 1);
j = k;
}
}
@@ -153,7 +153,7 @@ pretty_format_node_dump(const char *dump)
#define INDENTSTOP 3
#define MAXINDENT 60
#define LINELEN 78
- char line[LINELEN+1];
+ char line[LINELEN + 1];
StringInfoData str;
int indentLev;
int indentDist;
@@ -182,7 +182,7 @@ pretty_format_node_dump(const char *dump)
}
/* print the } at indentDist */
line[indentDist] = '}';
- line[indentDist+1] = '\0';
+ line[indentDist + 1] = '\0';
appendStringInfo(&str, "%s\n", line);
/* outdent */
if (indentLev > 0)
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 4d4001d213..14edd8e3d1 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.131 2002/08/31 22:10:43 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.132 2002/09/04 20:31:20 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1459,7 +1459,8 @@ _readRangeVar(void)
local_node = makeNode(RangeVar);
- local_node->catalogname = NULL; /* not currently saved in output format */
+ local_node->catalogname = NULL; /* not currently saved in output
+ * format */
token = pg_strtok(&length); /* eat :relation */
token = pg_strtok(&length); /* get schemaname */
@@ -1468,11 +1469,11 @@ _readRangeVar(void)
token = pg_strtok(&length); /* eat "." */
token = pg_strtok(&length); /* get relname */
local_node->relname = nullable_string(token, length);
-
+
token = pg_strtok(&length); /* eat :inhopt */
token = pg_strtok(&length); /* get inhopt */
local_node->inhOpt = (InhOption) atoi(token);
-
+
token = pg_strtok(&length); /* eat :istemp */
token = pg_strtok(&length); /* get istemp */
local_node->istemp = strtobool(token);
@@ -1493,10 +1494,10 @@ _readColumnRef(void)
local_node = makeNode(ColumnRef);
token = pg_strtok(&length); /* eat :fields */
- local_node->fields = nodeRead(true); /* now read it */
+ local_node->fields = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :indirection */
- local_node->indirection = nodeRead(true); /* now read it */
+ local_node->indirection = nodeRead(true); /* now read it */
return local_node;
}
@@ -1515,7 +1516,7 @@ _readColumnDef(void)
local_node->colname = nullable_string(token, length);
token = pg_strtok(&length); /* eat :typename */
- local_node->typename = nodeRead(true); /* now read it */
+ local_node->typename = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :is_inherited */
token = pg_strtok(&length); /* get :is_inherited */
@@ -1526,7 +1527,7 @@ _readColumnDef(void)
local_node->is_not_null = strtobool(token);
token = pg_strtok(&length); /* eat :raw_default */
- local_node->raw_default = nodeRead(true); /* now read it */
+ local_node->raw_default = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :cooked_default */
token = pg_strtok(&length); /* now read it */
@@ -1536,7 +1537,7 @@ _readColumnDef(void)
local_node->constraints = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :support */
- local_node->support = nodeRead(true); /* now read it */
+ local_node->support = nodeRead(true); /* now read it */
return local_node;
}
@@ -1544,7 +1545,7 @@ _readColumnDef(void)
static TypeName *
_readTypeName(void)
{
- TypeName *local_node;
+ TypeName *local_node;
char *token;
int length;
@@ -1574,7 +1575,7 @@ _readTypeName(void)
local_node->typmod = atoi(token);
token = pg_strtok(&length); /* eat :arrayBounds */
- local_node->arrayBounds = nodeRead(true); /* now read it */
+ local_node->arrayBounds = nodeRead(true); /* now read it */
return local_node;
}
@@ -1582,20 +1583,20 @@ _readTypeName(void)
static ExprFieldSelect *
_readExprFieldSelect(void)
{
- ExprFieldSelect *local_node;
+ ExprFieldSelect *local_node;
char *token;
int length;
local_node = makeNode(ExprFieldSelect);
token = pg_strtok(&length); /* eat :arg */
- local_node->arg = nodeRead(true); /* now read it */
+ local_node->arg = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :fields */
- local_node->fields = nodeRead(true); /* now read it */
+ local_node->fields = nodeRead(true); /* now read it */
token = pg_strtok(&length); /* eat :indirection */
- local_node->indirection = nodeRead(true); /* now read it */
+ local_node->indirection = nodeRead(true); /* now read it */
return local_node;
}
@@ -1614,7 +1615,7 @@ _readAlias(void)
local_node->aliasname = debackslash(token, length);
token = pg_strtok(&length); /* eat :colnames */
- local_node->colnames = nodeRead(true); /* now read it */
+ local_node->colnames = nodeRead(true); /* now read it */
return local_node;
}
@@ -1671,7 +1672,7 @@ _readRangeTblEntry(void)
local_node->jointype = (JoinType) atoi(token);
token = pg_strtok(&length); /* eat :joinaliasvars */
- local_node->joinaliasvars = nodeRead(true); /* now read it */
+ local_node->joinaliasvars = nodeRead(true); /* now read it */
break;
default: