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

2000-07-16 13:38 UTC+0100 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-07-16 11:40:51 +00:00
parent ffe49c60fd
commit 68f556d35c
4 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -1,3 +1,12 @@
2000-07-16 13:38 UTC+0100 Victor Szakats <info@szelvesz.hu>
* source/rtl/binnum.c
* source/rtl/binnumx.c
% Optimized for size and speed.
* include/hbdefs.h
! Minor fix to HB_MKUSHORT(), HB_MKSHORT(), HB_MKLONG(), HB_MKULONG()
2000-07-15 20:00 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
*include/hbexpra.c

20
harbour/include/hbdefs.h
View File

@@ -130,16 +130,16 @@
#define HB_LOBYTE( w ) ( ( BYTE ) ( w ) )
#define HB_HIBYTE( w ) ( ( BYTE ) ( ( ( USHORT ) ( w ) >> 8 ) & 0xFF ) )
#define HB_MKSHORT( lo, hi ) ( ( SHORT ) ( ( ( SHORT ) hi ) << 8 ) | lo )
#define HB_MKUSHORT( lo, hi ) ( ( USHORT ) ( ( ( USHORT ) hi ) << 8 ) | lo )
#define HB_MKLONG( b1, b2, b3, b4 ) ( ( ( LONG ) b4 ) << 24 ) | \
( ( ( LONG ) b3 ) << 16 ) | \
( ( ( LONG ) b2 ) << 8 ) | \
( ( ( LONG ) b1 ) )
#define HB_MKULONG( b1, b2, b3, b4 ) ( ( ( ULONG ) b4 ) << 24 ) | \
( ( ( ULONG ) b3 ) << 16 ) | \
( ( ( ULONG ) b2 ) << 8 ) | \
( ( ( ULONG ) b1 ) )
#define HB_MKSHORT( lo, hi ) ( ( SHORT ) ( ( ( SHORT ) ( hi ) ) << 8 ) | ( lo ) )
#define HB_MKUSHORT( lo, hi ) ( ( USHORT ) ( ( ( USHORT ) ( hi ) ) << 8 ) | ( lo ) )
#define HB_MKLONG( b1, b2, b3, b4 ) ( ( ( LONG ) ( b4 ) ) << 24 ) | \
( ( ( LONG ) ( b3 ) ) << 16 ) | \
( ( ( LONG ) ( b2 ) ) << 8 ) | \
( ( ( LONG ) ( b1 ) ) )
#define HB_MKULONG( b1, b2, b3, b4 ) ( ( ( ULONG ) ( b4 ) ) << 24 ) | \
( ( ( ULONG ) ( b3 ) ) << 16 ) | \
( ( ( ULONG ) ( b2 ) ) << 8 ) | \
( ( ( ULONG ) ( b1 ) ) )
#define HB_SYMBOL_UNUSED( symbol ) ( void ) symbol

30
harbour/source/rtl/binnum.c
View File

@@ -44,13 +44,9 @@ HB_FUNC( BIN2W )
{
char * pszString = hb_itemGetCPtr( pItem );
ULONG ulLen = hb_itemGetCLen( pItem );
BYTE byBuffer[ 2 ];
byBuffer[ 0 ] = ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0;
byBuffer[ 1 ] = ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0;
hb_retni( HB_MKUSHORT( byBuffer[ 0 ],
byBuffer[ 1 ] ) );
hb_retni( HB_MKUSHORT( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0 ) );
}
else
hb_retni( 0 );
@@ -64,13 +60,9 @@ HB_FUNC( BIN2I )
{
char * pszString = hb_itemGetCPtr( pItem );
ULONG ulLen = hb_itemGetCLen( pItem );
BYTE byBuffer[ 2 ];
byBuffer[ 0 ] = ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0;
byBuffer[ 1 ] = ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0;
hb_retni( HB_MKSHORT( byBuffer[ 0 ],
byBuffer[ 1 ] ) );
hb_retni( HB_MKSHORT( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0 ) );
}
else
hb_retni( 0 );
@@ -84,17 +76,11 @@ HB_FUNC( BIN2L )
{
char * pszString = hb_itemGetCPtr( pItem );
ULONG ulLen = hb_itemGetCLen( pItem );
BYTE byBuffer[ 4 ];
byBuffer[ 0 ] = ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0;
byBuffer[ 1 ] = ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0;
byBuffer[ 2 ] = ( ulLen >= 3 ) ? ( BYTE ) pszString[ 2 ] : 0;
byBuffer[ 3 ] = ( ulLen >= 4 ) ? ( BYTE ) pszString[ 3 ] : 0;
hb_retnl( HB_MKLONG( byBuffer[ 0 ],
byBuffer[ 1 ],
byBuffer[ 2 ],
byBuffer[ 3 ] ) );
hb_retnl( HB_MKLONG( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0,
( ulLen >= 3 ) ? ( BYTE ) pszString[ 2 ] : 0,
( ulLen >= 4 ) ? ( BYTE ) pszString[ 3 ] : 0 ) );
}
else
hb_retnl( 0 );

14
harbour/source/rtl/binnumx.c
View File

@@ -48,17 +48,11 @@ HB_FUNC( BIN2U )
{
char * pszString = hb_itemGetCPtr( pItem );
ULONG ulLen = hb_itemGetCLen( pItem );
BYTE byBuffer[ 4 ];
byBuffer[ 0 ] = ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0;
byBuffer[ 1 ] = ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0;
byBuffer[ 2 ] = ( ulLen >= 3 ) ? ( BYTE ) pszString[ 2 ] : 0;
byBuffer[ 3 ] = ( ulLen >= 4 ) ? ( BYTE ) pszString[ 3 ] : 0;
hb_retnl( HB_MKULONG( byBuffer[ 0 ],
byBuffer[ 1 ],
byBuffer[ 2 ],
byBuffer[ 3 ] ) );
hb_retnl( HB_MKULONG( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0,
( ulLen >= 3 ) ? ( BYTE ) pszString[ 2 ] : 0,
( ulLen >= 4 ) ? ( BYTE ) pszString[ 3 ] : 0 ) );
}
else
hb_retnl( 0 );