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

Commitbf5cbbf

Browse files
author
Bryan Henderson
committed
Quiet compiler warnings.
1 parent2e21b7e commitbf5cbbf

File tree

6 files changed

+47
-43
lines changed

6 files changed

+47
-43
lines changed

‎src/backend/parser/parser.c

Lines changed: 3 additions & 3 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.7 1996/11/08 20:45:42 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.8 1996/11/10 02:23:15 bryanh Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -49,8 +49,8 @@ List *parsetree = NIL;
4949

5050
#ifdefSETS_FIXED
5151
staticvoidfixupsets();
52-
#endif
5352
staticvoiddefine_sets();
53+
#endif
5454
/*
5555
* parser-- returns a list of parse trees
5656
*
@@ -120,6 +120,7 @@ fixupsets(Query *parse)
120120
}
121121
#endif
122122

123+
#ifdefSETS_FIXED
123124
/* Recursively find all of the Consts in the parsetree. Some of
124125
* these may represent a set. The value of the Const will be the
125126
* query (a string) which defines the set. Call SetDefine to define
@@ -128,7 +129,6 @@ fixupsets(Query *parse)
128129
staticvoid
129130
define_sets(Node*clause)
130131
{
131-
#ifdefSETS_FIXED
132132
Oidsetoid;
133133
Typet=type("oid");
134134
Oidtypeoid=typeid(t);

‎src/backend/postmaster/postmaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.21 1996/11/08 05:57:41 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.22 1996/11/10 02:24:12 bryanh Exp $
1414
*
1515
* NOTES
1616
*
@@ -1170,8 +1170,8 @@ dumpstatus(SIGNAL_ARGS)
11701170
fprintf(stderr,"%s: dumpstatus:\n",progname);
11711171
fprintf(stderr,"\tsock %d: nBytes=%d, laddr=0x%lx, raddr=0x%lx\n",
11721172
port->sock,port->nBytes,
1173-
port->laddr.sin_addr.s_addr,
1174-
port->raddr.sin_addr.s_addr);
1173+
(longint)port->laddr.sin_addr.s_addr,
1174+
(longint)port->raddr.sin_addr.s_addr);
11751175
curr=DLGetSucc(curr);
11761176
}
11771177
}

‎src/backend/tcop/postgres.c

Lines changed: 35 additions & 32 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.15 1996/11/08 05:59:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.16 1996/11/10 02:25:15 bryanh Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -1256,7 +1256,7 @@ PostgresMain(int argc, char *argv[])
12561256
*/
12571257
if (IsUnderPostmaster== false) {
12581258
puts("\nPOSTGRES backend interactive interface");
1259-
puts("$Revision: 1.15 $ $Date: 1996/11/08 05:59:31 $");
1259+
puts("$Revision: 1.16 $ $Date: 1996/11/10 02:25:15 $");
12601260
}
12611261

