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

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

Browse Source 
* src/vm/macro.c
  * src/vm/estack.c
  * src/vm/dynsym.c
  * src/vm/hvm.c
  * src/vm/set.c
  * src/rdd/wafunc.c
  * src/compiler/hbmain.c
  * src/compiler/cmdcheck.c
  * src/compiler/genc.c
  * src/compiler/gencc.c
  * src/compiler/harbour.yyc
  * src/compiler/harbour.y
  * include/hbexprb.c
    + Added strlen() casts to pacify msvc64 warnings

  * src/vm/cmdarg.c
    ! Readded one '( void * )' cast. (I've only tested C++ mode
      on Windows, this fell into *nix code). Thanks for checking it.

  * src/rtl/hbgtcore.c
    + HB_SIZE -> HB_UINT, plus added necessary casts. Signaled by warnings

  * contrib/hbmisc/spd.c
    + HB_SIZE -> HB_UINT, plus added necessary casts. Signaled by warnings
    ; In case of this function it'd be probably better to make it fully
      HB_SIZE compatible, instead of stepping back like this.

  * src/rdd/sdf1.c
  * src/rdd/delim1.c
    + Added casts to pacify some msvc64 warnings

  * src/rdd/hsx/hsx.c
    ! HB_SIZE -> HB_LONG. Resolves msvc64 warnings.
This commit is contained in:
Viktor Szakats
2010-06-20 17:17:23 +00:00
parent 21d22afdbd
commit 337219b053
20 changed files with 93 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
harbour/ChangeLog
View File

@@ -16,6 +16,41 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-20 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/macro.c
* src/vm/estack.c
* src/vm/dynsym.c
* src/vm/hvm.c
* src/vm/set.c
* src/rdd/wafunc.c
* src/compiler/hbmain.c
* src/compiler/cmdcheck.c
* src/compiler/genc.c
* src/compiler/gencc.c
* src/compiler/harbour.yyc
* src/compiler/harbour.y
* include/hbexprb.c
+ Added strlen() casts to pacify msvc64 warnings
* src/vm/cmdarg.c
! Readded one '( void * )' cast. (I've only tested C++ mode
on Windows, this fell into *nix code). Thanks for checking it.
* src/rtl/hbgtcore.c
+ HB_SIZE -> HB_UINT, plus added necessary casts. Signaled by warnings
* contrib/hbmisc/spd.c
+ HB_SIZE -> HB_UINT, plus added necessary casts. Signaled by warnings
; In case of this function it'd be probably better to make it fully
HB_SIZE compatible, instead of stepping back like this.
* src/rdd/sdf1.c
* src/rdd/delim1.c
+ Added casts to pacify some msvc64 warnings
* src/rdd/hsx/hsx.c
! HB_SIZE -> HB_LONG. Resolves msvc64 warnings.
2010-06-20 17:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/pp/hbpp.c
* src/vm/cmdarg.c

20
harbour/contrib/hbmisc/spd.c
View File

