2010-02-07 19:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* src/vm/classes.c
  * src/rtl/gtdos/gtdos.c
  * src/rtl/gtxwc/gtxwc.c
  * src/rdd/wacore.c
  * src/rdd/dbfnsx/dbfnsx1.c
  * src/rdd/dbfcdx/dbfcdx1.c
  * src/rdd/dbffpt/dbffpt1.c
  * src/compiler/genobj32.c
  * include/hbinit.h
  * include/hbrddcdx.h
  * contrib/xhb/hbcrypt.c
  * contrib/xhb/freadlin.c
  * contrib/xhb/txtline.c
  * contrib/hbnf/descendn.c
  * contrib/rddsql/sqlmix.c
  * contrib/rddads/adsx.c
  * contrib/hbtip/encmthd.c
  * contrib/hbbmcdx/bmdbfcdx.c
  * contrib/hbbmcdx/hbbmcdx.h
    * Formatting. (whitespace only)
This commit is contained in:
Viktor Szakats
2010-02-07 18:03:00 +00:00
parent 93709bf293
commit 480f7a3b6a
20 changed files with 115 additions and 93 deletions

View File

@@ -17,6 +17,28 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-07 19:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/classes.c
* src/rtl/gtdos/gtdos.c
* src/rtl/gtxwc/gtxwc.c
* src/rdd/wacore.c
* src/rdd/dbfnsx/dbfnsx1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbffpt/dbffpt1.c
* src/compiler/genobj32.c
* include/hbinit.h
* include/hbrddcdx.h
* contrib/xhb/hbcrypt.c
* contrib/xhb/freadlin.c
* contrib/xhb/txtline.c
* contrib/hbnf/descendn.c
* contrib/rddsql/sqlmix.c
* contrib/rddads/adsx.c
* contrib/hbtip/encmthd.c
* contrib/hbbmcdx/bmdbfcdx.c
* contrib/hbbmcdx/hbbmcdx.h
* Formatting. (whitespace only)
2010-02-07 18:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbdefs.h
+ Changed types to have our "new" types as primary

View File

@@ -1831,8 +1831,8 @@ static void hb_cdxPageCheckDupTrl( LPCDXPAGE pPage, BYTE * pKeyBuf, int iKeys, H
{
printf( "\r\nikey=%d, iKeys=%d, K=%d, ulRecPrev=%ld, ulRec=%ld",
iKey, iKeys, K,
(ULONG) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum - iLen ] ),
(ULONG) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum ] ) );
( ULONG ) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum - iLen ] ),
( ULONG ) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum ] ) );
printf( "\r\npbValPrev=[%s] pbVal=[%s], [%d], pKeyBuf=%p",
&pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ],
memcmp( &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], iNum ),
@@ -2129,7 +2129,7 @@ static int hb_cdxPageLeafDelKey( LPCDXPAGE pPage )
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\ndelkey: Page=%lx, iKey=%d/%d, rec=%ld, iFree=%d",
pPage->Page, iKey, pPage->iKeys,
(ULONG) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ),
( ULONG ) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ),
pPage->iFree );
fflush(stdout);
#endif
@@ -2369,7 +2369,7 @@ static void hb_cdxPageIntDelKey( LPCDXPAGE pPage, int iKey )
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\nintDelKey: Page=%lx, iKey=%d/%d, ulPag=%lx",
pPage->Page, iKey, pPage->iKeys,
(ULONG) HB_GET_BE_UINT32( &pPage->node.intNode.keyPool[ (iKey+1) * iLen - 4 ] ) );
( ULONG ) HB_GET_BE_UINT32( &pPage->node.intNode.keyPool[ (iKey+1) * iLen - 4 ] ) );
fflush(stdout);
#endif
#ifdef HB_CDX_DBGCODE
@@ -2864,7 +2864,7 @@ static int hb_cdxPageKeyLeafBalance( LPCDXPAGE pPage, int iChildRet )
{
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\ninserting bDup=%d #keys=%d/%d (%d) parent=%lx, child=%lx (%d), rec=%ld",
j, iKeys, lpTmpPage->iKeys, i, pPage->Page, lpTmpPage->Page, iSize, (ULONG) HB_GET_LE_UINT32( pPtr + iLen - 6 ));
j, iKeys, lpTmpPage->iKeys, i, pPage->Page, lpTmpPage->Page, iSize, ( ULONG ) HB_GET_LE_UINT32( pPtr + iLen - 6 ));
fflush(stdout);
#endif
if( iBufSize >= iKeys + lpTmpPage->iKeys )
@@ -6118,7 +6118,7 @@ static HB_ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyN
hb_cdxPageFree( pPage, HB_FALSE );
pPage = pOwnerPage->Child;
}
if( (ULONG) pPage->iKeys >= ulKeyCnt )
if( ( ULONG ) pPage->iKeys >= ulKeyCnt )
{
pPage->iCurKey = pTag->UsrAscend ? ( int ) ulKeyCnt - 1 : pPage->iKeys - ( int ) ulKeyCnt;
hb_cdxSetCurKey( pPage );
@@ -6905,7 +6905,7 @@ HB_FUNC( BM_DBSETFILTERARRAY )
( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size = ulRecCount;
( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap = ( ULONG * ) hb_xgrab( sizeof( ULONG ) * (((ulRecCount+1) >> 5) + 1) );
memset( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, 0, sizeof(ULONG) * (((ulRecCount+1) >> 5) + 1 ) );
memset( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, 0, sizeof( ULONG ) * (((ulRecCount+1) >> 5) + 1 ) );
for( ulPos = 1; ulPos <= hb_arrayLen( pArray ); ulPos++ )
BM_SetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ulRecCount, ( ULONG ) hb_arrayGetNL( pArray, ulPos ) );
@@ -6936,9 +6936,9 @@ HB_FUNC( BM_DBSETFILTERARRAYADD )
LPCDXTAG pTag;
for( ulPos = 1; ulPos <= hb_arrayLen( pArray ); ulPos++ )
if( ! BM_GetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, (ULONG) hb_arrayGetNL( pArray, ulPos ) ) )
if( ! BM_GetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, ( ULONG ) hb_arrayGetNL( pArray, ulPos ) ) )
{
BM_SetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, (ULONG) hb_arrayGetNL( pArray, ulPos ) );
BM_SetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, ( ULONG ) hb_arrayGetNL( pArray, ulPos ) );
ulAdd++;
}
pTag = hb_cdxGetActiveTag( (CDXAREAP) pArea );
@@ -6965,9 +6965,9 @@ HB_FUNC( BM_DBSETFILTERARRAYDEL )
LPCDXTAG pTag;
for( ulPos = 1; ulPos <= hb_arrayLen( pArray ); ulPos++ )
if( BM_GetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, (ULONG) hb_arrayGetNL( pArray, ulPos ) ) )
if( BM_GetBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, ( ULONG ) hb_arrayGetNL( pArray, ulPos ) ) )
{
BM_ClrBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, (ULONG) hb_arrayGetNL( pArray, ulPos ) );
BM_ClrBit( ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->rmap, ( ( LPBM_FILTER ) pArea->dbfi.lpvCargo)->Size, ( ULONG ) hb_arrayGetNL( pArray, ulPos ) );
ulDel++;
}
pTag = hb_cdxGetActiveTag( (CDXAREAP) pArea );
@@ -7294,7 +7294,7 @@ static HB_ERRCODE hb_cdxAppend( CDXAREAP pArea, HB_BOOL bUnLockAll )
if( ( (ulRecCount) >> 5 ) + 1 < bytes )
{
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap = (ULONG *) hb_xrealloc( ( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap, bytes << 2 );
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap = ( ULONG * ) hb_xrealloc( ( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap, bytes << 2 );
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->Size = ulRecCount;
}
pArea->dbfarea.area.dbfi.fFilter = HB_FALSE;
@@ -9309,8 +9309,8 @@ static HB_ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo )
pTag = hb_cdxGetActiveTag( pArea );
SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount );
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->Size = ulRecCount;
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap = (ULONG *) hb_xgrab( sizeof(ULONG) * (((ulRecCount+1) >> 5) + 1 ) );
memset( ( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap, 0, sizeof(ULONG) * (((ulRecCount+1) >> 5) + 1 ) );
( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap = ( ULONG * ) hb_xgrab( sizeof( ULONG ) * (((ulRecCount+1) >> 5) + 1 ) );
memset( ( ( LPBM_FILTER ) pArea->dbfarea.area.dbfi.lpvCargo)->rmap, 0, sizeof( ULONG ) * (((ulRecCount+1) >> 5) + 1 ) );
if( pTag ) /* with active index */
{

View File

@@ -135,8 +135,8 @@ HB_EXTERN_BEGIN
#define CURKEY_REFRESH(pTag)
*/
#define HB_CDXMAXKEY( x ) ((USHORT) ((x) > CDX_MAXKEY ? CDX_MAXKEY : (x)))
#define HB_CDXBITMASK( x ) ((LONG) ((1L<<(x))-1))
#define HB_CDXMAXKEY( x ) ( ( USHORT ) ( ( x ) > CDX_MAXKEY ? CDX_MAXKEY : ( x ) ) )
#define HB_CDXBITMASK( x ) ( ( LONG ) ( ( 1L << ( x ) ) - 1 ) )
#define FAST_GOCOLD( A ) SELF_GOCOLD(A)

View File

@@ -76,7 +76,7 @@ HB_FUNC( FT_DESCEND )
else if ( uiType & HB_IT_STRING )
{
uiLen = (USHORT) hb_itemSize( iP );
uiLen = ( USHORT ) hb_itemSize( iP );
pDescend = ( char *) hb_xgrab( uiLen );

View File

@@ -59,8 +59,8 @@
HB_FUNC( TIPENCODERBASE64_ENCODE )
{
const char *cData = hb_parc( 1 );
char *cRet;
const char * cData = hb_parc( 1 );
char * cRet;
int nLen = hb_parclen( 1 );
int nPos = 0, nPosRet = 0;
int nPosBlock = 0, nLineCount = 0;
@@ -93,14 +93,14 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
bExcept = hb_parl( -1 );
}
/* we know exactly the renturned length. */
nFinalLen = (ULONG) ((nLen / 3 + 2) * 4);
nFinalLen = ( ULONG ) ( ( nLen / 3 + 2 ) * 4 );
/* add line termination padding, CRLF each 76 output bytes */
nFinalLen += (nFinalLen / 72 +1) * 2;
nFinalLen += ( nFinalLen / 72 + 1 ) * 2;
cRet = ( char * ) hb_xgrab( nFinalLen );
while( nPos < nLen )
{
cElem = (unsigned char) cData[ nPos ];
cElem = ( unsigned char ) cData[ nPos ];
/* NOT using trailing 0 here as some buggy 3dparty func
will create strings without trailing 0. */
@@ -112,13 +112,13 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
cElem = cElem >> 2;
break;
case 2:
cElem1 = nPos < nLen -1 ? (unsigned char) cData[ nPos + 1] : 0;
cElem = ((cElem & 0x3) << 4) | (cElem1 >> 4);
cElem1 = nPos < nLen -1 ? ( unsigned char ) cData[ nPos + 1 ] : 0;
cElem = ( ( cElem & 0x3 ) << 4 ) | ( cElem1 >> 4 );
nPos++;
break;
case 3:
cElem1 = nPos < nLen -1 ? (unsigned char) cData[ nPos + 1] : 0;
cElem = ((cElem & 0xF) << 2) | (cElem1 >> 6);
cElem1 = nPos < nLen -1 ? ( unsigned char ) cData[ nPos + 1 ] : 0;
cElem = ( ( cElem & 0xF ) << 2 ) | ( cElem1 >> 6 );
nPos++;
break;
case 4:
@@ -130,23 +130,23 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
if( cElem < 26 )
{
cRet[nPosRet++] = cElem + 'A';
cRet[ nPosRet++ ] = cElem + 'A';
}
else if( cElem < 52 )
{
cRet[nPosRet++] = ( cElem - 26 ) + 'a';
cRet[ nPosRet++ ] = ( cElem - 26 ) + 'a';
}
else if( cElem < 62 )
{
cRet[nPosRet++] = ( cElem - 52 ) + '0';
cRet[ nPosRet++ ] = ( cElem - 52 ) + '0';
}
else if( cElem == 62 )
{
cRet[nPosRet++] = '+';
cRet[ nPosRet++ ] = '+';
}
else
{
cRet[nPosRet++] = '/';
cRet[ nPosRet++ ] = '/';
}
if( ! bExcept )
@@ -157,8 +157,8 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
practice is to limit line size to 72 chars */
if( nLineCount == 72 )
{
cRet[nPosRet++] = '\r';
cRet[nPosRet++] = '\n';
cRet[ nPosRet++ ] = '\r';
cRet[ nPosRet++ ] = '\n';
nLineCount = 0;
}
}
@@ -178,8 +178,8 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
during encoding phase */
if( ! bExcept )
{
cRet[nPosRet++] = '\r';
cRet[nPosRet++] = '\n';
cRet[ nPosRet++ ] = '\r';
cRet[ nPosRet++ ] = '\n';
}
/* this function also adds a zero */
@@ -188,8 +188,8 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
HB_FUNC( TIPENCODERBASE64_DECODE )
{
const char *cData = hb_parc( 1 );
unsigned char *cRet;
const char * cData = hb_parc( 1 );
unsigned char * cRet;
int nLen = hb_parclen( 1 );
int nPos = 0, nPosRet = 0, nPosBlock = 0;
unsigned char cElem;

View File

@@ -192,11 +192,11 @@ static LPMIXKEY mixKeyNew( PHB_ITEM pItem, ULONG ulRecNo, BYTE bType, USHORT uiL
{
case 'C':
ul = hb_itemGetCLen( pItem );
if( ul > (ULONG) uiLen )
if( ul > ( ULONG ) uiLen )
ul = uiLen;
memcpy( pKey->val, hb_itemGetCPtr( pItem ), ul );
if( ul < (ULONG) uiLen )
memset( pKey->val + ul, ' ', (ULONG) uiLen - ul );
if( ul < ( ULONG ) uiLen )
memset( pKey->val + ul, ' ', ( ULONG ) uiLen - ul );
break;
case 'N':
@@ -649,7 +649,7 @@ static HB_ERRCODE adsxSeek( ADSXAREAP pArea, HB_BOOL bSoftSeek, PHB_ITEM pKey, H
return SUPER_SEEK( ( AREAP ) pArea, bSoftSeek, pKey, bFindLast );
/* TODO: pKey type validation, EG_DATATYPE runtime error */
pMixKey = mixKeyNew( pKey, bFindLast ? (ULONG) (-1) : 0, pArea->pTagCurrent->bType,
pMixKey = mixKeyNew( pKey, bFindLast ? ( ULONG ) ( -1 ) : 0, pArea->pTagCurrent->bType,
pArea->pTagCurrent->uiLen );
/* reset any pending relations - I hope ACE make the same and the problem
@@ -724,8 +724,8 @@ static HB_ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
pKey = mixKeyEval( pArea->pTagCurrent, pArea );
if( mixFindKey( pArea->pTagCurrent, pKey, &ulKeyPos ) &&
pArea->pTagCurrent->ulRecCount > (ULONG) lToSkip &&
ulKeyPos < pArea->pTagCurrent->ulRecCount - (ULONG) lToSkip )
pArea->pTagCurrent->ulRecCount > ( ULONG ) lToSkip &&
ulKeyPos < pArea->pTagCurrent->ulRecCount - ( ULONG ) lToSkip )
{
if( SELF_GOTO( ( AREAP ) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == HB_FAILURE )
errCode = HB_FAILURE;
@@ -756,8 +756,8 @@ static HB_ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
pKey = mixKeyEval( pArea->pTagCurrent, pArea );
if( mixFindKey( pArea->pTagCurrent, pKey, &ulKeyPos ) &&
pArea->pTagCurrent->ulRecCount >= (ULONG) (-lToSkip) &&
ulKeyPos >= (ULONG) (-lToSkip) )
pArea->pTagCurrent->ulRecCount >= ( ULONG ) ( -lToSkip ) &&
ulKeyPos >= ( ULONG ) ( -lToSkip ) )
{
if( SELF_GOTO( ( AREAP ) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == HB_FAILURE )
errCode = HB_FAILURE;
@@ -946,7 +946,7 @@ static HB_ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderIn
case HB_IT_STRING:
case HB_IT_STRING | HB_IT_MEMO:
bType = 'C';
uiLen = (USHORT) hb_itemGetCLen( pResult );
uiLen = ( USHORT ) hb_itemGetCLen( pResult );
if( uiLen > MIX_MAXKEYLEN ) uiLen = MIX_MAXKEYLEN;
break;
@@ -1201,7 +1201,7 @@ static HB_ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO
{
ULONG ulPos;
ulPos = (ULONG) ( hb_itemGetND( pOrderInfo->itmNewVal ) * (double) pTag->ulRecCount );
ulPos = ( ULONG ) ( hb_itemGetND( pOrderInfo->itmNewVal ) * (double) pTag->ulRecCount );
if( ulPos > 0 && ulPos <= pTag->ulRecCount )
SELF_GOTO( ( AREAP ) pArea, pTag->pKeys[ ulPos - 1 ]->rec );

View File

@@ -1024,14 +1024,14 @@ static void hb_mixTagSkip( PMIXTAG pTag, LONG lSkip )
{
if ( pNode->Leaf )
{
if ( (LONG) (pNode->KeyCount - 1 - uiPos) >= lSkip )
if ( ( LONG ) (pNode->KeyCount - 1 - uiPos) >= lSkip )
{
uiPos += lSkip;
lSkip = 0;
}
else if ( pNode->KeyCount - 1 > uiPos )
{
lSkip -= (LONG) (pNode->KeyCount - 1 - uiPos);
lSkip -= ( LONG ) (pNode->KeyCount - 1 - uiPos);
uiPos = pNode->KeyCount - 1;
}
if ( lSkip )
@@ -1083,7 +1083,7 @@ static void hb_mixTagSkip( PMIXTAG pTag, LONG lSkip )
{
if ( pNode->Leaf )
{
if ( (LONG) uiPos >= lSkip )
if ( ( LONG ) uiPos >= lSkip )
{
uiPos -= lSkip;
lSkip = 0;

View File

@@ -129,7 +129,7 @@ char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Te
pBuff[ *plBuffLen ] = '\0';
/* Set handle pointer in the end of the line */
hb_fsSeek( hFileHandle, (((lRead-((LONG)iPos)))*-1)+1, FS_RELATIVE );
hb_fsSeek( hFileHandle, (((lRead-(( LONG ) iPos )))*-1)+1, FS_RELATIVE );
return pBuff;
}

View File

@@ -177,7 +177,7 @@ void nxs_partial_scramble(
{
cipher[ pos + scramble[ kpos ] ] = source[ pos + kpos ];
kpos++;
if ( kpos >= (USHORT) keylen )
if ( kpos >= ( USHORT ) keylen )
{
kpos = 0;
pos += keylen;
@@ -231,7 +231,7 @@ void nxs_partial_unscramble(
{
buf[ kpos ] = cipher[ pos + scramble[ kpos ] ];
kpos++;
if ( kpos >= (USHORT) keylen )
if ( kpos >= ( USHORT ) keylen )
{
memcpy( cipher + pos, buf, keylen );
kpos = 0;
@@ -256,7 +256,7 @@ void nxs_xorcode(
{
cipher[pos] <<= 3;
if (keypos == (USHORT) keylen-1 || pos == cipherlen -1 )
if (keypos == ( USHORT ) keylen-1 || pos == cipherlen -1 )
{
cipher[pos] |= c_bitrest;
}
@@ -269,7 +269,7 @@ void nxs_xorcode(
keypos ++;
pos++;
if (keypos == (USHORT) keylen )
if (keypos == ( USHORT ) keylen )
{
keypos = 0;
c_bitrest = cipher[ pos ] >>5;
@@ -304,7 +304,7 @@ void nxs_xordecode(
keypos ++;
pos ++;
if (keypos == (USHORT) keylen )
if (keypos == ( USHORT ) keylen )
{
keypos = 0;
/* last block */

View File

@@ -251,7 +251,7 @@ HB_FUNC( HB_READLINE )
}
ulTextLen = hb_parclen(1);
uiTabLen = (USHORT) hb_parclen(4);
uiTabLen = ( USHORT ) hb_parclen(4);
if( HB_ISNUM( 6 ) )
{

View File

@@ -78,7 +78,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
static PHB_SYMB symbols = symbols_table; \
void func( void ) \
{ \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
}
#define HB_CALL_ON_STARTUP_BEGIN( func ) \
@@ -99,7 +99,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
#define HB_INIT_SYMBOLS_EX_END( func, module, id, vpcode ) \
}; \
static PHB_SYMB symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
static PHB_SYMB symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
#define HB_CALL_ON_STARTUP_BEGIN( func ) \
static int func( void ) \
@@ -134,7 +134,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
}; \
static PHB_SYMB symbols = symbols_table; \
HB_CALL_ON_STARTUP_BEGIN( func ) \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
HB_CALL_ON_STARTUP_END( func )
#define HB_CALL_ON_STARTUP_BEGIN( func ) \
@@ -175,7 +175,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
static PHB_SYMB symbols = symbols_table; \
static void __attribute__ ((constructor)) func( void ) \
{ \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
}
#define HB_CALL_ON_STARTUP_BEGIN( func ) \
@@ -201,7 +201,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
static PHB_SYMB symbols = symbols_table; \
static void func( void ) \
{ \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
}
#define HB_CALL_ON_STARTUP_BEGIN( func ) \
@@ -229,7 +229,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
static PHB_SYMB symbols = symbols_table; \
static int func( void ) \
{ \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
return 0; \
}
@@ -265,7 +265,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
static PHB_SYMB symbols = symbols_table; \
static void func( void ) \
{ \
symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
symbols = hb_vmProcessSymbols( symbols_table, ( USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \
}
#define HB_CALL_ON_STARTUP_BEGIN( func ) \

View File

@@ -129,8 +129,8 @@ HB_EXTERN_BEGIN
#define CURKEY_REFRESH(pTag)
*/
#define HB_CDXMAXKEY( x ) ((USHORT) ((x) > CDX_MAXKEY ? CDX_MAXKEY : (x)))
#define HB_CDXBITMASK( x ) ((LONG) ((1L<<(x))-1))
#define HB_CDXMAXKEY( x ) ( ( USHORT ) ( ( x ) > CDX_MAXKEY ? CDX_MAXKEY : ( x ) ) )
#define HB_CDXBITMASK( x ) ( ( LONG ) ( ( 1L << ( x ) ) - 1 ) )
/* #define FAST_GOCOLD( A ) ((A)->dbfarea.fRecordChanged || (A)->fCdxAppend ? (SELF_GOCOLD((AREAP)(A))) : HB_SUCCESS) */
#define FAST_GOCOLD( A ) SELF_GOCOLD(A)

View File

@@ -169,7 +169,7 @@ static void GenerateSymbolsSegment( HB_COMP_DECL, FILE * hObjFile )
GroupDef( hObjFile, 12, groupSymGroup ); /* "SYMGROUP" localNames position - 1 */
GroupDef( hObjFile, 17, groupInitData ); /* "BORLAND" localNames position - 1 */
* ( USHORT * ) symbolsData = (USHORT) GetSymbolsAmount( HB_COMP_PARAM );
* ( USHORT * ) symbolsData = ( USHORT ) GetSymbolsAmount( HB_COMP_PARAM );
EnumeratedData( hObjFile, 6, symbolsData, sizeof( symbolsData ), 0 ); /* HB_SYMBOLS defined order segment */
@@ -200,7 +200,7 @@ static void GenerateDataSegment( HB_COMP_DECL, FILE * hObjFile )
0 ); /* segment length */
DefineSegment( hObjFile, 5, /* "_DATA" position + 1 into localNames */
6, /* "DATA" position + 1 into localNames */
(USHORT) ulSize ); /* segment length */
( USHORT ) ulSize ); /* segment length */
memset( &symbol, 0, sizeof( symbol ) );
DataSegment( HB_COMP_PARAM, hObjFile, (BYTE *) &symbol,
@@ -209,18 +209,18 @@ static void GenerateDataSegment( HB_COMP_DECL, FILE * hObjFile )
pSymbol = GetFirstSymbol( HB_COMP_PARAM );
for( ul = 0; ul < ulSymbols; ul++ )
{
Fixup( hObjFile, 0xE4, (USHORT) ( ul * sizeof( HB_SYMB ) ), 0x54, 4 ); /* 4 = Data symbol name location */
Fixup( hObjFile, 0xE4, ( USHORT ) ( ul * sizeof( HB_SYMB ) ), 0x54, 4 ); /* 4 = Data symbol name location */
if( IsExternal( HB_COMP_PARAM, ul ) )
{
if( ! ( pSymbol->cScope & HB_FS_MESSAGE ) )
Fixup( hObjFile, 0xE4, (USHORT) ( ul * sizeof( HB_SYMB ) ) + 8, 0x56,
Fixup( hObjFile, 0xE4, ( USHORT ) ( ul * sizeof( HB_SYMB ) ) + 8, 0x56,
GetExternalPos( GetSymbolName( HB_COMP_PARAM, ul ) ) + 1 );
}
else
{
/* if( ! ( pSymbol->cScope & HB_FS_MESSAGE ) ) */
Fixup( hObjFile, 0xE4, (USHORT) ( ul * sizeof( HB_SYMB ) ) + 8, 0x54, 1 ); /* function address location */
Fixup( hObjFile, 0xE4, ( USHORT ) ( ul * sizeof( HB_SYMB ) ) + 8, 0x54, 1 ); /* function address location */
}
pSymbol = pSymbol->pNext;
}
@@ -235,7 +235,7 @@ static void GenerateCodeSegment( HB_COMP_DECL, FILE * hObjFile )
DefineSegment( hObjFile, 2, /* "_TEXT" position + 1 into localNames */
3, /* "CODE" position + 1 into localNames */
(USHORT) ulSize ); /* segment length */
( USHORT ) ulSize ); /* segment length */
while( pFunc )
{
@@ -413,7 +413,7 @@ static void CodeSegment( HB_COMP_DECL, FILE * hObjFile, BYTE * prgCode, ULONG ul
{
BYTE bChk = 0;
USHORT y;
USHORT wTotalLen = (USHORT) ( ulPrgLen * wFunctions ) + 4;
USHORT wTotalLen = ( USHORT ) ( ulPrgLen * wFunctions ) + 4;
ULONG ul;
PFUNCTION pFunction = HB_COMP_PARAM->functions.pFirst;
ULONG ulPCodeOffset = HB_COMP_PARAM->symbols.iCount * sizeof( HB_SYMB );
@@ -443,7 +443,7 @@ static void DataSegment( HB_COMP_DECL, FILE * hObjFile, BYTE * symbol, ULONG wSy
{
BYTE bChk = 0;
ULONG w, y;
USHORT wTotalLen = 4 + (USHORT) ulSize;
USHORT wTotalLen = 4 + ( USHORT ) ulSize;
PCOMSYMBOL pSymbol = GetFirstSymbol( HB_COMP_PARAM );
PFUNCTION pFunction = HB_COMP_PARAM->functions.pFirst;
ULONG ulSymbolNameOffset = GetSymbolsSize( HB_COMP_PARAM ) + GetPCodesSize( HB_COMP_PARAM );

View File

@@ -1689,8 +1689,8 @@ static void hb_cdxPageCheckDupTrl( LPCDXPAGE pPage, BYTE * pKeyBuf, int iKeys, H
{
printf( "\r\nikey=%d, iKeys=%d, K=%d, ulRecPrev=%ld, ulRec=%ld",
iKey, iKeys, K,
(ULONG) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum - iLen ] ),
(ULONG) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum ] ) );
( ULONG ) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum - iLen ] ),
( ULONG ) HB_GET_LE_UINT32( &pKeyBuf[ iPos + iNum ] ) );
printf( "\r\npbValPrev=[%s] pbVal=[%s], [%d], pKeyBuf=%p",
&pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ],
memcmp( &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], iNum ),
@@ -1987,7 +1987,7 @@ static int hb_cdxPageLeafDelKey( LPCDXPAGE pPage )
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\ndelkey: Page=%lx, iKey=%d/%d, rec=%ld, iFree=%d",
pPage->Page, iKey, pPage->iKeys,
(ULONG) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ),
( ULONG ) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ),
pPage->iFree );
fflush(stdout);
#endif
@@ -2228,7 +2228,7 @@ static void hb_cdxPageIntDelKey( LPCDXPAGE pPage, int iKey )
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\nintDelKey: Page=%lx, iKey=%d/%d, ulPag=%lx",
pPage->Page, iKey, pPage->iKeys,
(ULONG) HB_GET_BE_UINT32( &pPage->node.intNode.keyPool[ (iKey+1) * iLen - 4 ] ) );
( ULONG ) HB_GET_BE_UINT32( &pPage->node.intNode.keyPool[ (iKey+1) * iLen - 4 ] ) );
fflush(stdout);
#endif
#ifdef HB_CDX_DBGCODE
@@ -2723,7 +2723,7 @@ static int hb_cdxPageKeyLeafBalance( LPCDXPAGE pPage, int iChildRet )
{
#ifdef HB_CDX_DSPDBG_INFO
printf("\r\ninserting bDup=%d #keys=%d/%d (%d) parent=%lx, child=%lx (%d), rec=%ld",
j, iKeys, lpTmpPage->iKeys, i, pPage->Page, lpTmpPage->Page, iSize, (ULONG) HB_GET_LE_UINT32( pPtr + iLen - 6 ));
j, iKeys, lpTmpPage->iKeys, i, pPage->Page, lpTmpPage->Page, iSize, ( ULONG ) HB_GET_LE_UINT32( pPtr + iLen - 6 ));
fflush(stdout);
#endif
if( iBufSize >= iKeys + lpTmpPage->iKeys )
@@ -6040,7 +6040,7 @@ static HB_ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyN
hb_cdxPageFree( pPage, HB_FALSE );
pPage = pOwnerPage->Child;
}
if( (ULONG) pPage->iKeys >= ulKeyCnt )
if( ( ULONG ) pPage->iKeys >= ulKeyCnt )
{
pPage->iCurKey = pTag->UsrAscend ? ( int ) ulKeyCnt - 1 : pPage->iKeys - ( int ) ulKeyCnt;
hb_cdxSetCurKey( pPage );

View File

@@ -2230,11 +2230,11 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE *
if( iDec )
{
iLen -= iDec + 1;
hb_itemPutNDLen( pItem, (LONG) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec );
hb_itemPutNDLen( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec );
}
else
{
hb_itemPutNLLen( pItem, (LONG) HB_GET_LE_UINT32( *pbMemoBuf ), iLen );
hb_itemPutNLLen( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen );
}
*pbMemoBuf += 6;
}
@@ -2250,11 +2250,11 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE *
if( iDec )
{
iLen -= iDec + 1;
hb_itemPutNDLen( pItem, (ULONG) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec );
hb_itemPutNDLen( pItem, ( ULONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec );
}
else
{
hb_itemPutNIntLen( pItem, (ULONG) HB_GET_LE_UINT32( *pbMemoBuf ), iLen );
hb_itemPutNIntLen( pItem, ( ULONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen );
}
*pbMemoBuf += 6;
}

View File

@@ -6897,7 +6897,7 @@ static HB_ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderI
if( errCode == HB_SUCCESS )
{
pTag = hb_nsxTagNew( pIndex, szTagName,
szKey, pKeyExp, bType, (USHORT) iLen, bTrail,
szKey, pKeyExp, bType, ( USHORT ) iLen, bTrail,
szFor, pForExp,
fAscend, pOrderInfo->fUnique, fCustom );
pTag->Partial = ( pArea->dbfarea.area.lpdbOrdCondInfo && !pArea->dbfarea.area.lpdbOrdCondInfo->fAll );

View File

@@ -85,13 +85,13 @@ static void hb_waNodeInsert( PHB_STACKRDD pRddInfo, AREAP pArea )
if( pRddInfo->uiWaNumMax == 0 )
{
pRddInfo->waNums = (USHORT *) hb_xgrab( iSize * sizeof(USHORT) );
pRddInfo->waNums = ( USHORT * ) hb_xgrab( iSize * sizeof( USHORT ) );
}
else
{
pRddInfo->waNums = (USHORT *) hb_xrealloc( pRddInfo->waNums, iSize * sizeof(USHORT) );
pRddInfo->waNums = ( USHORT * ) hb_xrealloc( pRddInfo->waNums, iSize * sizeof( USHORT ) );
}
memset( &pRddInfo->waNums[ pRddInfo->uiWaNumMax ], 0, ( iSize - pRddInfo->uiWaNumMax ) * sizeof(USHORT) );
memset( &pRddInfo->waNums[ pRddInfo->uiWaNumMax ], 0, ( iSize - pRddInfo->uiWaNumMax ) * sizeof( USHORT ) );
pRddInfo->uiWaNumMax = iSize;
}

View File

@@ -1302,7 +1302,7 @@ static HB_BOOL hb_gt_dos_SetKeyCP( PHB_GT pGT, const char *pszTermCDP, const cha
static void hb_gt_dos_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize )
{
#if !defined( __DJGPP__ )
USHORT FAR *pScreenPtr = (USHORT FAR *) hb_gt_dos_ScreenPtr( iRow, iCol );
USHORT FAR *pScreenPtr = ( USHORT FAR * ) hb_gt_dos_ScreenPtr( iRow, iCol );
#endif
int iColor;
BYTE bAttr;

View File

@@ -2493,7 +2493,7 @@ static void hb_gt_xwc_DrawString( PXWND_DEF wnd, int col, int row, BYTE color, U
static ULONG hb_gt_xwc_HashCurrChar( BYTE attr, BYTE color, USHORT chr )
{
return ((ULONG)attr<<24)|((ULONG)color<<16)|(ULONG)chr;
return ( ( ULONG ) attr << 24 ) | ( ( ULONG ) color << 16 ) | ( ULONG ) chr;
}
/* *********************************************************************** */
@@ -2502,7 +2502,7 @@ static void hb_gt_xwc_RepaintChar( PXWND_DEF wnd, int colStart, int rowStart, in
{
USHORT irow, icol, index, startCol = 0, len, basex, basey, nsize;
BYTE oldColor = 0, color, attr;
USHORT usCh16, usChBuf[XWC_MAX_COLS];
USHORT usCh16, usChBuf[ XWC_MAX_COLS ];
ULONG ulCurr = 0xFFFFFFFFL;
int i, iColor;
XWC_CharTrans * chTrans;

View File

@@ -2327,7 +2327,7 @@ PHB_ITEM hb_objSendMessage( PHB_ITEM pObject, PHB_DYNS pMsgSym, ULONG ulArg, ...
}
va_end( ap );
}
hb_vmSend( (USHORT) ulArg );
hb_vmSend( ( USHORT ) ulArg );
}
else
hb_errRT_BASE( EG_ARG, 3000, NULL, "__ObjSendMessage()", 0 );
@@ -2354,7 +2354,7 @@ PHB_ITEM hb_objSendMsg( PHB_ITEM pObject, const char *sMsg, ULONG ulArg, ... )
}
va_end( ap );
}
hb_vmSend( (USHORT) ulArg );
hb_vmSend( ( USHORT ) ulArg );
{
HB_STACK_TLS_PRELOAD