12621262
/* ----------------
@@ -1509,42 +1509,45 @@ ShowUsage()
15091509

15101510
fprintf(StatFp,"! system usage stats:\n");
15111511
fprintf(StatFp,
1512-
"!\t%ld.%06ld elapsed %ld.%06ld user %ld.%06ld system sec\n",
1513-
elapse_t.tv_sec-Save_t.tv_sec,
1514-
elapse_t.tv_usec-Save_t.tv_usec,
1515-
r.ru_utime.tv_sec-Save_r.ru_utime.tv_sec,
1516-
r.ru_utime.tv_usec-Save_r.ru_utime.tv_usec,
1517-
r.ru_stime.tv_sec-Save_r.ru_stime.tv_sec,
1518-
r.ru_stime.tv_usec-Save_r.ru_stime.tv_usec);
1512+
"!\t%ld.%06ld elapsed %ld.%06ld user %ld.%06ld system sec\n",
1513+
(longint)elapse_t.tv_sec-Save_t.tv_sec,
1514+
(longint)elapse_t.tv_usec-Save_t.tv_usec,
1515+
(longint)r.ru_utime.tv_sec-Save_r.ru_utime.tv_sec,
1516+
(longint)r.ru_utime.tv_usec-Save_r.ru_utime.tv_usec,
1517+
(longint)r.ru_stime.tv_sec-Save_r.ru_stime.tv_sec,
1518+
(longint)r.ru_stime.tv_usec-Save_r.ru_stime.tv_usec);
15191519
fprintf(StatFp,
1520-
"!\t[%ld.%06ld user %ld.%06ld sys total]\n",
1521-
user.tv_sec,user.tv_usec,sys.tv_sec,sys.tv_usec);
1520+
"!\t[%ld.%06ld user %ld.%06ld sys total]\n",
1521+
(longint)user.tv_sec,
1522+
(longint)user.tv_usec,
1523+
(longint)sys.tv_sec,
1524+
(longint)sys.tv_usec);
15221525
#ifndefNEED_RUSAGE
15231526
fprintf(StatFp,
1524-
"!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
1525-
r.ru_inblock-Save_r.ru_inblock,
1526-
/* they only drink coffee at dec */
1527-
r.ru_oublock-Save_r.ru_oublock,
1528-
r.ru_inblock,r.ru_oublock);
1527+
"!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
1528+
r.ru_inblock-Save_r.ru_inblock,
1529+
/* they only drink coffee at dec */
1530+
r.ru_oublock-Save_r.ru_oublock,
1531+
r.ru_inblock,r.ru_oublock);
15291532
fprintf(StatFp,
1530-
"!\t%ld/%ld [%ld/%ld] page faults/reclaims, %ld [%ld] swaps\n",
1531-
r.ru_majflt-Save_r.ru_majflt,
1532-
r.ru_minflt-Save_r.ru_minflt,
1533-
r.ru_majflt,r.ru_minflt,
1534-
r.ru_nswap-Save_r.ru_nswap,
1535-
r.ru_nswap);
1533+
"!\t%ld/%ld [%ld/%ld] page faults/reclaims, %ld [%ld] swaps\n",
1534+
r.ru_majflt-Save_r.ru_majflt,
1535+
r.ru_minflt-Save_r.ru_minflt,
1536+
r.ru_majflt,r.ru_minflt,
1537+
r.ru_nswap-Save_r.ru_nswap,
1538+
r.ru_nswap);
15361539
fprintf(StatFp,
1537-
"!\t%ld [%ld] signals rcvd, %ld/%ld [%ld/%ld] messages rcvd/sent\n",
1538-
r.ru_nsignals-Save_r.ru_nsignals,
1539-
r.ru_nsignals,
1540-
r.ru_msgrcv-Save_r.ru_msgrcv,
1541-
r.ru_msgsnd-Save_r.ru_msgsnd,
1542-
r.ru_msgrcv,r.ru_msgsnd);
1540+
"!\t%ld [%ld] signals rcvd, %ld/%ld [%ld/%ld] messages rcvd/sent\n",
1541+
r.ru_nsignals-Save_r.ru_nsignals,
1542+
r.ru_nsignals,
1543+
r.ru_msgrcv-Save_r.ru_msgrcv,
1544+
r.ru_msgsnd-Save_r.ru_msgsnd,
1545+
r.ru_msgrcv,r.ru_msgsnd);
15431546
fprintf(StatFp,
1544-
"!\t%ld/%ld [%ld/%ld] voluntary/involuntary context switches\n",
1545-
r.ru_nvcsw-Save_r.ru_nvcsw,
1546-
r.ru_nivcsw-Save_r.ru_nivcsw,
1547-
r.ru_nvcsw,r.ru_nivcsw);
1547+
"!\t%ld/%ld [%ld/%ld] voluntary/involuntary context switches\n",
1548+
r.ru_nvcsw-Save_r.ru_nvcsw,
1549+
r.ru_nivcsw-Save_r.ru_nivcsw,
1550+
r.ru_nvcsw,r.ru_nivcsw);
15481551
#endif/* NEED_RUSAGE */
15491552
fprintf(StatFp,"! postgres usage stats:\n");
15501553
PrintBufferUsage(StatFp);

‎src/backend/tcop/utility.c

Lines changed: 2 additions & 1 deletion
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.6 1996/11/08 05:59:35 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.7 1996/11/10 02:25:16 bryanh Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -42,6 +42,7 @@
4242
#include"rewrite/rewriteDefine.h"
4343
#include"tcop/tcopdebug.h"
4444
#include"tcop/dest.h"
45+
#include"fmgr.h"/* For load_file() */
4546

4647
#ifndefNO_SECURITY
4748
#include"miscadmin.h"

‎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.1.1.1 1996/07/09 06:22:07 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.2 1996/11/10 02:26:15 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -184,7 +184,7 @@ handle_load(char *filename, char *funcname)
184184

185185
file_scanner->handle=pg_dlopen(filename);
186186
if (file_scanner->handle== (void*)NULL) {
187-
load_error=pg_dlerror();
187+
load_error=(char*)pg_dlerror();
188188
if (file_scanner==file_list) {
189189
file_list= (DynamicFileList*)NULL;
190190
}else {

‎src/include/commands/defrem.h

Lines changed: 2 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: defrem.h,v 1.3 1996/11/06 07:50:12 scrappy Exp $
9+
* $Id: defrem.h,v 1.4 1996/11/10 02:27:15 bryanh Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -33,7 +33,7 @@ extern void RemoveIndex(char *name);
3333
/*
3434
* prototypes in define.c
3535
*/
36-
externvoidDefineFunction(ProcedureStmt*nameargsexe,CommandDestdest);
36+
externvoidCreateFunction(ProcedureStmt*stmt,CommandDestdest);
3737
externvoidDefineOperator(char*name,List*parameters);
3838
externvoidDefineAggregate(char*name,List*parameters);
3939
externvoidDefineType(char*name,List*parameters);

0 commit comments

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