@@ -57,7 +57,7 @@
static void STAItm( PHB_ITEM pItmPar )
{
HB_SIZE i, ulItmPar = hb_itemGetCLen( pItmPar );
HB_UINT i, ulItmPar = ( HB_UINT ) hb_itemGetCLen( pItmPar );
const char *cItmPar = hb_itemGetCPtr( pItmPar ), *c;
char *cRes;
@@ -74,9 +74,9 @@ static void STAItm( PHB_ITEM pItmPar )
hb_itemPutCLPtr( pItmPar, cRes, i );
}
static HB_SIZE SCItm( char *cBuffer, HB_SIZE ulMaxBuf, char *cParFrm, int iCOut, int IsIndW, int iIndWidth, int IsIndP, int iIndPrec, PHB_ITEM pItmPar )
static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, int IsIndW, int iIndWidth, int IsIndP, int iIndPrec, PHB_ITEM pItmPar )
{
HB_SIZE s;
HB_UINT s;
/* NOTE: In DJGPP (4.2.3) hb_snprintf() will be preprocessed to sprintf(), which
makes ulMaxBuf unused, and this in turn causes a warning, so we're
@@ -186,7 +186,7 @@ static HB_SIZE SCItm( char *cBuffer, HB_SIZE ulMaxBuf, char *cParFrm, int iCOut,
HB_FUNC( SQL_SPRINTF )
{
HB_SIZE ulItmFrm;
HB_UINT ulItmFrm;
const char *cItmFrm;
char *cRes;
int argc = hb_pcount() - 1;
@@ -194,7 +194,7 @@ HB_FUNC( SQL_SPRINTF )
if( !pItmFrm || (cItmFrm = hb_itemGetCPtr( pItmFrm )) == NULL ){
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
}else if( (ulItmFrm = hb_itemGetCLen( pItmFrm )) == 0 ){
}else if( (ulItmFrm = ( HB_UINT ) hb_itemGetCLen( pItmFrm )) == 0 ){
hb_retc_null();
}else if( !argc ){
cRes = (char *)hb_xgrab( ulItmFrm + sizeof(char) );
@@ -205,7 +205,7 @@ HB_FUNC( SQL_SPRINTF )
char *cIntMod, *cBuffer, *cParFrm;
const char *c;
int p, arg, iCOut, IsType, IsIndW, IsIndP, iIndWidth, iIndPrec, iErrorPar = 0;
HB_SIZE s, f, i, ulWidth, ulParPos = 0, ulResPos = 0, ulMaxBuf = DK_INCBUF, ulMaxRes = DK_INCRES;
HB_UINT s, f, i, ulWidth, ulParPos = 0, ulResPos = 0, ulMaxBuf = DK_INCBUF, ulMaxRes = DK_INCRES;
static char cToken[] = "stTcdiouxXaAeEfgGpnSC";
cIntMod = NULL;
@@ -375,7 +375,7 @@ HB_FUNC( SQL_SPRINTF )
else
STAItm( pItmPar );
}
f = hb_itemGetCLen( pItmPar );
f = ( HB_UINT ) hb_itemGetCLen( pItmPar );
if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
@@ -448,7 +448,9 @@ HB_FUNC( SQL_SPRINTF )
const char *cTrimStr;
if( cStr ){
f = strlen( cStr ); cTrimStr = hb_strLTrim( cStr, &f );
HB_SIZE nLen = strlen( cStr );
cTrimStr = hb_strLTrim( cStr, &nLen );
f = ( HB_UINT ) nLen;
if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
@@ -479,7 +481,7 @@ HB_FUNC( SQL_SPRINTF )
}
hb_strncpy( cRes + ulResPos, cBuffer, s ); ulResPos += s;
if( (ulParPos = c - cItmFrm) >= ulItmFrm ){
if( (ulParPos = ( HB_UINT ) ( c - cItmFrm ) ) >= ulItmFrm ){
break; /* No more Par Format */
}
}

2
harbour/include/hbexprb.c
View File

