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

Commit173c555

Browse files
committed
Make functions static or ifdef NOT_USED. Prevent pg_version creation.
1 parent0a1c280 commit173c555

File tree

52 files changed

+173
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+173
-164
lines changed

‎src/backend/access/common/heaptuple.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.44 1998/09/07 05:35:27 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.45 1998/10/08 18:29:10 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -274,6 +274,7 @@ heap_sysattrbyval(AttrNumber attno)
274274
returnbyval;
275275
}
276276

277+
#ifdefNOT_USED
277278
/* ----------------
278279
*heap_getsysattr
279280
* ----------------
@@ -300,6 +301,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
300301
}
301302
return (Datum)NULL;
302303
}
304+
#endif
303305

304306
/* ----------------
305307
*nocachegetattr

‎src/backend/access/heap/heapam.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.35 1998/09/01 04:26:51 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.36 1998/10/08 18:29:12 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -96,6 +96,8 @@
9696
#include<string.h>
9797
#endif
9898

99+
staticvoiddoinsert(Relationrelation,HeapTupletup);
100+
99101
staticboolImmediateInvalidation;
100102

101103
/* ----------------------------------------------------------------
@@ -475,7 +477,7 @@ heapgettup(Relation relation,
475477
}
476478
}
477479

478-
void
480+
staticvoid
479481
doinsert(Relationrelation,HeapTupletup)
480482
{
481483
RelationPutHeapTupleAtEnd(relation,tup);

‎src/backend/access/index/genam.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/access/index/genam.c,v 1.14 1998/09/01 03:21:07 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.15 1998/10/08 18:29:14 momjian Exp $
1111
*
1212
* NOTES
1313
* many of the old access method routines have been turned into
@@ -167,9 +167,6 @@ IndexScanRestart(IndexScanDesc scan,
167167
scan->numberOfKeys*sizeof(ScanKeyData));
168168
}
169169

170-
#endif
171-
172-
#ifdefNOT_USED
173170
/* ----------------
174171
*IndexScanEnd -- End and index scan.
175172
*
@@ -192,7 +189,6 @@ IndexScanEnd(IndexScanDesc scan)
192189
pfree(scan);
193190
}
194191

195-
#endif
196192

197193
/* ----------------
198194
*IndexScanMarkPosition -- Mark current position in a scan.
@@ -274,3 +270,5 @@ IndexScanRestorePosition(IndexScanDesc scan)
274270

275271
scan->flags=0x0;/* XXX should have a symbolic name */
276272
}
273+
#endif
274+

‎src/backend/access/transam/xact.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.24 1998/10/06 02:39:58 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.25 1998/10/08 18:29:15 momjian Exp $
1111
*
1212
* NOTES
1313
*Transaction aborts can now occur two ways:
@@ -262,7 +262,6 @@ SetTransactionFlushEnabled(bool state)
262262
TransactionFlushState= (state== true);
263263
}
264264

265-
#endif
266265

267266
/* --------------------------------
268267
*IsTransactionState
@@ -297,6 +296,7 @@ IsTransactionState(void)
297296
*/
298297
return false;
299298
}
299+
#endif
300300

301301
/* --------------------------------
302302
*IsAbortedTransactionBlockState

‎src/backend/access/transam/xid.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.17 1998/09/01 03:21:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
1111
*
1212
* OLD COMMENTS
1313
* XXX WARNING
@@ -53,6 +53,7 @@ xidout(TransactionId transactionId)
5353

5454
}
5555

56+
#ifdefNOT_USED
5657
/* ----------------------------------------------------------------
5758
*TransactionIdIsLessThan
5859
* ----------------------------------------------------------------
@@ -62,6 +63,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
6263
{
6364
return (bool) (id1<id2);
6465
}
66+
#endif
6567

6668
/* ----------------------------------------------------------------
6769
*xideq

‎src/backend/catalog/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.13 1998/08/25 04:19:14 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.14 1998/10/08 18:29:19 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -31,7 +31,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
3131

3232
LOCALBKI_SRCS=$(addprefix ../../include/catalog/, \
3333
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
34-
pg_inherits.h pg_index.hpg_version.hpg_statistic.h \
34+
pg_inherits.h pg_index.h pg_statistic.h \
3535
pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
3636
pg_language.h pg_parg.h \
3737
pg_aggregate.h pg_ipl.h pg_inheritproc.h \

‎src/backend/commands/variable.c‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Routines for handling of 'SET var TO',
33
*'SHOW var' and 'RESET var' statements.
44
*
5-
* $Id: variable.c,v 1.13 1998/09/03 02:34:29 momjian Exp $
5+
* $Id: variable.c,v 1.14 1998/10/08 18:29:20 momjian Exp $
66
*
77
*/
88

@@ -19,6 +19,28 @@
1919
#include"mb/pg_wchar.h"
2020
#endif
2121

22+
staticboolshow_date(void);
23+
staticboolreset_date(void);
24+
staticboolparse_date(constchar*);
25+
staticboolshow_timezone(void);
26+
staticboolreset_timezone(void);
27+
staticboolparse_timezone(constchar*);
28+
staticboolshow_cost_heap(void);
29+
staticboolreset_cost_heap(void);
30+
staticboolparse_cost_heap(constchar*);
31+
staticboolshow_cost_index(void);
32+
staticboolreset_cost_index(void);
33+
staticboolparse_cost_index(constchar*);
34+
staticboolshow_r_plans(void);
35+
staticboolreset_r_plans();
36+
staticboolparse_r_plans(constchar*);
37+
staticboolreset_geqo(void);
38+
staticboolshow_geqo(void);
39+
staticboolparse_geqo(constchar*);
40+
staticboolshow_ksqo(void);
41+
staticboolreset_ksqo(void);
42+
staticboolparse_ksqo(constchar*);
43+
2244
externCost_cpu_page_wight_;
2345
externCost_cpu_index_page_wight_;
2446
externbool_use_geqo_;
@@ -128,7 +150,7 @@ get_token(char **tok, char **val, const char *str)
128150
}
129151

