Cleanup of prototypes. FIx for PQtrace start/stop several times.

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 5d22d5d6f615a651ae1112d4ff9388c1dbeef539..b4716cc2bb5fe6c6c12ab8b455d006e4e0bca676 100644 (file)
--- 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.37 1998/01/07 21:02:39 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.38 1998/01/14 15:48:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,28 +57,22 @@
 
 
 /* decls for local routines only used within this module */
-static void
-ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
+static void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
                           Query *parseTree);
-static TupleDesc
-InitPlan(CmdType operation, Query *parseTree,
+static TupleDesc InitPlan(CmdType operation, Query *parseTree,
                 Plan *plan, EState *estate);
 static void EndPlan(Plan *plan, EState *estate);
-static TupleTableSlot *
-ExecutePlan(EState *estate, Plan *plan,
+static TupleTableSlot * ExecutePlan(EState *estate, Plan *plan,
                        Query *parseTree, CmdType operation,
                        int numberTuples, ScanDirection direction,
                        void (*printfunc) ());
 static void ExecRetrieve(TupleTableSlot *slot, void (*printfunc) (),
                                                                         EState *estate);
-static void
-ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
+static void ExecAppend(TupleTableSlot *slot, ItemPointer tupleid,
                   EState *estate);
-static void
-ExecDelete(TupleTableSlot *slot, ItemPointer tupleid,
+static void ExecDelete(TupleTableSlot *slot, ItemPointer tupleid,
                   EState *estate);
-static void
-ExecReplace(TupleTableSlot *slot, ItemPointer tupleid,
+static void ExecReplace(TupleTableSlot *slot, ItemPointer tupleid,
                        EState *estate, Query *parseTree);
 
 /* end of local decls */

diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 96c6f44b09952570c1895a5460104045fd864e05..55ed1fed2f0169f1b2014a674b403f2d2a861be8 100644 (file)
--- 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.12 1998/01/07 21:04:13 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.13 1998/01/14 15:48:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,11 +36,9 @@
 static void set_join_tlist_references(Join *join);
 static void set_tempscan_tlist_references(SeqScan *tempscan);
 static void set_temp_tlist_references(Temp *temp);
-static List *
-replace_clause_joinvar_refs(Expr *clause,
+static List *replace_clause_joinvar_refs(Expr *clause,
                                                        List *outer_tlist, List *inner_tlist);
-static List *
-replace_subclause_joinvar_refs(List *clauses,
+static List *replace_subclause_joinvar_refs(List *clauses,
                                                           List *outer_tlist, List *inner_tlist);
 static Var *replace_joinvar_refs(Var *var, List *outer_tlist, List *inner_tlist);
 static List *tlist_temp_references(Oid tempid, List *tlist);

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a24b32addca21f818614f4654cc800a011f74dbf..90bd2fbac8f0369e94bd48f9ecb55665d8c6ee51 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.32 1998/01/07 21:06:13 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.33 1998/01/14 15:48:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -257,14 +257,11 @@ static HeapTuple ScanPgRelation(RelationBuildDescInfo buildinfo);
 static HeapTuple scan_pg_rel_seq(RelationBuildDescInfo buildinfo);
 static HeapTuple scan_pg_rel_ind(RelationBuildDescInfo buildinfo);
 static Relation AllocateRelationDesc(u_int natts, Form_pg_class relp);
-static void
-RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,
+static void RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,
                                           Relation relation, u_int natts);
-static void
-build_tupdesc_seq(RelationBuildDescInfo buildinfo,
+static void build_tupdesc_seq(RelationBuildDescInfo buildinfo,
                                  Relation relation, u_int natts);
-static void
-build_tupdesc_ind(RelationBuildDescInfo buildinfo,
+static void build_tupdesc_ind(RelationBuildDescInfo buildinfo,
                                  Relation relation, u_int natts);
 static Relation RelationBuildDesc(RelationBuildDescInfo buildinfo);
 static void IndexedAccessMethodInitialize(Relation relation);

diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index c0d0200686023552d0f8781c0c5b1de1a913e864..68550ff2aafdf2745abe8024220d05fa6b5a49e7 100644 (file)
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.16 1997/11/26 03:54:23 momjian Exp $
+ * $Id: executor.h,v 1.17 1998/01/14 15:48:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,14 +26,12 @@
 /*
  * prototypes from functions in execAmi.c
  */
-extern void
-ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
+extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex,
                          ScanDirection dir, Relation *returnRelation,
                          Pointer *returnScanDesc);
 extern void ExecCloseR(Plan *node);
 extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent);
-extern HeapScanDesc
-ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
+extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc,
                        ScanDirection direction, int nkeys, ScanKey skeys);
 extern void ExecMarkPos(Plan *node);
 extern void ExecRestrPos(Plan *node);
@@ -43,8 +41,7 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
  * prototypes from functions in execJunk.c
  */
 extern JunkFilter *ExecInitJunkFilter(List *targetList);
-extern bool
-ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
+extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot,
                                         char *attrName, Datum *value, bool *isNull);
 extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
 
@@ -71,20 +68,16 @@ extern void ExecEndNode(Plan *node, Plan *parent);
 extern bool execConstByVal;
 extern int     execConstLen;
 
-extern Datum
-ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
+extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum,
                                  bool *isNull);
-extern Datum
-ExecEvalParam(Param *expression, ExprContext *econtext,
+extern Datum ExecEvalParam(Param *expression, ExprContext *econtext,
                          bool *isNull);
 
 /* stop here */
 extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
                         bool *isNull);
-extern char *
-GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull);
-extern Datum
-ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
+extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull);
+extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull,
                         bool *isDone);
 extern bool ExecQual(List *qual, ExprContext *econtext);
 extern int     ExecTargetListLength(List *targetlist);
