fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-20 21:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/common/hbstr.c
    * hb_str2number() changed to limit string size to 'int' internally.
      This fixes the warnings and inconsistencies on Win64.

  * src/rtl/hbcom.c
    ! Pacified msvc warnings on component boundary.
This commit is contained in:
Viktor Szakats
2010-06-20 19:15:40 +00:00
parent 53ba7130ed
commit 4390ee4bd3
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-20 21:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/common/hbstr.c
* hb_str2number() changed to limit string size to 'int' internally.
This fixes the warnings and inconsistencies on Win64.
* src/rtl/hbcom.c
! Pacified msvc warnings on component boundary.
2010-06-20 20:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/arrays.c
! Fixed for Win64 by using hb_vmPushSize(). Signaled by warnings.

44
harbour/src/common/hbstr.c
View File

@@ -540,42 +540,44 @@ double hb_numDecConv( double dNum, int iDec )
static HB_BOOL hb_str2number( HB_BOOL fPCode, const char * szNum, HB_SIZE ulLen, HB_MAXINT * lVal, double * dVal, int * piDec, int * piWidth )
{
HB_BOOL fDbl = HB_FALSE, fDec = HB_FALSE, fNeg, fHex = HB_FALSE;
HB_SIZE ulPos = 0;
int iLen, iPos = 0;
int c, iWidth, iDec = 0, iDecR = 0;
HB_TRACE(HB_TR_DEBUG, ("hb_str2number(%d, %p, %" HB_PFS "u, %p, %p, %p, %p)", (int) fPCode, szNum, ulLen, lVal, dVal, piDec, piWidth ));
HB_TRACE(HB_TR_DEBUG, ("hb_str2number(%d, %p, %" HB_PFS "u, %p, %p, %p, %p)", ( int ) fPCode, szNum, ulLen, lVal, dVal, piDec, piWidth ));
while( ulPos < ulLen && HB_ISSPACE( szNum[ulPos] ) )
ulPos++;
iLen = ( int ) ulLen;
if( ulPos >= ulLen )
while( iPos < iLen && HB_ISSPACE( szNum[ iPos ] ) )
iPos++;
if( iPos >= iLen )
{
fNeg = HB_FALSE;
}
else if( szNum[ ulPos ] == '-' )
else if( szNum[ iPos ] == '-' )
{
fNeg = HB_TRUE;
ulPos++;
iPos++;
}
else
{
fNeg = HB_FALSE;
if( szNum[ ulPos ] == '+' )
ulPos++;
if( szNum[ iPos ] == '+' )
iPos++;
}
*lVal = 0;
/* Hex Number */
if( fPCode && ulPos + 1 < ulLen && szNum[ ulPos ] == '0' &&
( szNum[ ulPos + 1 ] == 'X' || szNum[ ulPos + 1 ] == 'x' ) )
if( fPCode && iPos + 1 < iLen && szNum[ iPos ] == '0' &&
( szNum[ iPos + 1 ] == 'X' || szNum[ iPos + 1 ] == 'x' ) )
{
ulPos += 2;
iPos += 2;
iWidth = HB_DEFAULT_WIDTH;
fHex = HB_TRUE;
for( ; ulPos < ulLen; ulPos++ )
for( ; iPos < iLen; iPos++ )
{
c = szNum[ ulPos ];
c = szNum[ iPos ];
if( c >= '0' && c <= '9' )
c -= '0';
else if( c >= 'A' && c <= 'F' )
@@ -595,11 +597,11 @@ static HB_BOOL hb_str2number( HB_BOOL fPCode, const char * szNum, HB_SIZE ulLen,
lLimV = HB_VMLONG_MAX / 10;
iLimC = ( int ) ( HB_VMLONG_MAX % 10 );
iWidth = ulPos;
iWidth = iPos;
for( ; ulPos < ulLen; ulPos++ )
for( ; iPos < iLen; iPos++ )
{
c = szNum[ ulPos ];
c = szNum[ iPos ];
if( c >= '0' && c <= '9' )
{
if( fDbl )
@@ -626,15 +628,15 @@ static HB_BOOL hb_str2number( HB_BOOL fPCode, const char * szNum, HB_SIZE ulLen,
}
else
{
while( !fDec && ulPos < ulLen )
while( !fDec && iPos < iLen )
{
if( szNum[ ulPos++ ] == '.' )
if( szNum[ iPos++ ] == '.' )
fDec = HB_TRUE;
else
iWidth++;
}
if( fDec )
iDecR = ulLen - ulPos;
iDecR = iLen - iPos;
break;
}
}
@@ -688,7 +690,7 @@ static HB_BOOL hb_str2number( HB_BOOL fPCode, const char * szNum, HB_SIZE ulLen,
else
{
if( iDec + iDecR == 0 )
*piWidth = ( int ) ulLen;
*piWidth = iLen;
else if( iWidth == 0 )
*piWidth = 1;
else if( fNeg && iWidth == 1 && *dVal != 0 )

6
harbour/src/rtl/hbcom.c
View File

@@ -1544,9 +1544,9 @@ int hb_comFlowChars( int iPort, int iXONchar, int iXOFFchar )
if( fResult )
{
if( iXONchar >= 0 )
dcb.XonChar = iXONchar;
dcb.XonChar = ( char ) iXONchar;
if( iXOFFchar >= 0 )
dcb.XoffChar = iXOFFchar;
dcb.XoffChar = ( char ) iXOFFchar;
fResult = SetCommState( pCom->hComm, &dcb );
}
}
@@ -1588,7 +1588,7 @@ int hb_comErrorChar( int iPort, int iChar )
if( iChar >= 0 )
{
dcb.fErrorChar = TRUE;
dcb.ErrorChar = iChar;
dcb.ErrorChar = ( char ) iChar;
}
else
dcb.fErrorChar = FALSE;