Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcb3ce64

Browse files
committed
Cleanup of prototypes. FIx for PQtrace start/stop several times.
1 parentd8972c6 commitcb3ce64

File tree

5 files changed

+34
-64
lines changed

5 files changed

+34
-64
lines changed

‎src/backend/executor/execMain.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.37 1998/01/07 21:02:39 momjian Exp $
29+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.38 1998/01/14 15:48:09 momjian Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -57,28 +57,22 @@
5757

5858

5959
/* decls for local routines only used within this module */
60-
staticvoid
61-
ExecCheckPerms(CmdTypeoperation,intresultRelation,List*rangeTable,
60+
staticvoidExecCheckPerms(CmdTypeoperation,intresultRelation,List*rangeTable,
6261
Query*parseTree);
63-
staticTupleDesc
64-
InitPlan(CmdTypeoperation,Query*parseTree,
62+
staticTupleDescInitPlan(CmdTypeoperation,Query*parseTree,
6563
Plan*plan,EState*estate);
6664
staticvoidEndPlan(Plan*plan,EState*estate);
67-
staticTupleTableSlot*
68-
ExecutePlan(EState*estate,Plan*plan,
65+
staticTupleTableSlot*ExecutePlan(EState*estate,Plan*plan,
6966
Query*parseTree,CmdTypeoperation,
7067
intnumberTuples,ScanDirectiondirection,
7168
void (*printfunc) ());
7269
staticvoidExecRetrieve(TupleTableSlot*slot,void (*printfunc) (),
7370
EState*estate);
74-
staticvoid
75-
ExecAppend(TupleTableSlot*slot,ItemPointertupleid,
71+
staticvoidExecAppend(TupleTableSlot*slot,ItemPointertupleid,
7672
EState*estate);
77-
staticvoid
78-
ExecDelete(TupleTableSlot*slot,ItemPointertupleid,
73+
staticvoidExecDelete(TupleTableSlot*slot,ItemPointertupleid,
7974
EState*estate);
80-
staticvoid
81-
ExecReplace(TupleTableSlot*slot,ItemPointertupleid,
75+
staticvoidExecReplace(TupleTableSlot*slot,ItemPointertupleid,
8276
EState*estate,Query*parseTree);
8377

8478
/* end of local decls */

‎src/backend/optimizer/plan/setrefs.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.12 1998/01/07 21:04:13 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.13 1998/01/14 15:48:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -36,11 +36,9 @@
3636
staticvoidset_join_tlist_references(Join*join);
3737
staticvoidset_tempscan_tlist_references(SeqScan*tempscan);
3838
staticvoidset_temp_tlist_references(Temp*temp);
39-
staticList*
40-
replace_clause_joinvar_refs(Expr*clause,
39+
staticList*replace_clause_joinvar_refs(Expr*clause,
4140
List*outer_tlist,List*inner_tlist);
42-
staticList*
43-
replace_subclause_joinvar_refs(List*clauses,
41+
staticList*replace_subclause_joinvar_refs(List*clauses,
4442
List*outer_tlist,List*inner_tlist);
4543
staticVar*replace_joinvar_refs(Var*var,List*outer_tlist,List*inner_tlist);
4644
staticList*tlist_temp_references(Oidtempid,List*tlist);

‎src/backend/utils/cache/relcache.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.32 1998/01/07 21:06:13 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.33 1998/01/14 15:48:32 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -257,14 +257,11 @@ static HeapTuple ScanPgRelation(RelationBuildDescInfo buildinfo);
257257
staticHeapTuplescan_pg_rel_seq(RelationBuildDescInfobuildinfo);
258258
staticHeapTuplescan_pg_rel_ind(RelationBuildDescInfobuildinfo);
259259
staticRelationAllocateRelationDesc(u_intnatts,Form_pg_classrelp);
260-
staticvoid
261-
RelationBuildTupleDesc(RelationBuildDescInfobuildinfo,
260+
staticvoidRelationBuildTupleDesc(RelationBuildDescInfobuildinfo,
262261
Relationrelation,u_intnatts);
263-
staticvoid
264-
build_tupdesc_seq(RelationBuildDescInfobuildinfo,
262+
staticvoidbuild_tupdesc_seq(RelationBuildDescInfobuildinfo,
265263
Relationrelation,u_intnatts);
266-
staticvoid
267-
build_tupdesc_ind(RelationBuildDescInfobuildinfo,
264+
staticvoidbuild_tupdesc_ind(RelationBuildDescInfobuildinfo,
268265
Relationrelation,u_intnatts);
269266
staticRelationRelationBuildDesc(RelationBuildDescInfobuildinfo);
270267
staticvoidIndexedAccessMethodInitialize(Relationrelation);

‎src/include/executor/executor.h

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: executor.h,v 1.16 1997/11/26 03:54:23 momjian Exp $
9+
* $Id: executor.h,v 1.17 1998/01/14 15:48:43 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -26,14 +26,12 @@
2626
/*
2727
* prototypes from functions in execAmi.c
2828
*/
29-
externvoid
30-
ExecOpenScanR(OidrelOid,intnkeys,ScanKeyskeys,boolisindex,
29+
externvoidExecOpenScanR(OidrelOid,intnkeys,ScanKeyskeys,boolisindex,
3130
ScanDirectiondir,Relation*returnRelation,
3231
Pointer*returnScanDesc);
3332
externvoidExecCloseR(Plan*node);
3433
externvoidExecReScan(Plan*node,ExprContext*exprCtxt,Plan*parent);
35-
externHeapScanDesc
36-
ExecReScanR(RelationrelDesc,HeapScanDescscanDesc,
34+
externHeapScanDescExecReScanR(RelationrelDesc,HeapScanDescscanDesc,
3735
ScanDirectiondirection,intnkeys,ScanKeyskeys);
3836
externvoidExecMarkPos(Plan*node);
3937
externvoidExecRestrPos(Plan*node);
@@ -43,8 +41,7 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid);
4341
* prototypes from functions in execJunk.c
4442
*/
4543
externJunkFilter*ExecInitJunkFilter(List*targetList);
46-
externbool
47-
ExecGetJunkAttribute(JunkFilter*junkfilter,TupleTableSlot*slot,
44+
externboolExecGetJunkAttribute(JunkFilter*junkfilter,TupleTableSlot*slot,
4845
char*attrName,Datum*value,bool*isNull);
4946
externHeapTupleExecRemoveJunk(JunkFilter*junkfilter,TupleTableSlot*slot);
5047

@@ -71,20 +68,16 @@ extern void ExecEndNode(Plan *node, Plan *parent);
7168
externboolexecConstByVal;
7269
externintexecConstLen;
7370

74-
externDatum
75-
ExecExtractResult(TupleTableSlot*slot,AttrNumberattnum,
71+
externDatumExecExtractResult(TupleTableSlot*slot,AttrNumberattnum,
7672
bool*isNull);
77-
externDatum
78-
ExecEvalParam(Param*expression,ExprContext*econtext,
73+
externDatumExecEvalParam(Param*expression,ExprContext*econtext,
7974
bool*isNull);
8075

8176
/* stop here */
8277
externchar*GetAttributeByNum(TupleTableSlot*slot,AttrNumberattrno,
8378
bool*isNull);
84-
externchar*
85-
GetAttributeByName(TupleTableSlot*slot,char*attname,bool*isNull);
86-
externDatum
87-
ExecEvalExpr(Node*expression,ExprContext*econtext,bool*isNull,
79+
externchar*GetAttributeByName(TupleTableSlot*slot,char*attname,bool*isNull);
80+
externDatumExecEvalExpr(Node*expression,ExprContext*econtext,bool*isNull,
8881
bool*isDone);
8982
externboolExecQual(List*qual,ExprContext*econtext);
9083
externintExecTargetListLength(List*targetlist);
@@ -101,22 +94,19 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
10194
externTupleTableExecCreateTupleTable(intinitialSize);
10295
externvoidExecDestroyTupleTable(TupleTabletable,boolshouldFree);
10396
externTupleTableSlot*ExecAllocTableSlot(TupleTabletable);
104-
externTupleTableSlot*
105-
ExecStoreTuple(HeapTupletuple,
97+
externTupleTableSlot*ExecStoreTuple(HeapTupletuple,
10698
TupleTableSlot*slot,
10799
Bufferbuffer,
108100
boolshouldFree);
109101
externTupleTableSlot*ExecClearTuple(TupleTableSlot*slot);
110102
externboolExecSetSlotPolicy(TupleTableSlot*slot,boolshouldFree);
111-
externTupleDesc
112-
ExecSetSlotDescriptor(TupleTableSlot*slot,
103+
externTupleDescExecSetSlotDescriptor(TupleTableSlot*slot,
113104
TupleDesctupdesc);
114105
externvoidExecSetSlotDescriptorIsNew(TupleTableSlot*slot,boolisNew);
115106
externvoidExecIncrSlotBufferRefcnt(TupleTableSlot*slot);
116107
externboolTupIsNull(TupleTableSlot*slot);
117108
externvoidExecInitResultTupleSlot(EState*estate,CommonState*commonstate);
118-
externvoid
119-
ExecInitScanTupleSlot(EState*estate,
109+
externvoidExecInitScanTupleSlot(EState*estate,
120110
CommonScanState*commonscanstate);
121111
externvoidExecInitMarkedTupleSlot(EState*estate,MergeJoinState*mergestate);
122112
externvoidExecInitOuterTupleSlot(EState*estate,HashJoinState*hashstate);
@@ -128,39 +118,31 @@ extern TupleDesc ExecTypeFromTL(List *targetList);
128118
* prototypes from functions in execTuples.c
129119
*/
130120
externvoidResetTupleCount(void);
131-
externvoid
132-
ExecAssignNodeBaseInfo(EState*estate,CommonState*basenode,
121+
externvoidExecAssignNodeBaseInfo(EState*estate,CommonState*basenode,
133122
Plan*parent);
134123
externvoidExecAssignExprContext(EState*estate,CommonState*commonstate);
135-
externvoid
136-
ExecAssignResultType(CommonState*commonstate,
124+
externvoidExecAssignResultType(CommonState*commonstate,
137125
TupleDesctupDesc);
138-
externvoid
139-
ExecAssignResultTypeFromOuterPlan(Plan*node,
126+
externvoidExecAssignResultTypeFromOuterPlan(Plan*node,
140127
CommonState*commonstate);
141128
externvoidExecAssignResultTypeFromTL(Plan*node,CommonState*commonstate);
142129
externTupleDescExecGetResultType(CommonState*commonstate);
143130
externvoidExecAssignProjectionInfo(Plan*node,CommonState*commonstate);
144131
externvoidExecFreeProjectionInfo(CommonState*commonstate);
145132
externTupleDescExecGetScanType(CommonScanState*csstate);
146-
externvoid
147-
ExecAssignScanType(CommonScanState*csstate,
133+
externvoidExecAssignScanType(CommonScanState*csstate,
148134
TupleDesctupDesc);
149-
externvoid
150-
ExecAssignScanTypeFromOuterPlan(Plan*node,
135+
externvoidExecAssignScanTypeFromOuterPlan(Plan*node,
151136
CommonScanState*csstate);
152137
externAttributeTupleFormExecGetTypeInfo(RelationrelDesc);
153138

154-
externvoid
155-
ExecOpenIndices(OidresultRelationOid,
139+
externvoidExecOpenIndices(OidresultRelationOid,
156140
RelationInfo*resultRelationInfo);
157141
externvoidExecCloseIndices(RelationInfo*resultRelationInfo);
158-
externvoid
159-
ExecInsertIndexTuples(TupleTableSlot*slot,ItemPointertupleid,
142+
externvoidExecInsertIndexTuples(TupleTableSlot*slot,ItemPointertupleid,
160143
EState*estate,boolis_update);
161144
externvoidresetVarAttrLenForCreateTable(TupleDesctupType);
162-
externvoid
163-
setVarAttrLenForCreateTable(TupleDesctupType,
145+
externvoidsetVarAttrLenForCreateTable(TupleDesctupType,
164146
List*targetList,List*rangeTable);
165147

166148

‎src/interfaces/libpq/fe-connect.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.55 1998/01/13 14:57:25 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.56 1998/01/14 15:48:51 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1331,7 +1331,6 @@ PQuntrace(PGconn *conn)
13311331
if (conn->Pfdebug)
13321332
{
13331333
fflush(conn->Pfdebug);
1334-
fclose(conn->Pfdebug);
13351334
conn->Pfdebug=NULL;
13361335
}
13371336
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp