Small code cleanups,formatting.

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index f456e0c9306f4f3c191d75172463bf852e905041..b714296c8f72cbba1cbf0f8a3950f13c4b9c49d3 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.80 2001/05/07 00:43:16 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.81 2001/05/18 21:24:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,10 +57,8 @@ btbuild(PG_FUNCTION_ARGS)
    Relation    index = (Relation) PG_GETARG_POINTER(1);
    IndexInfo  *indexInfo = (IndexInfo *) PG_GETARG_POINTER(2);
    Node       *oldPred = (Node *) PG_GETARG_POINTER(3);
-
 #ifdef NOT_USED
    IndexStrategy istrat = (IndexStrategy) PG_GETARG_POINTER(4);
-
 #endif
    HeapScanDesc hscan;
    HeapTuple   htup;
@@ -72,11 +70,9 @@ btbuild(PG_FUNCTION_ARGS)
    double      nhtups,
                nitups;
    Node       *pred = indexInfo->ii_Predicate;
-
 #ifndef OMIT_PARTIAL_INDEX
    TupleTable  tupleTable;
    TupleTableSlot *slot;
-
 #endif
    ExprContext *econtext;
    InsertIndexResult res = NULL;

diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 346c599c7f2570a1da4db3487726eb2ad69e83e1..98a6e351476f06e917c8fcdf2c717c794ffc2727 100644 (file)
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.54 2001/03/22 06:16:11 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.55 2001/05/18 21:24:18 momjian Exp $
  *
  * DESCRIPTION
  *   The "DefineFoo" routines take the parse tree and pick out the
@@ -384,15 +384,15 @@ DefineOperator(char *oprName,
        if (strcasecmp(defel->defname, "leftarg") == 0)
        {
            typeName1 = defGetString(defel);
-           if (IsA(defel->arg, TypeName)
-               &&((TypeName *) defel->arg)->setof)
+           if (IsA(defel->arg, TypeName) &&
+               ((TypeName *) defel->arg)->setof)
                elog(ERROR, "setof type not implemented for leftarg");
        }
        else if (strcasecmp(defel->defname, "rightarg") == 0)
        {
            typeName2 = defGetString(defel);
-           if (IsA(defel->arg, TypeName)
-               &&((TypeName *) defel->arg)->setof)
+           if (IsA(defel->arg, TypeName) &&
+               ((TypeName *) defel->arg)->setof)
                elog(ERROR, "setof type not implemented for rightarg");
        }
        else if (strcasecmp(defel->defname, "procedure") == 0)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index afb7851af3e8e5a987f66d3ec85c8897065dbc45..8ec2bd07fdd3ded8fd0604b93e82c6f92c7f82fe 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.192 2001/05/17 15:55:24 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.193 2001/05/18 21:24:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -836,7 +836,9 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
                 * If tuple is recently deleted then we must not remove it
                 * from relation.
                 */
-               if (tupgone && (tuple.t_data->t_infomask & HEAP_XMIN_INVALID) == 0 && tuple.t_data->t_xmax >= XmaxRecent)
+               if (tupgone &&
+                   (tuple.t_data->t_infomask & HEAP_XMIN_INVALID) == 0 &&
+                   tuple.t_data->t_xmax >= XmaxRecent)
                {
                    tupgone = false;
                    nkeep++;

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index c5d9b484c6cf899a5eb0d90c12314a992421000f..4afd395f5a80a4160910de4e51d8cc86145ace00 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.185 2001/05/09 21:10:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.186 2001/05/18 21:24:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -232,6 +232,7 @@ transformStmt(ParseState *pstate, Node *parseTree)
                                               (SelectStmt *) parseTree);
            break;
 
+
        default:
 
            /*
@@ -1224,7 +1225,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
                                break;
                        }
                    }
-                   if (!found) 
+                   if (!found)
                        break;
                }
                if (!found)
@@ -1261,16 +1262,16 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
                        pkattr->isRel = false;
                        fkconstraint->pk_attrs = lappend(fkconstraint->pk_attrs, pkattr);
                        foreach (findattr, stmt->tableElts) {
-                                                   col=lfirst(findattr);
-                                                   if (strcmp(col->colname, ielem->name)==0) {
+                                                   col=lfirst(findattr);
+                                                   if (strcmp(col->colname, ielem->name)==0) {
                                char *buff=TypeNameToInternalName(col->typename);
                                Oid type=typenameTypeId(buff);
-                                                           if (!OidIsValid(type)) {
-                                                                   elog(ERROR, "Unable to lookup type %s", col->typename->name);
-                                                           }
-                                                           pktypoid[attnum++]=type; /* need to convert typename */
-                                                           break;
-                                                   }
+                                                           if (!OidIsValid(type)) {
+                                                                   elog(ERROR, "Unable to lookup type %s", col->typename->name);
+                                                           }
+                                                           pktypoid[attnum++]=type; /* need to convert typename */
+                                                           break;
+                                                   }
                        }
                    }
                }
