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

2013-11-04 17:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rdd/dbcmd.c
  * src/rdd/dbcmd53.c
    * changed HB_USHORT to HB_AREANO in few declarations
    % simplified code taking order number or name from user parameters
This commit is contained in:
Przemysław Czerpak
2013-11-04 17:43:48 +01:00
parent 1dc1bba911
commit ad20cedcc0
3 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.txt
View File

@@ -10,6 +10,12 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-11-04 17:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rdd/dbcmd.c
* src/rdd/dbcmd53.c
* changed HB_USHORT to HB_AREANO in few declarations
% simplified code taking order number or name from user parameters
2013-11-04 16:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbfship/hbfship.hbp
* contrib/hbfship/hbfship.hbx

19
src/rdd/dbcmd.c
View File

@@ -1308,9 +1308,7 @@ HB_FUNC( ORDBAGCLEAR )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.atomBagName = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.atomBagName )
pOrderInfo.atomBagName = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
hb_retl( SELF_ORDLSTDELETE( pArea, &pOrderInfo ) == HB_SUCCESS );
}
else
@@ -1325,9 +1323,7 @@ HB_FUNC( ORDDESTROY )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
hb_retl( SELF_ORDDESTROY( pArea, &pOrderInfo ) == HB_SUCCESS );
}
@@ -1527,9 +1523,7 @@ HB_FUNC( ORDSETFOCUS )
{
DBORDERINFO pInfo;
memset( &pInfo, 0, sizeof( pInfo ) );
pInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pInfo.itmOrder )
pInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pInfo.atomBagName = hb_param( 2, HB_IT_STRING );
pInfo.itmResult = hb_itemPutC( NULL, NULL );
SELF_ORDLSTFOCUS( pArea, &pInfo );
@@ -1770,7 +1764,7 @@ HB_FUNC( DBSETRELATION )
{
DBRELINFO dbRelations;
AREAP pChildArea;
HB_USHORT uiChildArea;
HB_AREANO uiChildArea;
char * szAlias = NULL;
if( hb_pcount() < 2 ||
@@ -1824,7 +1818,8 @@ HB_FUNC( __DBARRANGE )
if( pArea )
{
HB_USHORT uiNewArea, uiCount, uiDest;
HB_AREANO uiNewArea
HB_USHORT uiCount, uiDest;
HB_SIZE nSize;
char * szFieldLine, * szPos;
PHB_ITEM pStruct, pFields;
@@ -1952,7 +1947,7 @@ HB_FUNC( __DBTRANS )
{
if( HB_ISNUM( 1 ) )
{
HB_USHORT uiSrcArea, uiDstArea;
HB_AREANO uiSrcArea, uiDstArea;
AREAP pSrcArea, pDstArea;
uiSrcArea = ( HB_AREANO ) hb_rddGetCurrentWorkAreaNumber();

37
src/rdd/dbcmd53.c
View File

@@ -74,9 +74,7 @@ HB_FUNC( ORDKEYCOUNT )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
@@ -97,9 +95,7 @@ HB_FUNC( ORDKEYNO )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
pOrderInfo.itmNewVal = NULL;
@@ -215,9 +211,7 @@ HB_FUNC( ORDKEYADD )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
pOrderInfo.itmNewVal = hb_param( 3, HB_IT_ANY );
@@ -237,9 +231,7 @@ HB_FUNC( ORDKEYDEL )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
pOrderInfo.itmNewVal = hb_param( 3, HB_IT_ANY );
@@ -259,9 +251,7 @@ HB_FUNC( ORDDESCEND )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
@@ -281,9 +271,7 @@ HB_FUNC( ORDISUNIQUE )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Harbour extension: NewVal to set/reset unique flag */
pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
@@ -303,9 +291,7 @@ HB_FUNC( ORDCUSTOM )
{
DBORDERINFO pOrderInfo;
memset( &pOrderInfo, 0, sizeof( pOrderInfo ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
/* Either or both may be NIL */
pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
@@ -352,13 +338,8 @@ HB_FUNC( DBORDERINFO )
DBORDERINFO pOrderInfo;
/* atomBagName may be NIL */
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
if( ! pOrderInfo.atomBagName )
pOrderInfo.atomBagName = hb_param( 2, HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 3, HB_IT_STRING );
if( ! pOrderInfo.itmOrder )
pOrderInfo.itmOrder = hb_param( 3, HB_IT_NUMERIC );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.itmOrder = hb_param( 3, HB_IT_STRING | HB_IT_NUMERIC );
pOrderInfo.itmNewVal = hb_param( 4, HB_IT_ANY );
pOrderInfo.itmResult = hb_itemNew( NULL );