From 7bdd8dcac39a25749b497c71fcbf206b31388061 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Wed, 31 Jul 1996 18:48:16 +0000
Subject: [PATCH] This prevent gcc from complaining about casting a short to a
char * and fixes another complaint.
More fixes from Bruce...
---
src/backend/access/nbtree/nbtsort.c | 8 ++++----
src/backend/optimizer/util/clauseinfo.c | 4 ++--
src/backend/optimizer/util/plancat.c | 8 ++++----
src/backend/utils/adt/selfuncs.c | 10 +++++-----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 3d2676324a0..c01c799978c 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* 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
*
@@ -97,10 +97,10 @@ _bt_isortcmpinit(Relation index)
}
static int
-_bt_isortcmp(BTItem *bti1p, BTItem *bti2p)
+_bt_isortcmp(const void *bti1p,const void *bti2p)
{
- BTItem bti1 = *bti1p;
- BTItem bti2 = *bti2p;
+ BTItem bti1 = *(BTItem *)bti1p;
+ BTItem bti2 = *(BTItem *)bti2p;
if (bti1 == (BTItem) NULL) {
if (bti2 == (BTItem) NULL) {
diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c
index 81a64d63368..2d648eb3605 100644
--- a/src/backend/optimizer/util/clauseinfo.c
+++ b/src/backend/optimizer/util/clauseinfo.c
@@ -7,7 +7,7 @@
*
*
* 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);
get_relattval((Node*)temp->clause, &dummy, &attno, &constval, &flag);
- result1 = lappendi(result1, attno);
+ result1 = lappendi(result1, (int)attno);
result2 = lappendi(result2, constval);
result3 = lappendi(result3, flag);
}
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 4dca017f95a..2f44c45c7f4 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* 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,
(char *) operatorObjectId,
(char *) relationObjectId,
- (char *) attributeNumber,
+ (char *) (int)attributeNumber,
(char *) constValue,
(char *) constFlag,
NULL);
@@ -363,9 +363,9 @@ join_selectivity (Oid functionObjectId,
result = (float64) fmgr(functionObjectId,
(char *) operatorObjectId,
(char *) relationObjectId1,
- (char *) attributeNumber1,
+ (char *) (int)attributeNumber1,
(char *) relationObjectId2,
- (char *) attributeNumber2,
+ (char *) (int)attributeNumber2,
NULL);
if (!PointerIsValid(result))
elog(WARN, "JoinClauseSelectivity: bad pointer");
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 8ee93b768d3..d1d5daae9f3 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
*
*
* 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),
(char*)operatorObjectId,
(char*)indrelid,
- (char*)attributeNumber,
+ (char*)(int)attributeNumber,
(char*)constValue,
(char*)constFlag,
NULL);
@@ -422,7 +422,7 @@ btreenpage(Oid operatorObjectId,
temp = (float64)fmgr(get_oprrest (operatorObjectId),
(char*)operatorObjectId,
(char*)indrelid,
- (char*)attributeNumber,
+ (char*)(int)attributeNumber,
(char*)constValue,
(char*)constFlag,
NULL);
@@ -484,7 +484,7 @@ hashsel(Oid operatorObjectId,
result = (float64)fmgr(get_oprrest (operatorObjectId),
(char*)operatorObjectId,
(char*)indrelid,
- (char*)attributeNumber,
+ (char*)(int)attributeNumber,
(char*)constValue,
(char*)constFlag,
NULL);
@@ -545,7 +545,7 @@ hashnpage(Oid operatorObjectId,
temp = (float64)fmgr(get_oprrest (operatorObjectId),
(char*)operatorObjectId,
(char*)indrelid,
- (char*)attributeNumber,
+ (char*)(int)attributeNumber,
(char*)constValue,
(char*)constFlag,
NULL);
--
GitLab