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

2002-10-20 21:12 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2002-10-20 17:10:56 +00:00
parent 3d73ab0cb3
commit 08eff0e53e
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-10-20 21:12 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
* source/rdd/dbcmd.c
! Few fixes related to the latest hb_parc() changes
* source/rdd/dbfntx/dbfntx1.c
! Bug fixed in indexing
2002-10-19 16:50 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
* include/hbdefs.h
* Added definition for UINT

10
harbour/source/rdd/dbcmd.c
View File

@@ -1955,14 +1955,14 @@ HB_FUNC( DBUSEAREA )
szDriver = s_szDefDriver;
szFileName = hb_parc( 3 );
if( strlen( szFileName ) == 0 )
if( szFileName == (char*)0 || strlen( szFileName ) == 0 )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, "DBUSEAREA" );
return;
}
pFileName = hb_fsFNameSplit( szFileName );
strncpy( szAlias, hb_parc( 4 ), HARBOUR_MAX_RDD_ALIAS_LENGTH );
strncpy( szAlias, (ISCHAR(4))? hb_parc( 4 ):"", HARBOUR_MAX_RDD_ALIAS_LENGTH );
if( strlen( szAlias ) == 0 )
strncpy( szAlias, pFileName->szName, HARBOUR_MAX_RDD_ALIAS_LENGTH );
uiLen = strlen( szAlias );
@@ -2399,8 +2399,8 @@ HB_FUNC( ORDCREATE )
dbOrderInfo.abBagName = ( BYTE * ) hb_parc( 1 );
dbOrderInfo.atomBagName = ( BYTE * ) hb_parc( 2 );
dbOrderInfo.abExpr = hb_param( 3, HB_IT_STRING );
if( ( ( strlen( ( char * ) dbOrderInfo.abBagName ) == 0 ) &&
( strlen( ( char * ) dbOrderInfo.atomBagName ) == 0 ) ) ||
if( ( ( dbOrderInfo.abBagName == (char*)0 || strlen( ( char * ) dbOrderInfo.abBagName ) == 0 ) &&
( dbOrderInfo.atomBagName == (char*)0 || strlen( ( char * ) dbOrderInfo.atomBagName ) == 0 ) ) ||
!dbOrderInfo.abExpr )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDCREATE" );
@@ -3032,7 +3032,7 @@ HB_FUNC( DBSETRELATION )
else
{
szAlias = hb_parc( 1 );
if( ( uiChildArea = hb_rddSelect( szAlias ) ) == 0 )
if( szAlias == (char*)0 || ( uiChildArea = hb_rddSelect( szAlias ) ) == 0 )
{
hb_errRT_BASE( EG_NOALIAS, EDBCMD_NOALIAS, NULL, szAlias, 0 );
return;

3
harbour/source/rdd/dbfntx/dbfntx1.c
View File

@@ -2203,7 +2203,7 @@ static void hb_ntxBufferSave( LPTAGINFO pTag, LPNTXSORTINFO pSortInfo )
LPSORTITEM pKey = pSortInfo->pKeyFirst;
char* buffer;
BOOL lSave = FALSE;
ULONG* lpArray = hb_ntxKeysInPage( pSortInfo->ulKeyCount, pTag->MaxKeys );
ULONG* lpArray = hb_ntxKeysInPage( pSortInfo->ulKeyCount, pTag->MaxKeys-1 );
maxKeys = (USHORT)lpArray[1];
ulFullNodes = lpArray[lpArray[0]+1];
@@ -3450,7 +3450,6 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo )
uiType = hb_itemType( pResult );
uiLen = uiDec = 0;
bType = '\0';
switch( uiType )
{
case HB_IT_INTEGER: