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

Commit7bdd8dc

Browse files
committed
This prevent gcc from complaining about casting a short to a char * and
fixes another complaint.More fixes from Bruce...
1 parent9c0f89c commit7bdd8dc

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
8+
* $Id: nbtsort.c,v 1.2 1996/07/31 18:46:47 scrappy Exp $
99
*
1010
* NOTES
1111
*
@@ -97,10 +97,10 @@ _bt_isortcmpinit(Relation index)
9797
}
9898

9999
staticint
100-
_bt_isortcmp(BTItem*bti1p,BTItem*bti2p)
100+
_bt_isortcmp(constvoid*bti1p,constvoid*bti2p)
101101
{
102-
BTItembti1=*bti1p;
103-
BTItembti2=*bti2p;
102+
BTItembti1=*(BTItem*)bti1p;
103+
BTItembti2=*(BTItem*)bti2p;
104104

105105
if (bti1== (BTItem)NULL) {
106106
if (bti2== (BTItem)NULL) {

‎src/backend/optimizer/util/clauseinfo.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/optimizer/util/Attic/clauseinfo.c,v 1.2 1996/07/22 23:30:57 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.3 1996/07/31 18:47:06 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -103,7 +103,7 @@ get_relattvals(List *clauseinfo_list,
103103

104104
temp= (CInfo*)lfirst(i);
105105
get_relattval((Node*)temp->clause,&dummy,&attno,&constval,&flag);
106-
result1=lappendi(result1,attno);
106+
result1=lappendi(result1,(int)attno);
107107
result2=lappendi(result2,constval);
108108
result3=lappendi(result3,flag);
109109
}

‎src/backend/optimizer/util/plancat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.1.1.1 1996/07/09 06:21:39 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2 1996/07/31 18:47:08 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -324,7 +324,7 @@ restriction_selectivity(Oid functionObjectId,
324324
result= (float64)fmgr(functionObjectId,
325325
(char*)operatorObjectId,
326326
(char*)relationObjectId,
327-
(char*)attributeNumber,
327+
(char*)(int)attributeNumber,
328328
(char*)constValue,
329329
(char*)constFlag,
330330
NULL);
@@ -363,9 +363,9 @@ join_selectivity (Oid functionObjectId,
363363
result= (float64)fmgr(functionObjectId,
364364
(char*)operatorObjectId,
365365
(char*)relationObjectId1,
366-
(char*)attributeNumber1,
366+
(char*)(int)attributeNumber1,
367367
(char*)relationObjectId2,
368-
(char*)attributeNumber2,
368+
(char*)(int)attributeNumber2,
369369
NULL);
370370
if (!PointerIsValid(result))
371371
elog(WARN,"JoinClauseSelectivity: bad pointer");

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.2 1996/07/31 18:48:16 scrappy Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -380,7 +380,7 @@ btreesel(Oid operatorObjectId,
380380
result= (float64)fmgr(get_oprrest (operatorObjectId),
381381
(char*)operatorObjectId,
382382
(char*)indrelid,
383-
(char*)attributeNumber,
383+
(char*)(int)attributeNumber,
384384
(char*)constValue,
385385
(char*)constFlag,
386386
NULL);
@@ -422,7 +422,7 @@ btreenpage(Oid operatorObjectId,
422422
temp= (float64)fmgr(get_oprrest (operatorObjectId),
423423
(char*)operatorObjectId,
424424
(char*)indrelid,
425-
(char*)attributeNumber,
425+
(char*)(int)attributeNumber,
426426
(char*)constValue,
427427
(char*)constFlag,
428428
NULL);
@@ -484,7 +484,7 @@ hashsel(Oid operatorObjectId,
484484
result= (float64)fmgr(get_oprrest (operatorObjectId),
485485
(char*)operatorObjectId,
486486
(char*)indrelid,
487-
(char*)attributeNumber,
487+
(char*)(int)attributeNumber,
488488
(char*)constValue,
489489
(char*)constFlag,
490490
NULL);
@@ -545,7 +545,7 @@ hashnpage(Oid operatorObjectId,
545545
temp= (float64)fmgr(get_oprrest (operatorObjectId),
546546
(char*)operatorObjectId,
547547
(char*)indrelid,
548-
(char*)attributeNumber,
548+
(char*)(int)attributeNumber,
549549
(char*)constValue,
550550
(char*)constFlag,
551551
NULL);

0 commit comments

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