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

Commit 598e86f

Browse files
bmomjianbmomjian
committed
Cleanup up include files.
1 parent 4a5b781 commit 598e86f

Some content is hidden

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

75 files changed

+586
-733
lines changed

‎src/backend/catalog/heap.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/catalog/heap.c,v 1.34 1997/11/25 21:58:40 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.35 1997/11/26 01:10:46 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* heap_creatr() - Create an uncataloged heap relation
@@ -1528,7 +1528,7 @@ start:;
15281528
{
15291529
if (*cast != 0)
15301530
elog(WARN, "DEFAULT: const type mismatched");
1531-
sprintf(cast, ":: %s", get_id_typname(atp->atttypid));
1531+
sprintf(cast, ":: %s", typeidTypeName(atp->atttypid));
15321532
goto start;
15331533
}
15341534
}

‎src/backend/executor/execTuples.c

Lines changed: 4 additions & 4 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.11 1997/11/25 21:59:16 momjian Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.12 1997/11/26 01:10:54 momjian Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -988,7 +988,7 @@ ExecTypeFromTL(List *targetList)
988988
resdom->resno,
989989
resdom->resname,
990990
/* fix for SELECT NULL ... */
991-
get_id_typname(restype ? restype : UNKNOWNOID),
991+
typeidTypeName(restype ? restype : UNKNOWNOID),
992992
0,
993993
false);
994994

@@ -1021,7 +1021,7 @@ ExecTypeFromTL(List *targetList)
10211021
TupleDescInitEntry(typeInfo,
10221022
fjRes->resno,
10231023
fjRes->resname,
1024-
get_id_typname(restype),
1024+
typeidTypeName(restype),
10251025
0,
10261026
false);
10271027
/*
@@ -1044,7 +1044,7 @@ ExecTypeFromTL(List *targetList)
10441044
TupleDescInitEntry(typeInfo,
10451045
fjRes->resno,
10461046
fjRes->resname,
1047-
get_id_typname(restype),
1047+
typeidTypeName(restype),
10481048
0,
10491049
false);
10501050

‎src/backend/parser/analyze.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.50 1997/11/25 22:00:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.51 1997/11/26 01:11:03 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include <stdio.h>
1616
#include <stdlib.h>
1717
#include <string.h>
18-
#include "postgres.h"
1918

19+
#include "postgres.h"
2020
#include "access/heapam.h"
2121
#include "nodes/makefuncs.h"
2222
#include "nodes/memnodes.h"
2323
#include "nodes/pg_list.h"
2424
#include "parser/analyze.h"
2525
#include "parser/parse_agg.h"
26+
#include "parser/parse_clause.h"
2627
#include "parser/parse_node.h"
2728
#include "parser/parse_relation.h"
2829
#include "parser/parse_target.h"
29-
#include "parser/parse_clause.h"
3030
#include "utils/builtins.h"
3131
#include "utils/mcxt.h"
3232

‎src/backend/parser/keywords.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.25 1997/11/25 22:05:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.26 1997/11/26 01:11:08 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <ctype.h>
1515
#include <string.h>
16-
#include "postgres.h"
1716

18-
#include "nodes/pg_list.h"
17+
#include "postgres.h"
1918
#include "nodes/parsenodes.h"
19+
#include "nodes/pg_list.h"
2020
#include "parse.h"
2121
#include "parser/keywords.h"
2222
#include "utils/elog.h"

‎src/backend/parser/parse_agg.c

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.1 1997/11/25 22:05:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.2 1997/11/26 01:11:14 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,23 +27,6 @@
2727
#include "parser/parse_target.h"
2828
#include "utils/syscache.h"
2929

30-
#ifdef 0
31-
#include "nodes/nodes.h"
32-
#include "nodes/params.h"
33-
#include "parse.h" /* for AND, OR, etc. */
34-
#include "catalog/pg_type.h" /* for INT4OID, etc. */
35-
#include "catalog/pg_proc.h"
36-
#include "utils/elog.h"
37-
#include "utils/builtins.h" /* namecmp(), textout() */
38-
#include "utils/lsyscache.h"
39-
#include "utils/palloc.h"
40-
#include "utils/mcxt.h"
41-
#include "utils/acl.h"
42-
#include "nodes/makefuncs.h" /* for makeResdom(), etc. */
43-
#include "commands/sequence.h"
44-
45-
#endif
46-
4730
/*
4831
* AddAggToParseState -
4932
* add the aggregate to the list of unique aggregates in pstate.

‎src/backend/parser/parse_clause.c

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,23 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.1 1997/11/25 22:05:35 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.2 1997/11/26 01:11:16 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <stdio.h>
1515
#include <stdlib.h>
1616
#include <string.h>
17+
1718
#include "postgres.h"
1819
#include "access/heapam.h"
20+
#include "catalog/pg_type.h"
1921
#include "parser/parse_clause.h"
2022
#include "parser/parse_expr.h"
2123
#include "parser/parse_node.h"
2224
#include "parser/parse_oper.h"
2325
#include "parser/parse_relation.h"
2426
#include "parser/parse_target.h"
25-
#include "catalog/pg_type.h"
26-
27-
#ifdef 0
28-
#include "nodes/nodes.h"
29-
#include "nodes/params.h"
30-
#include "nodes/primnodes.h"
31-
#include "nodes/parsenodes.h"
32-
#include "nodes/relation.h"
33-
#include "parse.h" /* for AND, OR, etc. */
34-
#include "catalog/pg_aggregate.h"
35-
#include "catalog/pg_proc.h"
36-
#include "utils/elog.h"
37-
#include "utils/builtins.h" /* namecmp(), textout() */
38-
#include "utils/lsyscache.h"
39-
#include "utils/palloc.h"
40-
#include "utils/mcxt.h"
41-
#include "utils/syscache.h"
42-
#include "utils/acl.h"
43-
#include "nodes/makefuncs.h" /* for makeResdom(), etc. */
44-
#include "nodes/nodeFuncs.h"
45-
#include "commands/sequence.h"
46-
47-
#include "optimizer/clauses.h"
48-
49-
#include "miscadmin.h"
50-
51-
#include "port-protos.h" /* strdup() */
52-
#endif
5327