@@ -1959,8 +1960,7 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
  * The tree of set operations is converted into the setOperations field of
  * the top-level Query.
  */
-static Query *
-transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt)
+static Query *transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt)
 {
    Query      *qry = makeNode(Query);
    SelectStmt *leftmostSelect;

diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 1e9deba73fe54b28cc969cc4f4959fcac9b5cff8..02c6a4ac8c77cf0309968e8d943fe97b916d36e6 100644 (file)
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.79 2001/03/22 06:16:16 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.80 2001/05/18 21:24:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -843,7 +843,7 @@ findTargetlistEntry(ParseState *pstate, Node *node, List *tlist, int clause)
     * an expression.
     *----------
     */
-   if (IsA(node, Ident) &&((Ident *) node)->indirection == NIL)
+   if (IsA(node, Ident) && ((Ident *) node)->indirection == NIL)
    {
        char       *name = ((Ident *) node)->name;
 

diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 9c60b17cf8c414b03a762fc29a52e9ff97440414..509f1921f9fe91521207c64704ba7f745442c52b 100644 (file)
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.92 2001/03/22 03:59:41 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.93 2001/05/18 21:24:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -573,7 +573,7 @@ transformIdent(ParseState *pstate, Ident *ident, int precedence)
     * appear
     */
    if (ident->indirection == NIL &&
-    refnameRangeOrJoinEntry(pstate, ident->name, &sublevels_up) != NULL)
+       refnameRangeOrJoinEntry(pstate, ident->name, &sublevels_up) != NULL)
    {
        ident->isRel = TRUE;
        result = (Node *) ident;

diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 947dcdcee581f3777a85b062317bab46e2f875c7..a609a30c0e28385b47815837e5bbe1b73c8d4d60 100644 (file)
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.102 2001/04/18 22:25:31 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.103 2001/05/18 21:24:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -287,7 +287,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
    if (nargs == 1 && !must_be_agg)
    {
        /* Is it a plain Relation name from the parser? */
-       if (IsA(first_arg, Ident) &&((Ident *) first_arg)->isRel)
+       if (IsA(first_arg, Ident) && ((Ident *) first_arg)->isRel)
        {
            Ident      *ident = (Ident *) first_arg;
 
@@ -347,7 +347,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
        if (nargs != 1)
            elog(ERROR, "Aggregate functions may only have one parameter");
        /* Agg's argument can't be a relation name, either */
-       if (IsA(first_arg, Ident) &&((Ident *) first_arg)->isRel)
+       if (IsA(first_arg, Ident) && ((Ident *) first_arg)->isRel)
            elog(ERROR, "Aggregate functions cannot be applied to relation names");
        could_be_agg = true;
    }
@@ -355,7 +355,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
    {
        /* Try to parse as an aggregate if above-mentioned checks are OK */
        could_be_agg = (nargs == 1) &&
-           !(IsA(first_arg, Ident) &&((Ident *) first_arg)->isRel);
+           !(IsA(first_arg, Ident) && ((Ident *) first_arg)->isRel);
    }
 
    if (could_be_agg)
@@ -434,7 +434,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
    {
        Node       *arg = lfirst(i);
 
-       if (IsA(arg, Ident) &&((Ident *) arg)->isRel)
+       if (IsA(arg, Ident) && ((Ident *) arg)->isRel)
        {
            RangeTblEntry *rte;
            int         vnum;

diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 6b46345c717ea573c7a3baf9579c82da451cdb69..f39b8f8c648284cfb31a7bd94bf8202b798088a3 100644 (file)
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.30 2001/05/07 17:20:19 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.31 2001/05/18 21:24:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -235,7 +235,7 @@ TransactionIdIsInProgress(TransactionId xid)
 
 /*
  * GetXmaxRecent -- returns oldest transaction that was running
- *                 when all current transaction was started.
+ *                 when all current transaction were started.
  *                 It's used by vacuum to decide what deleted
  *                 tuples must be preserved in a table.
  */