Skip to content

Commit 3ac9d2f

Browse files
bmomjianbmomjian
committed
Various compile errors concerning overflow due to shifts, unsigned, and bad prototypes, from Solaris, from Diab Jerius
1 parent 8447148 commit 3ac9d2f

File tree

21 files changed

+51
-71
lines changed

21 files changed

+51
-71
lines changed

‎src/backend/catalog/pg_aggregate.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/catalog/pg_aggregate.c,v 1.4 1996/11/08 00:44:32 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.5 1997/07/24 20:11:47 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -269,7 +269,6 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
269269
Oid transtype;
270270
text *textInitVal;
271271
char *strInitVal, *initVal;
272-
extern char *textout();
273272

274273
Assert(PointerIsValid(aggName));
275274
Assert(PointerIsValid(isNull));

‎src/backend/optimizer/geqo/geqo_params.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: geqo_params.c,v 1.2 1997/02/19 14:52:04 scrappy Exp $
8+
* $Id: geqo_params.c,v 1.3 1997/07/24 20:12:15 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -22,6 +22,7 @@
2222
#include <time.h>
2323
#include <math.h>
2424
#include <ctype.h>
25+
#include <string.h>
2526

2627
#include "postgres.h"
2728
#include "miscadmin.h"

‎src/backend/parser/catalog_utils.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.18 1997/05/22 00:14:41 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.19 1997/07/24 20:13:01 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1477,7 +1477,6 @@ op_error(char *op, Oid arg1, Oid arg2)
14771477
void
14781478
func_error(char *caller, char *funcname, int nargs, Oid *argtypes)
14791479
{
1480-
Type get_id_type();
14811480
char p[(NAMEDATALEN+2)*MAXFMGRARGS], *ptr;
14821481
int i;
14831482

‎src/backend/parser/parser.c

Lines changed: 2 additions & 2 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.18 1997/02/14 04:15:49 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.19 1997/07/24 20:13:21 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -447,7 +447,7 @@ ParseAgg(char *aggname, Oid basetype, Node *target)
447447
vartype = ((Expr*)target)->typeOid;
448448

449449
if (basetype != vartype) {
450-
Type tp1, tp2, get_id_type();
450+
Type tp1, tp2;
451451

452452
tp1 = get_id_type(basetype);
453453
tp2 = get_id_type(vartype);

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.2 1996/11/10 03:01:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.3 1997/07/24 20:13:33 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -192,8 +192,6 @@ DefineQueryRewrite(RuleStmt *stmt)
192192
Oid event_attype = 0;
193193
char *actionP, *event_qualP;
194194

195-
extern Oid att_typeid();
196-
197195
if (event_obj->attrs)
198196
eslot_string = strVal(lfirst(event_obj->attrs));
199197
else

‎src/backend/storage/buffer/bufmgr.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/storage/buffer/bufmgr.c,v 1.13 1997/04/18 08:30:08 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.14 1997/07/24 20:13:48 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1131,7 +1131,6 @@ BufferPoolCheckLeak()
11311131
{
11321132
register int i;
11331133
int error = 0;
1134-
void PrintBufferDescs();
11351134

11361135
for (i = 1; i <= NBuffers; i++) {
11371136
if (BufferIsValid(i)) {

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.3 1996/11/06 06:49:10 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.4 1997/07/24 20:14:15 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -481,12 +481,6 @@ SISetDataEntry(SISeg *segP, SharedInvalidData *data)
481481
{
482482
Offset offsetToNewData;
483483
SISegEntry *eP, *lastP;
484-
bool SISegFull();
485-
Offset SIEntryOffset();
486-
Offset SIGetStartFreeSpace();
487-
SISegEntry *SIGetFirstDataEntry();
488-
SISegEntry *SIGetNextDataEntry();
489-
SISegEntry *SIGetLastDataEntry();
490484

491485
if (!SIIncNumEntries(segP, 1))
492486
return(false); /* no space */
@@ -542,7 +536,6 @@ bool
542536
SIDelDataEntry(SISeg *segP)
543537
{
544538
SISegEntry *e1P;
545-
SISegEntry *SIGetFirstDataEntry();
546539

547540
if (!SIDecNumEntries(segP, 1)) {
548541
/* no entries in buffer */

‎src/backend/storage/smgr/md.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/storage/smgr/md.c,v 1.13 1997/05/22 17:08:33 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.14 1997/07/24 20:14:41 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -114,7 +114,6 @@ mdcreate(Relation reln)
114114
{
115115
int fd, vfd;
116116
char *path;
117-
extern bool IsBootstrapProcessingMode();
118117

119118
path = relpath(&(reln->rd_rel->relname.data[0]));
120119
fd = FileNameOpenFile(path, O_RDWR|O_CREAT|O_EXCL, 0600);

‎src/backend/tcop/postgres.c

Lines changed: 3 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/tcop/postgres.c,v 1.33 1997/04/24 03:39:09 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.34 1997/07/24 20:15:03 momjian Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -54,6 +54,7 @@
5454
#include "executor/execdebug.h"
5555
#include "executor/executor.h"
5656
#include "nodes/relation.h"
57+
#include "nodes/print.h"
5758

5859
#include "optimizer/cost.h"
5960
#include "optimizer/planner.h"
@@ -1270,7 +1271,7 @@ PostgresMain(int argc, char *argv[])
12701271
*/
12711272
if (IsUnderPostmaster == false) {
12721273
puts("\nPOSTGRES backend interactive interface");
1273-
puts("$Revision: 1.33 $ $Date: 1997/04/24 03:39:09 $");
1274+
puts("$Revision: 1.34 $ $Date: 1997/07/24 20:15:03 $");
12741275
}
12751276

12761277
/* ----------------

‎src/backend/tcop/utility.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.17 1997/05/22 00:15:36 scrappy Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.18 1997/07/24 20:15:18 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -476,7 +476,6 @@ ProcessUtility(Node *parsetree,
476476
{
477477
char *viewName = stmt->name;
478478
char *ruleName;
479-
extern char *RewriteGetRuleEventRel();
480479

481480
#ifndef NO_SECURITY
482481

@@ -587,7 +586,7 @@ ProcessUtility(Node *parsetree,
587586
case T_LoadStmt:
588587
{
589588
LoadStmt *stmt = (LoadStmt *)parsetree;
590-
FILE *fp, *fopen();
589+
FILE *fp;
591590
char *filename;
592591

593592
commandTag = "LOAD";

‎src/backend/utils/adt/acl.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/adt/acl.c,v 1.9 1997/07/10 02:27:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.10 1997/07/24 20:15:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -86,7 +86,6 @@ aclparse(char *s, AclItem *aip, unsigned *modechg)
8686
{
8787
HeapTuple htp;
8888
char name[NAMEDATALEN+1];
89-
extern AclId get_grosysid();
9089

9190
Assert(s && aip && modechg);
9291

‎src/backend/utils/adt/arrayfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.10 1996/11/08 05:59:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.11 1997/07/24 20:15:45 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1203,7 +1203,7 @@ _ArrayRange(int st[],
12031203
int n, *dim, *lb, st_pos, prod[MAXDIM];
12041204
int span[MAXDIM], dist[MAXDIM], indx[MAXDIM];
12051205
int i, j, inc;
1206-
char *srcPtr, *array_seek();
1206+
char *srcPtr;
12071207

12081208
n = ARR_NDIM(array); dim = ARR_DIMS(array);
12091209
lb = ARR_LBOUND(array); srcPtr = ARR_DATA_PTR(array);
@@ -1232,7 +1232,7 @@ _ArrayClipCount(int stI[], int endpI[], ArrayType *array)
12321232
int span[MAXDIM], dist[MAXDIM], indx[MAXDIM];
12331233
int i, j, inc, st[MAXDIM], endp[MAXDIM];
12341234
int count = 0;
1235-
char *ptr, *array_seek();
1235+
char *ptr;
12361236

12371237
n = ARR_NDIM(array); dim = ARR_DIMS(array);
12381238
lb = ARR_LBOUND(array); ptr = ARR_DATA_PTR(array);

‎src/backend/utils/adt/dt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.28 1997/07/08 22:06:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.29 1997/07/24 20:15:53 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1703,8 +1703,8 @@ printf( "datetime_zone- zone %s type=%d value=%d\n", lowzone, type, val);
17031703
*****************************************************************************/
17041704

17051705
/* definitions for squeezing values into "value" */
1706-
#define ABS_SIGNBIT 0200
1707-
#define VALMASK 0177
1706+
#define ABS_SIGNBIT (char) 0200
1707+
#define VALMASK (char) 0177
17081708
#define NEG(n) ((n)|ABS_SIGNBIT)
17091709
#define SIGNEDCHAR(c) ((c)&ABS_SIGNBIT? -((c)&VALMASK): (c))
17101710
#define FROMVAL(tp) (-SIGNEDCHAR((tp)->value) * 10) /* uncompress */

‎src/backend/utils/adt/filename.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/utils/adt/Attic/filename.c,v 1.6 1997/02/14 04:17:47 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.7 1997/07/24 20:16:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -25,7 +25,7 @@
2525
char *
2626
filename_in(char *file)
2727
{
28-
char *str, *getenv();
28+
char *str;
2929
int ind = 0;
3030

3131
/*

‎src/backend/utils/adt/oid.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.6 1997/03/14 23:20:52 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.7 1997/07/24 20:16:17 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -84,15 +84,11 @@ char *oid8out(Oid (*oidArray)[])
8484

8585
Oid oidin(char *s)
8686
{
87-
extern int32 int4in();
88-
8987
return(int4in(s));
9088
}
9189

9290
char *oidout(Oid o)
9391
{
94-
extern char *int4out();
95-
9692
return(int4out(o));
9793
}
9894

‎src/backend/utils/error/elog.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/error/elog.c,v 1.15 1997/03/18 21:40:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.16 1997/07/24 20:16:32 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -50,7 +50,6 @@ elog(int lev, const char *fmt, ... )
5050
#ifndef PG_STANDALONE
5151
extern FILE *Pfout;
5252
#endif /* !PG_STANDALONE */
53-
time_t time();
5453
#ifdef ELOG_TIMESTAMPS
5554
time_t tim;
5655
#endif

‎src/backend/utils/fmgr/dfmgr.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/utils/fmgr/dfmgr.c,v 1.6 1997/02/14 04:18:02 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.7 1997/07/24 20:16:59 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -53,7 +53,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
5353
Form_pg_proc procedureStruct;
5454
char *proname;
5555
char *probinattr, *probinstring;
56-
func_ptr user_fn, handle_load();
56+
func_ptr user_fn;
5757
Relation rdesc;
5858
bool isnull;
5959

‎src/backend/utils/init/postinit.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/init/postinit.c,v 1.8 1997/02/14 04:18:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.9 1997/07/24 20:17:34 momjian Exp $
1111
*
1212
* NOTES
1313
* InitPostgres() is the function called from PostgresMain
@@ -354,7 +354,6 @@ InitUserid()
354354
void
355355
InitCommunication()
356356
{
357-
char *getenv(); /* XXX style */
358357
char *postid;
359358
char *postport;
360359
IPCKey key = 0;

‎src/backend/utils/sort/psort.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/sort/Attic/psort.c,v 1.4 1997/05/20 11:35:50 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.5 1997/07/24 20:18:07 momjian Exp $
1111
*
1212
* NOTES
1313
* Sorts the first relation into the second relation. The sort may
@@ -525,7 +525,6 @@ gettape()
525525
register struct tapelst *tp;
526526
FILE *file;
527527
static int tapeinit = 0;
528-
char *mktemp();
529528

530529
tp = (struct tapelst *)palloc((unsigned)sizeof (struct tapelst));
531530
if (!tapeinit) {

0 commit comments

Comments
 (0)