@@ -5443,7 +5443,7 @@ static HB_EXPR_PTR hb_compExprReduceAliasString( HB_EXPR_PTR pExpr, HB_EXPR_PTR
static HB_BOOL hb_compExprIsMemvarAlias( const char *szAlias )
{
int iLen = strlen( szAlias );
int iLen = ( int ) strlen( szAlias );
/* @M-> @MEMVAR-> or @MEMVA-> or @MEMV-> */
return ( iLen == 1 || ( iLen >= 4 && iLen <= 6 ) ) &&
memcmp( szAlias, "MEMVAR", iLen ) == 0;

20
harbour/src/compiler/cmdcheck.c
View File

@@ -805,7 +805,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as part of #define and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'e':
@@ -833,7 +833,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
{
szSwitch += ( j - 1 );
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
}
else
{
@@ -867,14 +867,14 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as IncludePath and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'j':
case 'J':
szSwitch += ( j - 1 );
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'k':
@@ -883,7 +883,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as part of #define and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'n':
@@ -911,7 +911,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as OutputPath and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'p':
@@ -922,7 +922,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as PPOPath and continue with next Args[]. */
j += strlen( szSwitch ) - 1;
j += ( int ) strlen( szSwitch ) - 1;
}
else
{
@@ -955,7 +955,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
case 'r':
case 'R':
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
j = strlen( szSwitch ) - 1;
j = ( int ) strlen( szSwitch ) - 1;
break;
case 's':
@@ -977,7 +977,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as part of .ch Path or "undef:<id>" and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case 'w':
@@ -1006,7 +1006,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[]
hb_compChkEnvironVar( HB_COMP_PARAM, szSwitch );
/* Accept rest as INIT Symbol and continue with next Args[]. */
j = strlen( szSwitch );
j = ( int ) strlen( szSwitch );
continue;
case '-':

2
harbour/src/compiler/genc.c
View File

@@ -259,7 +259,7 @@ void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME pFileName ) /* generates the
hb_strncpyUpper( szFileName, pFileName->szName, sizeof( szFileName ) - 1 );
/* replace non ID characters in name of local symbol table by '_' */
{
int iLen = strlen( szFileName ), i;
int iLen = ( int ) strlen( szFileName ), i;
for( i = 0; i < iLen; i++ )
{

6
harbour/src/compiler/gencc.c
View File

@@ -665,7 +665,7 @@ static HB_GENC_FUNC( hb_p_localname )
HB_GENC_LABEL();
usLen = strlen( ( char * ) &pFunc->pCode[ lPCodePos + 3 ] );
usLen = ( HB_USHORT ) strlen( ( char * ) &pFunc->pCode[ lPCodePos + 3 ] );
fprintf( cargo->yyc, "\thb_xvmLocalName( %hu, ",
HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 1 ] ) );
hb_compGenCString( cargo->yyc, &pFunc->pCode[ lPCodePos + 3 ], usLen );
@@ -817,7 +817,7 @@ static HB_GENC_FUNC( hb_p_modulename )
HB_GENC_LABEL();
usLen = strlen( ( char * ) &pFunc->pCode[ lPCodePos + 1 ] );
usLen = ( HB_USHORT ) strlen( ( char * ) &pFunc->pCode[ lPCodePos + 1 ] );
fprintf( cargo->yyc, "\thb_xvmModuleName( " );
hb_compGenCString( cargo->yyc, &pFunc->pCode[ lPCodePos + 1 ], usLen );
fprintf( cargo->yyc, " );\n" );
@@ -1628,7 +1628,7 @@ static HB_GENC_FUNC( hb_p_staticname )
HB_GENC_LABEL();
usLen = strlen( ( char * ) &pFunc->pCode[ lPCodePos + 4 ] );
usLen = ( HB_USHORT ) strlen( ( char * ) &pFunc->pCode[ lPCodePos + 4 ] );
fprintf( cargo->yyc, "\thb_xvmStaticName( %hu, %hu, ",
( HB_USHORT ) pFunc->pCode[ lPCodePos + 1 ],
HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 2 ] ) );

2
harbour/src/compiler/harbour.y
View File