5428
/*
5529
* parseFromClause -

‎src/backend/parser/parse_expr.c

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.1 1997/11/25 22:05:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.2 1997/11/26 01:11:17 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,34 +21,14 @@
2121
#include "nodes/nodes.h"
2222
#include "nodes/params.h"
2323
#include "nodes/relation.h"
24+
#include "parse.h"
2425
#include "parser/parse_expr.h"
2526
#include "parser/parse_func.h"
2627
#include "parser/parse_node.h"
2728
#include "parser/parse_relation.h"
2829
#include "parser/parse_target.h"
29-
#include "parse.h"
3030
#include "utils/builtins.h"
3131

32-
#ifdef 0
33-
#include "nodes/primnodes.h"
34-
#include "nodes/parsenodes.h"
35-
#include "catalog/pg_aggregate.h"
36-
#include "catalog/pg_proc.h"
37-
#include "utils/elog.h"
38-
#include "utils/lsyscache.h"
39-
#include "utils/palloc.h"
40-
#include "utils/mcxt.h"
41-
#include "utils/syscache.h"
42-
#include "utils/acl.h"
43-
#include "nodes/nodeFuncs.h"
44-
#include "commands/sequence.h"
45-
46-
#include "optimizer/clauses.h"
47-
#include "access/heapam.h"
48-
49-
#include "miscadmin.h"
50-
#endif
51-
5232
Oid param_type(int t); /* from gram.y */
5333

5434
/*

‎src/backend/parser/parse_func.c

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.1 1997/11/25 22:05:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.2 1997/11/26 01:11:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <string.h>
15+
1516
#include "postgres.h"
16-
#include "fmgr.h"
17-
#include "miscadmin.h"
1817
#include "access/genam.h"
1918
#include "access/heapam.h"
2019
#include "access/itup.h"
@@ -25,7 +24,9 @@
2524
#include "catalog/pg_inherits.h"
2625
#include "catalog/pg_proc.h"
2726
#include "catalog/pg_type.h"
27+
#include "fmgr.h"
2828
#include "lib/dllist.h"
29+
#include "miscadmin.h"
2930
#include "nodes/makefuncs.h"
3031
#include "nodes/relation.h"
3132
#include "parser/parse_agg.h"
@@ -41,28 +42,6 @@
4142
#include "utils/lsyscache.h"
4243
#include "utils/syscache.h"
4344

44-
#ifdef 0
45-
#include "utils/datum.h"
46-
47-
#include "utils/elog.h"
48-
#include "utils/palloc.h"
49-
50-
#include "nodes/pg_list.h"
51-
#include "nodes/parsenodes.h"
52-
53-
#include "catalog/pg_operator.h"
54-
#include "catalog/catname.h"
55-
56-
#include "access/skey.h"
57-
#include "access/tupdesc.h"
58-
#include "access/htup.h"
59-
#include "access/genam.h"
60-
#include "access/itup.h"
61-
#include "access/tupmacs.h"
62-
63-
#include "storage/buf.h"
64-
#endif
65-
6645
#define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false)
6746

6847
#define MAXFARGS 8 /* max # args to a c or postquel function */

‎src/backend/parser/parse_node.c

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,27 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.1 1997/11/25 22:05:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.2 1997/11/26 01:11:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <ctype.h>
1515
#include <string.h>
1616

1717
#include "postgres.h"
18-
#include "fmgr.h"
1918
#include "access/heapam.h"
2019
#include "catalog/pg_operator.h"
2120
#include "catalog/pg_type.h"
21+
#include "fmgr.h"
2222
#include "nodes/makefuncs.h"
2323
#include "parser/parse_expr.h"
24-
#include "parser/parse_oper.h"
2524
#include "parser/parse_node.h"
25+
#include "parser/parse_oper.h"
2626
#include "parser/parse_relation.h"
2727
#include "parser/parse_type.h"
2828
#include "utils/builtins.h"
2929
#include "utils/syscache.h"
3030

31-
#ifdef 0
32-
#include "access/tupmacs.h"
33-
#include "utils/elog.h"
34-
#include "utils/palloc.h"
35-
#include "utils/acl.h" /* for ACL_NO_PRIV_WARNING */
36-
#include "utils/rel.h" /* Relation stuff */
37-
38-
#include "utils/syscache.h"
39-
40-
#include "nodes/pg_list.h"
41-
#include "nodes/primnodes.h"
42-
#include "nodes/parsenodes.h"
43-
#endif
44-
4531
/*
4632
* make_parsestate() --
4733
* allocate and initialize a new ParseState.

0 commit comments

Comments
 (0)