From 4da5a347b75d9754dc6056ffab28672c82671b7a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 7 Aug 2006 00:23:19 +0000 Subject: [PATCH] 2006-08-07 02:20 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) * harbour/make_b32.bat * harbour/make_vc.bat ! install call redirected to nul instead of make_b32.log to avoid overwriting the build results with less important (no) information. * harbour/include/hbundoc.api + Added _txopen() (not tested) * harbour/source/rdd/dbfcdx/dbfcdx1.c * harbour/source/rdd/dbfntx/dbfntx1.c ! BCC -w warnings fixed. * harbour/source/rtl/filehb.c + Added TOFIX about a CA-Cl*pper incompatibility. In CA-Cl*pper the argument of FILE() is RTrim()-ed before doing the check. * harbour/source/rtl/fstemp.c ! Fixed two BCC warnings. --- harbour/ChangeLog | 21 +++++++++++++++++++++ harbour/include/hbundoc.api | 1 + harbour/make_b32.bat | 8 +------- harbour/make_vc.bat | 2 +- harbour/source/rdd/dbfcdx/dbfcdx1.c | 2 +- harbour/source/rdd/dbfntx/dbfntx1.c | 2 +- harbour/source/rtl/filehb.c | 3 +++ harbour/source/rtl/fstemp.c | 4 ++-- 8 files changed, 31 insertions(+), 12 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7cc4ffafd4..958f6a805a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,27 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2006-08-07 02:20 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) + * harbour/make_b32.bat + * harbour/make_vc.bat + ! install call redirected to nul instead of make_b32.log to avoid + overwriting the build results with less important (no) information. + + * harbour/include/hbundoc.api + + Added _txopen() (not tested) + + * harbour/source/rdd/dbfcdx/dbfcdx1.c + * harbour/source/rdd/dbfntx/dbfntx1.c + ! BCC -w warnings fixed. + + * harbour/source/rtl/filehb.c + + Added TOFIX about a CA-Cl*pper incompatibility. + In CA-Cl*pper the argument of FILE() is RTrim()-ed + before doing the check. + + * harbour/source/rtl/fstemp.c + ! Fixed two BCC warnings. + 2006-08-06 13:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/debug/debugger.prg * changed checking for static initialization functions diff --git a/harbour/include/hbundoc.api b/harbour/include/hbundoc.api index 693f3b3342..6b91e420d5 100644 --- a/harbour/include/hbundoc.api +++ b/harbour/include/hbundoc.api @@ -96,6 +96,7 @@ #define _trmdir hb_fsRmDir #define _tunlink hb_fsDelete #define _twrite hb_fsWrite +#define _txopen hb_fsExtOpen /* Undocumented CA-Cl*pper support functions */ diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 1b909cd7ea..c8131c1f53 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -65,15 +65,9 @@ rem --------------------------------------------------------------- if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f makefile.bc INSTALL > make_b32.log + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f makefile.bc INSTALL > nul goto EXIT rem --------------------------------------------------------------- :EXIT - -rem set HB_MAKE_PROGRAM= -rem set HB_INSTALL_PREFIX= -rem set HB_BIN_INSTALL= -rem set HB_LIB_INSTALL= -rem set HB_INC_INSTALL= diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index adfae2f438..ea2b1a1678 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -65,7 +65,7 @@ rem --------------------------------------------------------------- if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc INSTALL > make_vc.log + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc INSTALL > nul goto EXIT rem --------------------------------------------------------------- diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 62a9422d7e..14cb605837 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -3053,7 +3053,7 @@ static int hb_cdxPageKeyIntBalance( LPCDXPAGE pPage, int iChildRet ) if ( iNeedKeys == 1 && iBlncKeys > 1 && childs[0]->Left != CDX_DUMMYNODE && childs[iBlncKeys-1]->Right != CDX_DUMMYNODE && iKeys >= ( CDX_BALANCE_INTPAGES << 1 ) && - iKeys > ( pPage->TagParent->MaxKeys * 3 ) >> 1 ) + iKeys > ( ( pPage->TagParent->MaxKeys * 3 ) >> 1 ) ) { iNeedKeys = 2; } diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 912b5d2bba..904ddad4e9 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -2970,7 +2970,7 @@ static BOOL hb_ntxTagKeyAdd( LPTAGINFO pTag, LPKEYINFO pKey ) } uiBaseKey = pFirst->uiKeys + iKey + 1; } - if( pFirst->uiKeys + pLast->uiKeys <= ( pTag->MaxKeys - 1 ) << 1 ) + if( ( pFirst->uiKeys + pLast->uiKeys ) <= ( ( pTag->MaxKeys - 1 ) << 1 ) ) { hb_ntxBalancePages( pTag, pBasePage, uiFirst, pFirst, pLast ); if( pFirst->uiKeys >= uiBaseKey ) diff --git a/harbour/source/rtl/filehb.c b/harbour/source/rtl/filehb.c index e56a01c5c4..40de295121 100644 --- a/harbour/source/rtl/filehb.c +++ b/harbour/source/rtl/filehb.c @@ -56,6 +56,9 @@ /* TODO: Xbase++ has an extension where the second parameter can specify the required attribute. */ +/* TOFIX: CA-Cl*pper RTrim()s the filename before doing the existance check. + [vszakats] */ + HB_FUNC( FILE ) { hb_retl( ISCHAR( 1 ) ? hb_spFile( ( BYTE * ) hb_parc( 1 ),NULL ) : FALSE ); diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c index 8f17557f96..3a5e6fd555 100644 --- a/harbour/source/rtl/fstemp.c +++ b/harbour/source/rtl/fstemp.c @@ -89,7 +89,7 @@ static BOOL hb_fsTempName( BYTE * pszBuffer, const BYTE * pszDir, const BYTE * p } cTempDir[ _POSIX_PATH_MAX ] = '\0'; - fResult = GetTempFileName( cTempDir, ( const char * ) ( ( pszPrefix == NULL ) ? "hb" : pszPrefix ), 0, ( char * ) pszBuffer ); + fResult = GetTempFileName( ( LPCSTR ) cTempDir, ( ( pszPrefix == NULL ) ? ( LPCSTR ) "hb" : ( LPCSTR ) pszPrefix ), 0, ( LPSTR ) pszBuffer ); #else @@ -259,7 +259,7 @@ HB_FUNC( HB_FTEMPCREATE ) hb_retni( hb_fsCreateTemp( ( BYTE * ) hb_parc( 1 ), ( BYTE * ) hb_parc( 2 ), - ISNUM( 3 ) ? hb_parni( 3 ) : FC_NORMAL, + ( USHORT ) ( ISNUM( 3 ) ? ( USHORT ) hb_parni( 3 ) : FC_NORMAL ), szName ) ); hb_storc( ( char *) szName, 4 );