@@ -101,22 +94,19 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
 extern TupleTable ExecCreateTupleTable(int initialSize);
 extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree);
 extern TupleTableSlot *ExecAllocTableSlot(TupleTable table);
-extern TupleTableSlot *
-ExecStoreTuple(HeapTuple tuple,
+extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple,
                           TupleTableSlot *slot,
                           Buffer buffer,
                           bool shouldFree);
 extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
 extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
-extern TupleDesc
-ExecSetSlotDescriptor(TupleTableSlot *slot,
+extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
                                          TupleDesc tupdesc);
 extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
 extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot);
 extern bool TupIsNull(TupleTableSlot *slot);
 extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
-extern void
-ExecInitScanTupleSlot(EState *estate,
+extern void ExecInitScanTupleSlot(EState *estate,
                                          CommonScanState *commonscanstate);
 extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
 extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
@@ -128,39 +118,31 @@ extern TupleDesc ExecTypeFromTL(List *targetList);
  * prototypes from functions in execTuples.c
  */
 extern void ResetTupleCount(void);
-extern void
-ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
+extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode,
                                           Plan *parent);
 extern void ExecAssignExprContext(EState *estate, CommonState *commonstate);
-extern void
-ExecAssignResultType(CommonState *commonstate,
+extern void ExecAssignResultType(CommonState *commonstate,
                                         TupleDesc tupDesc);
-extern void
-ExecAssignResultTypeFromOuterPlan(Plan *node,
+extern void ExecAssignResultTypeFromOuterPlan(Plan *node,
                                                                  CommonState *commonstate);
 extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate);
 extern TupleDesc ExecGetResultType(CommonState *commonstate);
 extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate);
 extern void ExecFreeProjectionInfo(CommonState *commonstate);
 extern TupleDesc ExecGetScanType(CommonScanState *csstate);
-extern void
-ExecAssignScanType(CommonScanState *csstate,
+extern void ExecAssignScanType(CommonScanState *csstate,
                                   TupleDesc tupDesc);
-extern void
-ExecAssignScanTypeFromOuterPlan(Plan *node,
+extern void ExecAssignScanTypeFromOuterPlan(Plan *node,
                                                                CommonScanState *csstate);
 extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
 
-extern void
-ExecOpenIndices(Oid resultRelationOid,
+extern void ExecOpenIndices(Oid resultRelationOid,
                                RelationInfo *resultRelationInfo);
 extern void ExecCloseIndices(RelationInfo *resultRelationInfo);
-extern void
-ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
+extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid,
                                          EState *estate, bool is_update);
 extern void resetVarAttrLenForCreateTable(TupleDesc tupType);
-extern void
-setVarAttrLenForCreateTable(TupleDesc tupType,
+extern void setVarAttrLenForCreateTable(TupleDesc tupType,
                                                        List *targetList, List *rangeTable);
 
 

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index e5e908acccf4befa0cf6eebb303dadadf89f3f61..2ca6373dd2ca8e787d709f53aba8461dc816d190 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.55 1998/01/13 14:57:25 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.56 1998/01/14 15:48:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1331,7 +1331,6 @@ PQuntrace(PGconn *conn)
        if (conn->Pfdebug)
        {
                fflush(conn->Pfdebug);
-               fclose(conn->Pfdebug);
                conn->Pfdebug = NULL;
        }
 }