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

2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/rddads/ads1.c
    * removed unnecessary casting

  * contrib/rddads/adsx.c
    ! fixed to work with ACE < 6.1
This commit is contained in:
Przemysław Czerpak
2015-02-26 09:37:00 +01:00
parent 5ac8fc0d4a
commit d976db49c9
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/rddads/ads1.c
* removed unnecessary casting
* contrib/rddads/adsx.c
! fixed to work with ACE < 6.1
2015-02-25 22:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbodbc/odbc.c
* contrib/hbodbc/sql.ch

11
contrib/rddads/ads1.c
View File

@@ -4205,8 +4205,8 @@ static HB_ERRCODE adsOrderCreate( ADSAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
( UNSIGNED8 * ) pOrderInfo->abBagName,
( UNSIGNED8 * ) pOrderInfo->atomBagName,
( UNSIGNED8 * ) hb_itemGetCPtr( pExprItem ),
( pArea->area.lpdbOrdCondInfo && pArea->area.lpdbOrdCondInfo->abFor ) ?
( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : ( UNSIGNED8 * ) "",
pArea->area.lpdbOrdCondInfo ?
( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : NULL,
pucWhile, u32Options,
adsGetFileType( pArea->area.rddID ) == ADS_ADT ? adsIndexPageSize( ADS_ADT ) : ADS_DEFAULT,
&hIndex );
@@ -4215,9 +4215,10 @@ static HB_ERRCODE adsOrderCreate( ADSAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
( UNSIGNED8 * ) pOrderInfo->abBagName,
( UNSIGNED8 * ) pOrderInfo->atomBagName,
( UNSIGNED8 * ) hb_itemGetCPtr( pExprItem ),
( pArea->area.lpdbOrdCondInfo && pArea->area.lpdbOrdCondInfo->abFor ) ?
( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : ( UNSIGNED8 * ) "",
pucWhile, u32Options, &hIndex );
pArea->area.lpdbOrdCondInfo ?
( UNSIGNED8 * ) pArea->area.lpdbOrdCondInfo->abFor : NULL,
pucWhile, u32Options,
&hIndex );
#endif
SELF_ORDSETCOND( &pArea->area, NULL );

19
contrib/rddads/adsx.c
View File

@@ -1138,20 +1138,29 @@ static HB_ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderIn
UNSIGNED16 usLen = sizeof( szKeyExpr );
if( pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent && pArea->adsarea.hOrdCurrent )
{
AdsGetIndexExpr( pArea->adsarea.hOrdCurrent, szKeyExpr, &usLen );
}
else
szKeyExpr[ 0 ] = '\0';
#if ADS_LIB_VERSION >= 610
u32RetVal = AdsCreateIndex61(
pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent ? pArea->adsarea.hOrdCurrent : pArea->adsarea.hTable,
( UNSIGNED8 * ) pOrderInfo->abBagName,
( UNSIGNED8 * ) pOrderInfo->atomBagName,
szKeyExpr[ 0 ] ? ( UNSIGNED8 * ) szKeyExpr : ( UNSIGNED8 * ) "1",
( UNSIGNED8 * ) ( ( bForADS && pArea->adsarea.area.lpdbOrdCondInfo->abFor ) ? pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL ),
( UNSIGNED8 * ) ( ( bWhileADS && pArea->adsarea.area.lpdbOrdCondInfo->abWhile ) ? pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL ),
szKeyExpr[ 0 ] ? szKeyExpr : ( UNSIGNED8 * ) "1",
bForADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL,
bWhileADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL,
ADS_COMPOUND, ADS_DEFAULT, &hIndex );
#else
u32RetVal = AdsCreateIndex(
pArea->adsarea.area.lpdbOrdCondInfo->fUseCurrent ? pArea->adsarea.hOrdCurrent : pArea->adsarea.hTable,
( UNSIGNED8 * ) pOrderInfo->abBagName,
( UNSIGNED8 * ) pOrderInfo->atomBagName,
szKeyExpr[ 0 ] ? szKeyExpr : ( UNSIGNED8 * ) "1",
bForADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abFor : NULL,
bWhileADS ? ( UNSIGNED8 * ) pArea->adsarea.area.lpdbOrdCondInfo->abWhile : NULL,
ADS_COMPOUND, &hIndex );
#endif
if( u32RetVal != AE_SUCCESS )
{