130152
/*-----------------------------------------------------------------------*/
131-
bool
153+
staticbool
132154
parse_geqo(constchar*value)
133155
{
134156
constchar*rest;
@@ -175,7 +197,7 @@ parse_geqo(const char *value)
175197
return TRUE;
176198
}
177199

178-
bool
200+
staticbool
179201
show_geqo()
180202
{
181203

@@ -186,7 +208,7 @@ show_geqo()
186208
return TRUE;
187209
}
188210

189-
bool
211+
staticbool
190212
reset_geqo(void)
191213
{
192214

@@ -199,7 +221,7 @@ reset_geqo(void)
199221
return TRUE;
200222
}
201223

202-
bool
224+
staticbool
203225
parse_r_plans(constchar*value)
204226
{
205227
if (value==NULL)
@@ -219,7 +241,7 @@ parse_r_plans(const char *value)
219241
}
220242

221243
/*-----------------------------------------------------------------------*/
222-
bool
244+
staticbool
223245
show_r_plans()
224246
{
225247

@@ -230,7 +252,7 @@ show_r_plans()
230252
return TRUE;
231253
}
232254

233-
bool
255+
staticbool
234256
reset_r_plans()
235257
{
236258

@@ -243,7 +265,7 @@ reset_r_plans()
243265
}
244266

245267
/*-----------------------------------------------------------------------*/
246-
bool
268+
staticbool
247269
parse_cost_heap(constchar*value)
248270
{
249271
float32res;
@@ -268,15 +290,15 @@ show_cost_heap()
268290
return TRUE;
269291
}
270292

271-
bool
293+
staticbool
272294
reset_cost_heap()
273295
{
274296
_cpu_page_wight_=_CPU_PAGE_WEIGHT_;
275297
return TRUE;
276298
}
277299

278300
/*-----------------------------------------------------------------------*/
279-
bool
301+
staticbool
280302
parse_cost_index(constchar*value)
281303
{
282304
float32res;
@@ -301,15 +323,15 @@ show_cost_index()
301323
return TRUE;
302324
}
303325

304-
bool
326+
staticbool
305327
reset_cost_index()
306328
{
307329
_cpu_index_page_wight_=_CPU_INDEX_PAGE_WEIGHT_;
308330
return TRUE;
309331
}
310332

311333
/*-----------------------------------------------------------------------*/
312-
bool
334+
staticbool
313335
parse_date(constchar*value)
314336
{
315337
char*tok;
@@ -379,7 +401,7 @@ parse_date(const char *value)
379401
return TRUE;
380402
}
381403

382-
bool
404+
staticbool
383405
show_date()
384406
{
385407
charbuf[64];
@@ -431,7 +453,7 @@ static char tzbuf[64];
431453
* Try to save existing TZ environment variable for later use in RESET TIME ZONE.
432454
* - thomas 1997-11-10
433455
*/
434-
bool
456+
staticbool
435457
parse_timezone(constchar*value)
436458
{
437459
char*tok;
@@ -468,7 +490,7 @@ parse_timezone(const char *value)
468490
return TRUE;
469491
}/* parse_timezone() */
470492

471-
bool
493+
staticbool
472494
show_timezone()
473495
{
474496
char*tz;
@@ -625,7 +647,7 @@ indexes when multiple ORs are specified in the where clause.
625647
See optimizer/prep/prepkeyset.c for more on this.
626648
daveh@insightdist.com 6/16/98
627649
-----------------------------------------------------------------------*/
628-
bool
650+
staticbool
629651
parse_ksqo(constchar*value)
630652
{
631653
if (value==NULL)
@@ -644,7 +666,7 @@ parse_ksqo(const char *value)
644666
return TRUE;
645667
}
646668

647-
bool
669+
staticbool
648670
show_ksqo()
649671
{
650672

‎src/backend/executor/execTuples.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.20 1998/09/01 03:22:20 momjian Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.21 1998/10/08 18:29:26 momjian Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -446,7 +446,6 @@ ExecSlotPolicy(TupleTableSlot *slot)/* slot to inspect */
446446
returnslot->ttc_shouldFree;
447447
}
448448

449-
#endif
450449

451450
/* --------------------------------
452451
*ExecSetSlotPolicy
@@ -468,6 +467,7 @@ ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */
468467

469468
returnold_shouldFree;
470469
}
470+
#endif
471471

472472
/* --------------------------------
473473
*ExecSlotDescriptor
@@ -638,6 +638,7 @@ ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate)
638638
commonscanstate->css_ScanTupleSlot= (TupleTableSlot*)slot;
639639
}
640640

641+
#ifdefNOT_USED
641642
/* ----------------
642643
*ExecInitMarkedTupleSlot
643644
* ----------------
@@ -649,6 +650,7 @@ ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate)
649650
INIT_SLOT_ALLOC;
650651
mergestate->mj_MarkedTupleSlot= (TupleTableSlot*)slot;
651652
}
653+
#endif
652654

653655
/* ----------------
654656
*ExecInitOuterTupleSlot

0 commit comments

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