@@ -1290,7 +1290,7 @@ DecData : IdentName { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_
else
pClass = NULL;
iLen = strlen( $1 );
iLen = ( int ) strlen( $1 );
if( iLen >= HB_SYMBOL_NAME_LEN )
iLen = HB_SYMBOL_NAME_LEN - 1;
szSetData[ 0 ] = '_';

2
harbour/src/compiler/harbour.yyc
View File

@@ -6077,7 +6077,7 @@ yyreduce:
else
pClass = NULL;
iLen = strlen( (yyvsp[(1) - (3)].string) );
iLen = ( int ) strlen( (yyvsp[(1) - (3)].string) );
if( iLen >= HB_SYMBOL_NAME_LEN )
iLen = HB_SYMBOL_NAME_LEN - 1;
szSetData[ 0 ] = '_';

10
harbour/src/compiler/hbmain.c
View File

@@ -2079,7 +2079,7 @@ void hb_compFunctionAdd( HB_COMP_DECL, const char * szFunName, HB_SYMBOLSCOPE cS
char szNewName[ HB_SYMBOL_NAME_LEN + 1 ];
int iLen;
iLen = strlen( szFunName );
iLen = ( int ) strlen( szFunName );
if( iLen >= HB_SYMBOL_NAME_LEN )
iLen = HB_SYMBOL_NAME_LEN - 1;
memcpy( szNewName, szFunName, iLen );
@@ -2542,7 +2542,7 @@ void hb_compGenMessage( const char * szMsgName, HB_BOOL bIsObject, HB_COMP_DECL
void hb_compGenMessageData( const char * szMsg, HB_BOOL bIsObject, HB_COMP_DECL ) /* generates an underscore-symbol name for a data assignment */
{
char szResult[ HB_SYMBOL_NAME_LEN + 1 ];
int iLen = strlen( szMsg );
int iLen = ( int ) strlen( szMsg );
if( iLen >= HB_SYMBOL_NAME_LEN )
iLen = HB_SYMBOL_NAME_LEN - 1;
@@ -2799,7 +2799,7 @@ void hb_compGenPopAliasedVar( const char * szVarName,
{
if( szAlias )
{
int iLen = strlen( szAlias );
int iLen = ( int ) strlen( szAlias );
if( szAlias[ 0 ] == 'M' && ( iLen == 1 ||
( iLen >= 4 && iLen <= 6 &&
memcmp( szAlias, "MEMVAR", iLen ) == 0 ) ) )
@@ -2844,7 +2844,7 @@ void hb_compGenPushAliasedVar( const char * szVarName,
{
if( szAlias )
{
int iLen = strlen( szAlias );
int iLen = ( int ) strlen( szAlias );
/* myalias->var
* FIELD->var
* MEMVAR->var
@@ -3513,7 +3513,7 @@ void hb_compCodeBlockEnd( HB_COMP_DECL )
while( pVar )
{
if( HB_COMP_PARAM->fDebugInfo )
wLocalsLen += 4 + strlen( pVar->szName );
wLocalsLen += 4 + ( HB_USHORT ) strlen( pVar->szName );
pVar = pVar->pNext;
++wLocals;
}

2
harbour/src/rdd/delim1.c
View File

@@ -80,7 +80,7 @@ static void hb_delimInitArea( DELIMAREAP pArea, char * szFileName )
if( !szEol || !szEol[ 0 ] )
szEol = hb_conNewLine();
pArea->szEol = hb_strdup( szEol );
pArea->uiEolLen = strlen( pArea->szEol );
pArea->uiEolLen = ( HB_USHORT ) strlen( pArea->szEol );
/* allocate record buffer, one additional byte is for deleted flag */
pArea->pRecord = ( HB_BYTE * ) hb_xgrab( pArea->uiRecordLen + 1 );

8
harbour/src/rdd/hsx/hsx.c
View File

@@ -323,7 +323,7 @@ typedef struct _HSXINFO
char * szFileName; /* file name */
HB_BOOL fShared; /* Shared file */
HB_BOOL fReadonly; /* Read only file */
HB_SIZE ulBufSize; /* size of buffer in records */
HB_ULONG ulBufSize; /* size of buffer in records */
HB_ULONG ulBufRec; /* number of record in buffer */
HB_ULONG ulFirstRec; /* first record in the buffer */
HB_BYTE * pBuffer; /* the buffer pointer */
@@ -1387,7 +1387,7 @@ static int hb_hsxCreate( const char * szFile, int iBufSize, int iKeySize,
char szFileName[ HB_PATH_MAX ];
const char * szExpr = NULL;
PHB_ITEM pKeyExpr = NULL;
HB_SIZE ulBufSize;
HB_ULONG ulBufSize;
HB_USHORT uiRecordSize;
LPHSXINFO pHSX;
PHB_FILE pFile;
@@ -1476,7 +1476,7 @@ static int hb_hsxOpen( const char * szFile, int iBufSize, int iMode )
char szFileName[ HB_PATH_MAX ];
HB_BOOL fShared, fReadonly;
PHB_FILE pFile;
HB_SIZE ulBufSize;
HB_ULONG ulBufSize;
HB_USHORT uiFlags;
LPHSXINFO pHSX;
int iRetVal, iRet;
@@ -1601,7 +1601,7 @@ static int hb_hsxIndex( const char * szFile, PHB_ITEM pExpr, int iKeySize,
return hb_hsxOpen( szFile, iBufSize, iMode );
}
static int hb_hsxFilter( int iHandle, const char * pSeek, HB_ULONG ulSeek,
static int hb_hsxFilter( int iHandle, const char * pSeek, HB_SIZE ulSeek,
PHB_ITEM pVerify, int iVerifyType )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();

10
harbour/src/rdd/sdf1.c
View File

@@ -80,7 +80,7 @@ static void hb_sdfInitArea( SDFAREAP pArea, char * szFileName )
if( !szEol || !szEol[ 0 ] )
szEol = hb_conNewLine();
pArea->szEol = hb_strdup( szEol );
pArea->uiEolLen = strlen( pArea->szEol );
pArea->uiEolLen = ( HB_USHORT ) strlen( pArea->szEol );
/* Alloc buffer */
pArea->pRecord = ( HB_BYTE * ) hb_xgrab( pArea->uiRecordLen + pArea->uiEolLen + 3 );
@@ -105,8 +105,8 @@ static HB_ERRCODE hb_sdfReadRecord( SDFAREAP pArea )
HB_TRACE(HB_TR_DEBUG, ("hb_sdfReadRecord(%p)", pArea));
uiToRead = pArea->uiRecordLen + pArea->uiEolLen + 2;
uiRead = hb_fileReadAt( pArea->pFile, pArea->pRecord, uiToRead,
pArea->ulRecordOffset );
uiRead = ( HB_USHORT ) hb_fileReadAt( pArea->pFile, pArea->pRecord, uiToRead,
pArea->ulRecordOffset );
if( uiRead > 0 && uiRead < uiToRead && pArea->pRecord[ uiRead - 1 ] == '\032' )
--uiRead;
@@ -169,8 +169,8 @@ static HB_ERRCODE hb_sdfNextRecord( SDFAREAP pArea )
do
{
uiRead = hb_fileReadAt( pArea->pFile, pArea->pRecord + uiRest,
uiToRead - uiRest, ulOffset + uiRest ) + uiRest;
uiRead = ( HB_USHORT ) hb_fileReadAt( pArea->pFile, pArea->pRecord + uiRest,
uiToRead - uiRest, ulOffset + uiRest ) + uiRest;
if( uiRead > 0 && uiRead < uiToRead &&
pArea->pRecord[ uiRead - 1 ] == '\032' )
--uiRead;

11
harbour/src/rdd/wafunc.c
View File

@@ -244,9 +244,7 @@ HB_USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField )
int n;
while( HB_ISSPACE( *szField ) )
{
++szField;
}
if( strchr( szField, '>' ) != NULL )
{
@@ -255,7 +253,7 @@ HB_USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField )
n = 0;
if( SELF_ALIAS( pArea, szAlias ) == HB_SUCCESS )
l = strlen( szAlias );
l = ( int ) strlen( szAlias );
else
l = 0;
@@ -314,14 +312,11 @@ HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea )
HB_TRACE(HB_TR_DEBUG, ("hb_rddGetAliasNumber(%s, %p)", szAlias, iArea));
while( *szAlias == ' ' )
{
szAlias++;
}
c = szAlias[ 0 ];
if( c >= 'a' && c <= 'z' )
{
c -= 'a' - 'A';
}
fOneLetter = c && ( szAlias[ 1 ] == 0 || szAlias[ 1 ] == ' ' );
@@ -343,9 +338,7 @@ HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea )
*iArea = pSymAlias ? ( int ) hb_dynsymAreaHandle( pSymAlias ) : 0;
if( *iArea == 0 )
{
return HB_FAILURE;
}
}
return HB_SUCCESS;

10
harbour/src/rtl/hbgtcore.c
View File

@@ -1647,7 +1647,7 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
if( HB_IS_STRING( pMessage ) && iOptions > 0 )
{
const char * szMessage = hb_itemGetCPtr( pMessage );
HB_SIZE ulLen = hb_itemGetCLen( pMessage );
HB_UINT ulLen = ( HB_UINT ) hb_itemGetCLen( pMessage );
HB_BOOL fScreen = HB_FALSE, fKeyBoard = HB_FALSE;
int iKey = 0, i, iDspCount, iStyle, iRows, iCols,
iRow, iCol, iTop, iLeft, iBottom, iRight, iMnuCol, iPos, iClr;
@@ -1673,7 +1673,7 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
if( fScreen )
{
HB_SIZE ulLines = 0, ulWidth = 0, ulCurrWidth = 0, ul = 0, ulDst = 0,
HB_UINT ulLines = 0, ulWidth = 0, ulCurrWidth = 0, ul = 0, ulDst = 0,
ulLast = 0, ulSpace1 = 0, ulSpace2 = 0, ulDefWidth, ulMaxWidth;
char * szMsgDsp;
@@ -1765,7 +1765,7 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
ulCurrWidth = 0;
for( i = 1; i <= iOptions; ++i )
{
ulCurrWidth += hb_arrayGetCLen( pOptions, i ) + 4;
ulCurrWidth += ( HB_UINT ) hb_arrayGetCLen( pOptions, i ) + 4;
}
if( ulCurrWidth > ulMaxWidth )
ulCurrWidth = ulMaxWidth;
@@ -1832,7 +1832,7 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
for( i = 1; i <= iOptions; ++i )
{
iClr = i == iPos ? iClrHigh : iClrNorm;
ulLen = hb_arrayGetCLen( pOptions, i );
ulLen = ( HB_UINT ) hb_arrayGetCLen( pOptions, i );
HB_GTSELF_PUTTEXT( pGT, iBottom - 1, iMnuCol, iClr, " ", 1 );
HB_GTSELF_PUTTEXT( pGT, iBottom - 1, iMnuCol + 1, iClr,
hb_arrayGetCPtr( pOptions, i ), ulLen );
@@ -1873,7 +1873,7 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
iMnuCol = iLeft + ( ( ulWidth - ulCurrWidth ) >> 1 ) + 4;
for( i = 1; i <= iOptions; ++i )
{
ulLen = hb_arrayGetCLen( pOptions, i );
ulLen = ( HB_UINT ) hb_arrayGetCLen( pOptions, i );
if( iMCol >= iMnuCol && iMCol < iMnuCol + ( int ) ulLen )
{
iRet = i;

2
harbour/src/vm/cmdarg.c
View File

@@ -233,7 +233,7 @@ void hb_cmdargUpdate( void )
hb_strncat( s_szAppName, pFName->szPath, HB_PATH_MAX - 1 );
pFName->szPath = hb_strdup( s_szAppName );
hb_fsFNameMerge( s_szAppName, pFName );
hb_xfree( pFName->szPath );
hb_xfree( ( void * ) pFName->szPath );
s_argv[ 0 ] = s_szAppName;
}
}

2
harbour/src/vm/dynsym.c
View File

@@ -178,7 +178,7 @@ static PHB_SYMB hb_symbolAlloc( const char * szName )
HB_TRACE(HB_TR_DEBUG, ("hb_symbolAlloc(%s)", szName));
iLen = strlen( szName );
iLen = ( int ) strlen( szName );
pHolder = ( PHB_SYM_HOLDER ) hb_xgrab( sizeof( HB_SYM_HOLDER ) + iLen );
memcpy( pHolder->szName, szName, iLen + 1 );
pHolder->pNext = s_pAllocSyms;

2
harbour/src/vm/estack.c
View File

@@ -1220,7 +1220,7 @@ void hb_stackDispCall( void )
while( hb_procinfo( iLevel++, buffer, &uiLine, file ) )
{
int l = strlen( buffer );
int l = ( int ) strlen( buffer );
hb_snprintf( buffer + l, sizeof( buffer ) - l, "(%hu)%s%s", uiLine, *file ? HB_I_(" in ") : "", file );
hb_conOutErr( "Called from ", 0 );

2
harbour/src/vm/hvm.c
View File

@@ -8613,7 +8613,7 @@ void hb_vmRequestCancel( void )
while( hb_procinfo( iLevel++, buffer, &uiLine, file ) )
{
l = strlen( buffer );
l = ( int ) strlen( buffer );
hb_snprintf( buffer + l, sizeof( buffer ) - l, " (%hu)%s%s", uiLine, *file ? HB_I_(" in ") : "", file );
hb_conOutErr( buffer, 0 );

4
harbour/src/vm/macro.c
View File

@@ -1370,7 +1370,7 @@ void hb_macroGenPopAliasedVar( const char * szVarName,
{
if( szAlias )
{
int iLen = strlen( szAlias );
int iLen = ( int ) strlen( szAlias );
if( szAlias[ 0 ] == 'M' && ( iLen == 1 ||
( iLen >= 4 && iLen <= 6 && strncmp( szAlias, "MEMVAR", iLen ) == 0 ) ) )
@@ -1466,7 +1466,7 @@ void hb_macroGenPushAliasedVar( const char * szVarName,
* FIELD->var
* MEMVAR->var
*/
int iLen = strlen( szAlias );
int iLen = ( int ) strlen( szAlias );
if( szAlias[ 0 ] == 'M' && ( iLen == 1 ||
( iLen >= 4 && iLen <= 6 && strncmp( szAlias, "MEMVAR", iLen ) == 0 ) ) )

4
harbour/src/vm/set.c
View File

@@ -415,7 +415,7 @@ HB_BOOL hb_setSetCentury( HB_BOOL new_century_setting )
/* Convert to upper case and determine where year is */
y_start = y_stop = -1;
szDateFormat = pSet->HB_SET_DATEFORMAT;
size = strlen( szDateFormat );
size = ( int ) strlen( szDateFormat );
for( count = 0; count < size; count++ )
{
digit = HB_TOUPPER( ( HB_UCHAR ) szDateFormat[ count ] );
@@ -453,7 +453,7 @@ HB_BOOL hb_setSetCentury( HB_BOOL new_century_setting )
hb_strncat( szNewFormat, "YY", size );
if( new_century_setting )
hb_strncat( szNewFormat, "YY", size );
format_len = strlen( szDateFormat );
format_len = ( int ) strlen( szDateFormat );
if( y_stop < format_len )
hb_strncat( szNewFormat, szDateFormat + y_stop, size );
/* DATE FORMAT is under direct control of SET, so notify when it