diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3bc0d5de6a..11dedcb128 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +2001-10-19 01:35 UTC-0500 Paul Tucker + * source/contrib/libct + * justify.c + pos2.c + range.c + relation.c + replace.c + strswap.c + wordtoch.c + pad.c + * added casts to xgrab calls. + 2001-10-19 18:42 GMT-3 Horacio Roldan * source/rdd/dbfcdx/dbfcdx1.c ! fixed ordSetFocus related, if the previos order was 0, it did nothing diff --git a/harbour/contrib/libct/justify.c b/harbour/contrib/libct/justify.c index 1db169b225..b062692e02 100644 --- a/harbour/contrib/libct/justify.c +++ b/harbour/contrib/libct/justify.c @@ -84,7 +84,7 @@ static void do_justify (int iSwitch) else cJustChar = 0x20; - pcRet = hb_xgrab (sStrLen); + pcRet = ( char *)hb_xgrab (sStrLen); switch (iSwitch) { diff --git a/harbour/contrib/libct/pad.c b/harbour/contrib/libct/pad.c index cff34044b2..c25ef4f8cb 100644 --- a/harbour/contrib/libct/pad.c +++ b/harbour/contrib/libct/pad.c @@ -100,7 +100,7 @@ static void do_pad (int iSwitch) else cFill = 0x20; - pcRet = hb_xgrab (sRetLen); + pcRet = ( char * )hb_xgrab (sRetLen); if (iSwitch == DO_PAD_PADLEFT) { diff --git a/harbour/contrib/libct/pos2.c b/harbour/contrib/libct/pos2.c index 41ca5e0c10..a756ebb550 100644 --- a/harbour/contrib/libct/pos2.c +++ b/harbour/contrib/libct/pos2.c @@ -123,7 +123,7 @@ HB_FUNC (POSCHAR) sPosition = sStrLen; } - pcRet = hb_xgrab (sStrLen); + pcRet = ( char * )hb_xgrab (sStrLen); hb_xmemcpy (pcRet, pcString, sStrLen); *(pcRet+sPosition-1) = cReplace; @@ -262,7 +262,7 @@ HB_FUNC (POSDEL) sStartPos = sStrLen-sDelLen+1; } - pcRet = hb_xgrab (sStrLen-sDelLen); + pcRet = ( char * )hb_xgrab (sStrLen-sDelLen); /* copy first part */ if (sStartPos > 1) @@ -382,7 +382,7 @@ HB_FUNC (POSINS) return; } - pcRet = hb_xgrab (sStrLen+sInsLen); + pcRet = ( char * )hb_xgrab (sStrLen+sInsLen); /* copy first part */ if (sStartPos > 1) @@ -547,7 +547,7 @@ HB_FUNC (POSREPL) sRetLen = sStartPos+sReplLen-1; } - pcRet = hb_xgrab (sRetLen); + pcRet = ( char * )hb_xgrab (sRetLen); /* copy first part */ if (sStartPos > 1) diff --git a/harbour/contrib/libct/range.c b/harbour/contrib/libct/range.c index 5cb5def316..f87e3d27f5 100644 --- a/harbour/contrib/libct/range.c +++ b/harbour/contrib/libct/range.c @@ -119,7 +119,7 @@ HB_FUNC (RANGEREM) iMode = (ucChar2 < ucChar1); - pcRet = hb_xgrab (sStrLen); + pcRet = ( char * )hb_xgrab (sStrLen); sRetIndex = 0; for (pc = pcString; pc < pcString+sStrLen; pc++) { @@ -257,7 +257,7 @@ HB_FUNC (RANGEREPL) iMode = (ucChar2 < ucChar1); - pcRet = hb_xgrab (sStrLen); + pcRet = ( char * )hb_xgrab (sStrLen); sRetIndex = 0; for (pc = pcString; pc < pcString+sStrLen; pc++) { diff --git a/harbour/contrib/libct/relation.c b/harbour/contrib/libct/relation.c index d73705dea7..d4656f14c8 100644 --- a/harbour/contrib/libct/relation.c +++ b/harbour/contrib/libct/relation.c @@ -268,7 +268,7 @@ HB_FUNC (CHARRELREP) return; } - pcRet = hb_xgrab (sStrLen2); + pcRet = ( char * ) hb_xgrab (sStrLen2); hb_xmemcpy (pcRet, pcString2, sStrLen2); sOffset1 = 0; diff --git a/harbour/contrib/libct/replace.c b/harbour/contrib/libct/replace.c index 0c3a8e05fb..5b0dab0603 100644 --- a/harbour/contrib/libct/replace.c +++ b/harbour/contrib/libct/replace.c @@ -107,7 +107,7 @@ static void do_replace (int iSwitch) cSearch = 0x20; } - pcRet = hb_xgrab (sStrLen); + pcRet = ( char * )hb_xgrab (sStrLen); hb_xmemcpy (pcRet, pcString, sStrLen); if (iSwitch != DO_REPLACE_REPLRIGHT) diff --git a/harbour/contrib/libct/strswap.c b/harbour/contrib/libct/strswap.c index 4842e3c1bf..d07b8d856c 100644 --- a/harbour/contrib/libct/strswap.c +++ b/harbour/contrib/libct/strswap.c @@ -102,13 +102,13 @@ HB_FUNC (STRSWAP) if ((iChange1=ISBYREF(1)) != 0) { - pcRet1 = hb_xgrab (sStrLen1); + pcRet1 = ( char * )hb_xgrab (sStrLen1); hb_xmemcpy (pcRet1, pcString1, sStrLen1); } if ((iChange2=ISBYREF(2)) != 0) { - pcRet2 = hb_xgrab (sStrLen2); + pcRet2 = ( char * )hb_xgrab (sStrLen2); hb_xmemcpy (pcRet2, pcString2, sStrLen2); } diff --git a/harbour/contrib/libct/wordtoch.c b/harbour/contrib/libct/wordtoch.c index 66fe21a584..896433d238 100644 --- a/harbour/contrib/libct/wordtoch.c +++ b/harbour/contrib/libct/wordtoch.c @@ -108,7 +108,7 @@ HB_FUNC (WORDTOCHAR) size_t sRetIndex, sIndex; int iNoReplace; - pcRet = hb_xgrab (sStrLen); + pcRet = ( char * )hb_xgrab (sStrLen); sRetIndex = 0; sIndex = 0;