Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit aa907f7

Browse files
scrappyscrappy
committed
-Wall'd
1 parent 8385d55 commit aa907f7

File tree

3 files changed

+145
-35
lines changed

3 files changed

+145
-35
lines changed

‎src/backend/bootstrap/bootparse.y

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,54 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.2 1996/08/13 01:28:27 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.3 1996/10/21 08:31:18 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
15-
#include "access/heapam.h"
16-
#include "access/tupdesc.h"
17-
#include "bootstrap/bootstrap.h"
18-
#include "utils/portal.h"
19-
#include "storage/smgr.h"
15+
16+
#include "postgres.h"
17+
18+
#include "catalog/pg_attribute.h"
19+
#include "access/attnum.h"
2020
#include "nodes/pg_list.h"
21-
#include "catalog/catalog.h"
22-
#include "catalog/catname.h"
21+
#include "access/tupdesc.h"
22+
#include "storage/fd.h"
23+
#include "catalog/pg_am.h"
24+
#include "catalog/pg_class.h"
25+
#include "nodes/nodes.h"
26+
#include "rewrite/prs2lock.h"
27+
#include "access/skey.h"
28+
#include "access/strat.h"
29+
#include "utils/rel.h"
30+
31+
#include "nodes/primnodes.h"
32+
#include <time.h>
33+
#include "utils/nabstime.h"
34+
#include "storage/block.h"
35+
#include "storage/off.h"
36+
#include "storage/itemptr.h"
37+
#include "access/htup.h"
38+
#include "utils/tqual.h"
39+
#include "nodes/parsenodes.h"
40+
41+
#include "access/xact.h"
42+
43+
#include <stdio.h>
44+
2345
#include "catalog/heap.h"
24-
#include "catalog/index.h"
25-
#include "commands/rename.h"
46+
47+
#include "storage/ipc.h"
48+
#include "storage/spin.h"
49+
#include "storage/smgr.h"
50+
51+
#include "tcop/dest.h"
2652
#include "commands/defrem.h"
27-
#include "access/transam.h"
28-
#include "access/xact.h"
53+
54+
#include "access/itup.h"
55+
#include "access/funcindex.h"
56+
#include "bootstrap/bootstrap.h"
57+
58+
#include "miscadmin.h"
2959

3060
#define DO_START { StartTransactionCommand();\
3161
}

‎src/backend/bootstrap/bootscanner.l

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,38 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.2 1996/08/28 07:14:09 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.3 1996/10/21 08:31:21 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515
#include "postgres.h"
16+
17+
#include "storage/block.h"
18+
#include "storage/off.h"
19+
#include "storage/itemptr.h"
20+
#include "catalog/pg_attribute.h"
21+
#include "access/attnum.h"
22+
#include "nodes/pg_list.h"
23+
#include "access/tupdesc.h"
24+
#include "access/itup.h"
25+
#include "access/funcindex.h"
26+
#include "storage/fd.h"
27+
#include "catalog/pg_am.h"
28+
#include "catalog/pg_class.h"
29+
#include "nodes/nodes.h"
30+
#include "rewrite/prs2lock.h"
31+
#include "access/skey.h"
32+
#include "access/strat.h"
33+
#include "utils/rel.h"
1634
#include "bootstrap/bootstrap.h"
17-
#include "utils/portal.h"
18-
#include "access/xact.h"
35+
36+
#include "nodes/primnodes.h"
37+
#include <time.h>
38+
#include "utils/nabstime.h"
39+
#include "access/htup.h"
40+
#include "utils/tqual.h"
41+
#include "nodes/parsenodes.h"
42+
1943
#include "parser/scansup.h"
2044

2145
#include "bootstrap_tokens.h"

‎src/backend/bootstrap/bootstrap.c

Lines changed: 76 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,97 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.7 1996/10/18 05:47:12 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.8 1996/10/21 08:31:23 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include <string.h>
15-
#include <unistd.h>
16-
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
17-
#include <setjmp.h>
18-
1914
#define BOOTSTRAP_INCLUDE /* mask out stuff in tcop/tcopprot.h */
2015

