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

Commit c9c0e11

Browse files
bmomjianbmomjian
committed
More compile cleanups
1 parent 8006c6f commit c9c0e11

File tree

12 files changed

+59
-30
lines changed

12 files changed

+59
-30
lines changed

‎src/backend/commands/define.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.8 1996/11/08 06:24:58 bryanh Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.9 1996/11/08 20:45:16 momjian Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -137,7 +137,7 @@ compute_full_attributes(const List *parameters, int32 *byte_pct_p,
137137
if (sscanf(param->val, "%d", perbyte_cpu_p) == 0) {
138138
int count;
139139
char *ptr;
140-
for (ptr = param->val; *ptr != '\0'; ptr++)
140+
for (count = 0, ptr = param->val; *ptr != '\0'; ptr++)
141141
if (*ptr == '!') count++;
142142
*perbyte_cpu_p = (int) pow(10.0, (double) count);
143143
}

‎src/backend/executor/nodeGroup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
* columns. (ie. tuples from the same group are consecutive)
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.3 1996/11/08 05:56:08 momjian Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.4 1996/11/08 20:45:20 momjian Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
2020
#include "postgres.h"
21+
#include "fmgr.h"
2122

2223
#include "access/heapam.h"
2324
#include "catalog/catalog.h"

‎src/backend/executor/nodeUnique.c

Lines changed: 2 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/executor/nodeUnique.c,v 1.4 1996/11/08 05:56:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.5 1996/11/08 20:45:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -23,6 +23,7 @@
2323
*
2424
*/
2525
#include "postgres.h"
26+
#include "fmgr.h"
2627

2728
#include "executor/executor.h"
2829
#include "executor/nodeUnique.h"

‎src/backend/parser/gram.y

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.13 1996/10/30 02:01:54 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.14 1996/11/08 20:45:33 momjian Exp $
1414
*
1515
* HISTORY
1616
* AUTHOR DATE MAJOR EVENT
@@ -32,10 +32,13 @@
3232
*/
3333
#include <string.h>
3434
#include <ctype.h>
35+
3536
#include "postgres.h"
3637
#include "nodes/parsenodes.h"
38+
#include "parser/gramparse.h"
3739
#include "parser/catalog_utils.h"
3840
#include "parser/parse_query.h"
41+
#include "storage/smgr.h"
3942
#include "utils/acl.h"
4043
#include "catalog/catname.h"
4144
#include "utils/elog.h"

‎src/backend/parser/parser.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.6 1996/11/08 05:57:33 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.7 1996/11/08 20:45:42 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -19,22 +19,23 @@
1919

2020
#include "postgres.h"
2121
#include "parser/catalog_utils.h"
22+
#include "parser/gramparse.h"
23+
#include "parser/parse_query.h"
2224
#include "nodes/pg_list.h"
25+
#include "nodes/execnodes.h"
26+
#include "nodes/makefuncs.h"
27+
#include "nodes/primnodes.h"
28+
#include "nodes/plannodes.h"
29+
#include "nodes/relation.h"
30+
#include "utils/builtins.h"
2331
#include "utils/exc.h"
2432
#include "utils/excid.h"
33+
#include "utils/lsyscache.h"
2534
#include "utils/palloc.h"
2635
#include "utils/syscache.h"
2736
#include "catalog/pg_aggregate.h"
2837
#include "catalog/pg_type.h"
29-
#include "nodes/primnodes.h"
30-
#include "nodes/plannodes.h"
31-
#include "nodes/execnodes.h"
32-
#include "nodes/relation.h"
33-
#include "parser/parse_query.h"
34-
#include "utils/builtins.h"
35-
#include "utils/lsyscache.h"
3638
#include "access/heapam.h"
37-
#include "nodes/makefuncs.h"
3839
#include "optimizer/clauses.h"
3940

4041
void init_io(); /* from scan.l */

‎src/backend/parser/scan.l

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.2 1996/07/23 02:23:34 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.3 1996/11/08 20:45:45 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -27,12 +27,11 @@
2727
#include "miscadmin.h"
2828
#include "nodes/pg_list.h"
2929
#include "nodes/parsenodes.h"
30+
#include "parser/gramparse.h"
3031
#include "parser/keywords.h"
3132
#include "parser/scansup.h"
3233
#include "parser/sysfunc.h"
3334
#include "parse.h"
34-
#include "utils/elog.h"
35-
#include "utils/palloc.h"
3635

3736
extern char *parseString;
3837
extern char *parseCh;

‎src/backend/storage/ipc/shmem.c

Lines changed: 2 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/storage/ipc/shmem.c,v 1.4 1996/11/08 05:58:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.5 1996/11/08 20:45:51 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -64,6 +64,7 @@
6464
#include "storage/ipc.h"
6565
#include "storage/shmem.h"
6666
#include "storage/spin.h"
67+
#include "utils/dynahash.h"
6768
#include "utils/hsearch.h"
6869

6970
/* shared memory global variables */

‎src/backend/utils/Gen_fmgrtab.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.6 1996/11/06 10:22:13 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.7 1996/11/08 20:45:57 momjian Exp $
1212
#
1313
# NOTES
1414
# Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
8181
*
8282
* Copyright (c) 1994, Regents of the University of California
8383
*
84-
* $Id: Gen_fmgrtab.sh,v 1.6 1996/11/06 10:22:13 scrappy Exp $
84+
* $Id: Gen_fmgrtab.sh,v 1.7 1996/11/08 20:45:57 momjian Exp $
8585
*
8686
* NOTES
8787
* ******************************
@@ -173,7 +173,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
173173
*
174174
*
175175
* IDENTIFICATION
176-
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.6 1996/11/06 10:22:13 scrappy Exp $
176+
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.7 1996/11/08 20:45:57 momjian Exp $
177177
*
178178
* NOTES
179179
*
@@ -194,8 +194,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
194194
#include <limits.h>
195195
#else
196196
# if defined(BSD44_derived) || \
197-
defined(bsdi) || \
198-
defined(bsdi_2_1)
197+
defined(bsdi)
199198
# include <machine/limits.h>
200199
# define MAXINT INT_MAX
201200
# else
@@ -226,7 +225,7 @@ static int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrCall)) - 1;
226225
227226
FmgrCall *fmgr_isbuiltin(Oid id)
228227
{
229-
register int i;
228+
register int i = 0;
230229
int low = 0;
231230
int high = fmgr_nbuiltins;
232231

‎src/backend/utils/hash/dynahash.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/backend/utils/hash/dynahash.c,v 1.4 1996/11/08 06:00:23 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.5 1996/11/08 20:46:07 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -70,7 +70,6 @@ static uint32 call_hash(HTAB *hashp, char *k, int len);
7070
static SEG_OFFSET seg_alloc(HTAB *hashp);
7171
static int bucket_alloc(HTAB *hashp);
7272
static int dir_realloc(HTAB *hashp);
73-
static int my_log2(long num);
7473

7574
typedef long * ((*dhalloc_ptr)());
7675

‎src/bin/psql/psql.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*-------------------------------------------------------------------------
1+
/*-------------------------------------------------------------------------
22
*
33
* psql.c--
44
* an interactive front-end to postgres95
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.25 1996/11/08 06:01:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.26 1996/11/08 20:46:19 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/

‎src/include/parser/gramparse.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* gramparse.h--
4+
* scanner support routines. used by both the bootstrap lexer
5+
* as well as the normal lexer
6+
*
7+
* Copyright (c) 1994, Regents of the University of California
8+
*
9+
* $Id: gramparse.h,v 1.1 1996/11/08 20:46:26 momjian Exp $
10+
*
11+
*-------------------------------------------------------------------------
12+
*/
13+
14+
#ifndef GRAMPARSE_H
15+
#define GRAMPARSE_H /* include once only */
16+
17+
/* from scan.l */
18+
extern void init_io();
19+
20+
/* from gram.y */
21+
extern void parser_init(Oid *typev, int nargs);
22+
extern int yyparse();
23+
24+
#endif /* GRAMPARSE_H */

‎src/include/storage/smgr.h

Lines changed: 3 additions & 2 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: smgr.h,v 1.3 1996/11/08 06:02:22 momjian Exp $
9+
* $Id: smgr.h,v 1.4 1996/11/08 20:46:33 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -83,6 +83,7 @@ extern int mmabort(void);
8383
extern int MMShmemSize(void);
8484

8585
/* smgrtype.c */
86-
char *smgrout(int2 i);
86+
extern char *smgrout(int2 i);
87+
extern int2 smgrin(char *s);
8788

8889
#endif /* SMGR_H */

0 commit comments

Comments
 (0)