Cleanups needed for indent.

diff --git a/src/PGINDENT b/src/PGINDENT
index 06db6185a6b6321edaf61e776505677c850976e0..ff694efb2971df4cedaab9957ba62fad5d5e75b7 100644 (file)
--- a/src/PGINDENT
+++ b/src/PGINDENT
@@ -16,8 +16,8 @@ for FILE
 do
        cat $FILE |
        sed 's;/\*  *---;/*---X_X;g' |
-       sed 's;[        ]else[  ]*\(/\*.*\)$;else\
-\1;g' | # workaround for indent bug
+       sed 's;\([}     ]\)else[        ]*\(/\*.*\)$;\1else\
+\2;g' | # workaround for indent bug
        detab -t4 -qc >/tmp/$$a
        indent -bad -bap -bbb -bc -bl -d0 -cdb -nce -cli1 -di16 -nfc1 \
                -lp -nip -nbc -psl -di1 -i4 -l75 -npro /tmp/$$a >/tmp/$$ 2>&1

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 5829fb0e0eaff88a453efc84bc03a64054678602..663678140c363ed006829877ccb88889cdeb7907 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.4 1997/09/05 19:32:28 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.5 1997/09/05 19:59:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -380,11 +380,11 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
            tletype = (Oid) ((Var*)thenode)->vartype;
        else if (IsA(thenode,Const))
            tletype = (Oid) ((Const*)thenode)->consttype;
-       else if (IsA(thenode,Param)) {
+       else if (IsA(thenode,Param))
            tletype = (Oid) ((Param*)thenode)->paramtype;
-       else if (IsA(thenode,Expr)) {
+       else if (IsA(thenode,Expr))
            tletype = Expr;
-       } else if (IsA(thenode,LispList)) {
+       else if (IsA(thenode,LispList)) {
            thenode = lfirst(thenode);
            if (IsA(thenode,Oper))
                tletype = (Oid) get_opresulttype((Oper*)thenode);