21-
#include "bootstrap/bootstrap.h"
2216
#include "postgres.h"
23-
#include "miscadmin.h"
24-
#include "tcop/tcopprot.h"
2517

26-
#include "access/heapam.h"
27-
#include "access/genam.h"
18+
#include "catalog/pg_attribute.h"
19+
#include "access/attnum.h"
20+
#include "nodes/pg_list.h"
2821
#include "access/tupdesc.h"
29-
#include "utils/builtins.h"
22+
#include "storage/fd.h"
23+
#include "catalog/pg_am.h"
24+
#include "catalog/pg_class.h"
25+
#include "nodes/nodes.h"
26+
#include "rewrite/prs2lock.h"
27+
#include "access/skey.h"
28+
#include "access/strat.h"
3029
#include "utils/rel.h"
30+
31+
#include <time.h>
32+
#include "storage/block.h"
33+
#include "storage/off.h"
34+
#include "storage/itemptr.h"
35+
#include "utils/nabstime.h"
36+
#include "access/htup.h"
3137
#include "utils/tqual.h"
32-
#include "utils/lsyscache.h"
33-
#include "access/xact.h"
34-
#include "utils/exc.h" /* for ExcAbort and <setjmp.h> */
38+
#include "storage/buf.h"
39+
#include "access/relscan.h"
40+
#include "access/heapam.h"
41+
3542
#include "fmgr.h"
36-
#include "utils/palloc.h"
37-
#include "utils/mcxt.h"
38-
#include "storage/smgr.h"
39-
#include "commands/defrem.h"
43+
44+
#include "access/funcindex.h"
45+
46+
#include "nodes/memnodes.h"
47+
48+
#include <stdio.h>
49+
#include <signal.h>
50+
#include <setjmp.h>
51+
52+
#include "miscadmin.h"
4053

4154
#include "catalog/pg_type.h"
55+
56+
#include "access/itup.h"
57+
#include "bootstrap/bootstrap.h"
58+
59+
#include "tcop/tcopprot.h"
60+
61+
#include "storage/ipc.h"
62+
#include "storage/spin.h"
63+
#include "utils/hsearch.h"
64+
#include "storage/shmem.h"
65+
#include "storage/lock.h"
66+
67+
#include "access/xact.h"
68+
69+
#ifndef HAVE_MEMMOVE
70+
# include "regex/utils.h"
71+
#endif
72+
#include <string.h>
73+
74+
#include "nodes/primnodes.h"
75+
#include "nodes/parsenodes.h"
76+
#include "nodes/params.h"
77+
#include "access/sdir.h"
78+
#include "executor/hashjoin.h"
79+
#include "executor/tuptable.h"
80+
#include "nodes/execnodes.h"
81+
#include "nodes/plannodes.h"
82+
#include "tcop/dest.h"
83+
#include "executor/execdesc.h"
84+
#include "utils/portal.h"
85+
86+
#include "utils/mcxt.h"
87+
4288
#include "catalog/catname.h"
43-
#include "catalog/indexing.h"
89+
90+
#include "utils/geo-decls.h"
91+
#include "utils/builtins.h"
92+
4493
#include "catalog/index.h"
4594

95+
#include "access/genam.h"
96+
97+
#include "utils/lsyscache.h"
98+
99+
#include "utils/palloc.h"
100+
46101
#define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t))
47102
#define FIRST_TYPE_OID 16 /* OID of the first type */
48103

@@ -191,6 +246,7 @@ void err_out()
191246
*/
192247
static void
193248
usage()
249+
{
194250
fprintf(stderr,"Usage: postgres -boot [-d] [-C] [-F] [-O] [-Q] ");
195251
fprintf(stderr,"[-P portno] [dbName]\n");
196252
fprintf(stderr," d: debug mode\n");

0 commit comments

Comments
 (0)