mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-01 13:11:22 +02:00
This prevent gcc from complaining about casting a short to a char * and
fixes another complaint. More fixes from Bruce...
This commit is contained in:
parent
9c0f89c4a4
commit
7bdd8dcac3
@ -5,7 +5,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Id: nbtsort.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
|
* $Id: nbtsort.c,v 1.2 1996/07/31 18:46:47 scrappy Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
*
|
*
|
||||||
@ -97,10 +97,10 @@ _bt_isortcmpinit(Relation index)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_bt_isortcmp(BTItem *bti1p, BTItem *bti2p)
|
_bt_isortcmp(const void *bti1p,const void *bti2p)
|
||||||
{
|
{
|
||||||
BTItem bti1 = *bti1p;
|
BTItem bti1 = *(BTItem *)bti1p;
|
||||||
BTItem bti2 = *bti2p;
|
BTItem bti2 = *(BTItem *)bti2p;
|
||||||
|
|
||||||
if (bti1 == (BTItem) NULL) {
|
if (bti1 == (BTItem) NULL) {
|
||||||
if (bti2 == (BTItem) NULL) {
|
if (bti2 == (BTItem) NULL) {
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.2 1996/07/22 23:30:57 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.3 1996/07/31 18:47:06 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -103,7 +103,7 @@ get_relattvals(List *clauseinfo_list,
|
|||||||
|
|
||||||
temp = (CInfo *)lfirst(i);
|
temp = (CInfo *)lfirst(i);
|
||||||
get_relattval((Node*)temp->clause, &dummy, &attno, &constval, &flag);
|
get_relattval((Node*)temp->clause, &dummy, &attno, &constval, &flag);
|
||||||
result1 = lappendi(result1, attno);
|
result1 = lappendi(result1, (int)attno);
|
||||||
result2 = lappendi(result2, constval);
|
result2 = lappendi(result2, constval);
|
||||||
result3 = lappendi(result3, flag);
|
result3 = lappendi(result3, flag);
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.1.1.1 1996/07/09 06:21:39 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2 1996/07/31 18:47:08 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -324,7 +324,7 @@ restriction_selectivity(Oid functionObjectId,
|
|||||||
result = (float64) fmgr(functionObjectId,
|
result = (float64) fmgr(functionObjectId,
|
||||||
(char *) operatorObjectId,
|
(char *) operatorObjectId,
|
||||||
(char *) relationObjectId,
|
(char *) relationObjectId,
|
||||||
(char *) attributeNumber,
|
(char *) (int)attributeNumber,
|
||||||
(char *) constValue,
|
(char *) constValue,
|
||||||
(char *) constFlag,
|
(char *) constFlag,
|
||||||
NULL);
|
NULL);
|
||||||
@ -363,9 +363,9 @@ join_selectivity (Oid functionObjectId,
|
|||||||
result = (float64) fmgr(functionObjectId,
|
result = (float64) fmgr(functionObjectId,
|
||||||
(char *) operatorObjectId,
|
(char *) operatorObjectId,
|
||||||
(char *) relationObjectId1,
|
(char *) relationObjectId1,
|
||||||
(char *) attributeNumber1,
|
(char *) (int)attributeNumber1,
|
||||||
(char *) relationObjectId2,
|
(char *) relationObjectId2,
|
||||||
(char *) attributeNumber2,
|
(char *) (int)attributeNumber2,
|
||||||
NULL);
|
NULL);
|
||||||
if (!PointerIsValid(result))
|
if (!PointerIsValid(result))
|
||||||
elog(WARN, "JoinClauseSelectivity: bad pointer");
|
elog(WARN, "JoinClauseSelectivity: bad pointer");
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.2 1996/07/31 18:48:16 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -380,7 +380,7 @@ btreesel(Oid operatorObjectId,
|
|||||||
result = (float64)fmgr(get_oprrest (operatorObjectId),
|
result = (float64)fmgr(get_oprrest (operatorObjectId),
|
||||||
(char*)operatorObjectId,
|
(char*)operatorObjectId,
|
||||||
(char*)indrelid,
|
(char*)indrelid,
|
||||||
(char*)attributeNumber,
|
(char*)(int)attributeNumber,
|
||||||
(char*)constValue,
|
(char*)constValue,
|
||||||
(char*)constFlag,
|
(char*)constFlag,
|
||||||
NULL);
|
NULL);
|
||||||
@ -422,7 +422,7 @@ btreenpage(Oid operatorObjectId,
|
|||||||
temp = (float64)fmgr(get_oprrest (operatorObjectId),
|
temp = (float64)fmgr(get_oprrest (operatorObjectId),
|
||||||
(char*)operatorObjectId,
|
(char*)operatorObjectId,
|
||||||
(char*)indrelid,
|
(char*)indrelid,
|
||||||
(char*)attributeNumber,
|
(char*)(int)attributeNumber,
|
||||||
(char*)constValue,
|
(char*)constValue,
|
||||||
(char*)constFlag,
|
(char*)constFlag,
|
||||||
NULL);
|
NULL);
|
||||||
@ -484,7 +484,7 @@ hashsel(Oid operatorObjectId,
|
|||||||
result = (float64)fmgr(get_oprrest (operatorObjectId),
|
result = (float64)fmgr(get_oprrest (operatorObjectId),
|
||||||
(char*)operatorObjectId,
|
(char*)operatorObjectId,
|
||||||
(char*)indrelid,
|
(char*)indrelid,
|
||||||
(char*)attributeNumber,
|
(char*)(int)attributeNumber,
|
||||||
(char*)constValue,
|
(char*)constValue,
|
||||||
(char*)constFlag,
|
(char*)constFlag,
|
||||||
NULL);
|
NULL);
|
||||||
@ -545,7 +545,7 @@ hashnpage(Oid operatorObjectId,
|
|||||||
temp = (float64)fmgr(get_oprrest (operatorObjectId),
|
temp = (float64)fmgr(get_oprrest (operatorObjectId),
|
||||||
(char*)operatorObjectId,
|
(char*)operatorObjectId,
|
||||||
(char*)indrelid,
|
(char*)indrelid,
|
||||||
(char*)attributeNumber,
|
(char*)(int)attributeNumber,
|
||||||
(char*)constValue,
|
(char*)constValue,
|
||||||
(char*)constFlag,
|
(char*)constFlag,
|
||||||
NULL);
|
NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user