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

2009-07-28 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbsocket.h
  * contrib/hbssl/hbssl.c
  * source/rtl/hbsocket.c
  * source/rtl/hbinet.c
  * examples/uhttpd2/socket.c
  * examples/httpsrv/socket.c
    * HB_SOCKET_T -> HB_SOCKET

  * contrib/gtwvg/gtwvg.c
  * contrib/gtwvg/wvggui.c
  * source/rtl/gtstd/gtstd.c
  * source/rtl/filesys.c
  * source/rtl/gtpca/gtpca.c
  * source/rtl/gtwvt/gtwvt.c
    ! Added casts for msvc64.
      Some C RTL functions in msvc64 expects file handles as 'int's.
      The rest is some non-critical stuff.
      Now only size_t to int/ULONG warnings remain in hbrtl.
    ; TOFIX: Plus these two:
      ../../../hbstrfmt.c(459) : warning C4244: 'argument' : conversion from '__int64' to 'ULONG', possible loss of data
      ../../../hbtoken.c(280) : warning C4244: '=' : conversion from '__int64' to 'ULONG', possible loss of data
This commit is contained in:
Viktor Szakats
2009-07-28 10:26:23 +00:00
parent 25c5333120
commit 1054de0e9b
13 changed files with 144 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -17,6 +17,29 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-28 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/hbsocket.h
* contrib/hbssl/hbssl.c
* source/rtl/hbsocket.c
* source/rtl/hbinet.c
* examples/uhttpd2/socket.c
* examples/httpsrv/socket.c
* HB_SOCKET_T -> HB_SOCKET
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* source/rtl/gtstd/gtstd.c
* source/rtl/filesys.c
* source/rtl/gtpca/gtpca.c
* source/rtl/gtwvt/gtwvt.c
! Added casts for msvc64.
Some C RTL functions in msvc64 expects file handles as 'int's.
The rest is some non-critical stuff.
Now only size_t to int/ULONG warnings remain in hbrtl.
; TOFIX: Plus these two:
../../../hbstrfmt.c(459) : warning C4244: 'argument' : conversion from '__int64' to 'ULONG', possible loss of data
../../../hbtoken.c(280) : warning C4244: '=' : conversion from '__int64' to 'ULONG', possible loss of data
2009-07-28 12:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/hbsocket.c
* pacified MSVC64 warnings

4
harbour/contrib/gtwvg/gtwvg.c
View File

@@ -2279,7 +2279,7 @@ static BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Prop
return FALSE;
}
static DWORD hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
static WPARAM hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
{
MSG msg;
@@ -2292,7 +2292,7 @@ static DWORD hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
}
}
return ( DWORD ) msg.wParam;
return msg.wParam;
}
static BOOL hb_gt_wvt_ValidWindowSize( HWND hWnd, int rows, int cols, HFONT hFont, int iWidth )

4
harbour/contrib/gtwvg/wvggui.c
View File

@@ -1235,7 +1235,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
return DefWindowProc( hWnd, message, wParam, lParam );
}
static DWORD hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
static WPARAM hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
{
MSG msg;
HB_SYMBOL_UNUSED( pWVT );
@@ -1244,7 +1244,7 @@ static DWORD hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
TranslateMessage( &msg );
DispatchMessage( &msg );
}
return ( DWORD ) msg.wParam;
return msg.wParam;
}
static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT )

4
harbour/contrib/hbssl/hbssl.c
View File

@@ -80,7 +80,7 @@ HB_FUNC( HB_SSL_READ_ALL )
int iLen;
if( SSL_pending( ssl ) ||
hb_socketSelectRead( ( HB_SOCKET_T ) SSL_get_fd( ssl ), iTimeout ) )
hb_socketSelectRead( ( HB_SOCKET ) SSL_get_fd( ssl ), iTimeout ) )
{
iLen = SSL_read( ssl, &buffer, 1 );
@@ -149,7 +149,7 @@ HB_FUNC( HB_SSL_READ_LINE )
int iLen;
if( SSL_pending( ssl ) ||
hb_socketSelectRead( ( HB_SOCKET_T ) SSL_get_fd( ssl ), iTimeout ) )
hb_socketSelectRead( ( HB_SOCKET ) SSL_get_fd( ssl ), iTimeout ) )
{
iLen = SSL_read( ssl, &buffer, 1 );

18
harbour/examples/httpsrv/socket.c
View File

@@ -50,24 +50,22 @@ static int hb_parnidef( int iParam, int iValue )
return HB_ISNUM( iParam ) ? hb_parni( iParam ) : iValue;
}
static HB_SOCKET_T hb_parsocket( int iParam )
static HB_SOCKET hb_parsocket( int iParam )
{
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET_T ) ( HB_PTRDIFF )
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET ) ( HB_PTRDIFF )
hb_parptr( iParam ) : HB_NO_SOCKET;
}
static void hb_retsocket( HB_SOCKET_T hSocket )
static void hb_retsocket( HB_SOCKET hSocket )
{
if( hSocket == HB_NO_SOCKET )
hb_ret();
else
hb_retptr( ( void* ) ( HB_PTRDIFF ) hSocket );
if( hSocket != HB_NO_SOCKET )
hb_retptr( ( void * ) ( HB_PTRDIFF ) hSocket );
}
static HB_SOCKET_T hb_itemGetSocket( PHB_ITEM pSocket )
static HB_SOCKET hb_itemGetSocket( PHB_ITEM pSocket )
{
if( pSocket && HB_IS_POINTER( pSocket ) )
return ( HB_SOCKET_T ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
return ( HB_SOCKET ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
else
return HB_NO_SOCKET;
}
@@ -157,7 +155,7 @@ HB_FUNC( SOCKET_RECV )
len = hb_parni( 3 );
if( len <= 0 )
len = 4096;
pBuf = ( char* ) hb_xgrab( len + 1 );
pBuf = ( char * ) hb_xgrab( len + 1 );
len = hb_socketRecv( hb_parsocket( 1 ), pBuf, len, hb_parni( 4 ),
HB_ISNUM( 5 ) ? hb_parnint( 5 ) : -1 );
hb_retni( len );

18
harbour/examples/uhttpd2/socket.c
View File

@@ -50,24 +50,22 @@ static int hb_parnidef( int iParam, int iValue )
return HB_ISNUM( iParam ) ? hb_parni( iParam ) : iValue;
}
static HB_SOCKET_T hb_parsocket( int iParam )
static HB_SOCKET hb_parsocket( int iParam )
{
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET_T ) ( HB_PTRDIFF )
return HB_ISPOINTER( iParam ) ? ( HB_SOCKET ) ( HB_PTRDIFF )
hb_parptr( iParam ) : HB_NO_SOCKET;
}
static void hb_retsocket( HB_SOCKET_T hSocket )
static void hb_retsocket( HB_SOCKET hSocket )
{
if( hSocket == HB_NO_SOCKET )
hb_ret();
else
hb_retptr( ( void* ) ( HB_PTRDIFF ) hSocket );
if( hSocket != HB_NO_SOCKET )
hb_retptr( ( void * ) ( HB_PTRDIFF ) hSocket );
}
static HB_SOCKET_T hb_itemGetSocket( PHB_ITEM pSocket )
static HB_SOCKET hb_itemGetSocket( PHB_ITEM pSocket )
{
if( pSocket && HB_IS_POINTER( pSocket ) )
return ( HB_SOCKET_T ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
return ( HB_SOCKET ) ( HB_PTRDIFF ) hb_itemGetPtr( pSocket );
else
return HB_NO_SOCKET;
}
@@ -157,7 +155,7 @@ HB_FUNC( SOCKET_RECV )
len = hb_parni( 3 );
if( len <= 0 )
len = 4096;
pBuf = ( char* ) hb_xgrab( len + 1 );
pBuf = ( char * ) hb_xgrab( len + 1 );
len = hb_socketRecv( hb_parsocket( 1 ), pBuf, len, hb_parni( 4 ),
HB_ISNUM( 5 ) ? hb_parnint( 5 ) : -1 );
hb_retni( len );

58
harbour/include/hbsocket.h
View File

@@ -59,14 +59,14 @@
HB_EXTERN_BEGIN
#if defined( HB_OS_WIN ) && ! defined( HB_OS_UNIX_COMPATIBLE )
typedef HB_PTRUINT HB_SOCKET_T;
typedef HB_PTRUINT HB_SOCKET;
#else
typedef int HB_SOCKET_T;
typedef int HB_SOCKET;
#endif
typedef HB_SOCKET_T ( * HB_SOCK_FUNC )( PHB_ITEM );
typedef HB_SOCKET ( * HB_SOCK_FUNC )( PHB_ITEM );
#define HB_NO_SOCKET ( ( HB_SOCKET_T ) -1 )
#define HB_NO_SOCKET ( ( HB_SOCKET ) -1 )
HB_EXPORT extern int hb_socketInit( void );
HB_EXPORT extern void hb_socketCleanup( void );
@@ -84,31 +84,31 @@ HB_EXPORT extern PHB_ITEM hb_socketGetAliases( const char * szAddr, int af )
HB_EXPORT extern int hb_socketAddrGetPort( const void * pSockAddr, unsigned len );
HB_EXPORT extern BOOL hb_socketAddrFromItem( void ** pSockAddr, unsigned * puiLen, PHB_ITEM pAddrItm );
HB_EXPORT extern PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len );
HB_EXPORT extern int hb_socketGetSockName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen );
HB_EXPORT extern int hb_socketGetPeerName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen );
HB_EXPORT extern HB_SOCKET_T hb_socketOpen( int domain, int type, int protocol );
HB_EXPORT extern int hb_socketClose( HB_SOCKET_T sd );
HB_EXPORT extern int hb_socketShutdown( HB_SOCKET_T sd, int iMode );
HB_EXPORT extern int hb_socketBind( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen );
HB_EXPORT extern int hb_socketListen( HB_SOCKET_T sd, int iBacklog );
HB_EXPORT extern HB_SOCKET_T hb_socketAccept( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout );
HB_EXPORT extern int hb_socketConnect( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout );
HB_EXPORT extern long hb_socketSend( HB_SOCKET_T sd, const void * data, long len, int flags, HB_LONG timeout );
HB_EXPORT extern long hb_socketSendTo( HB_SOCKET_T sd, const void * data, long len, int flags, const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecv( HB_SOCKET_T sd, void * data, long len, int flags, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecvFrom( HB_SOCKET_T sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout );
HB_EXPORT extern int hb_socketSetBlockingIO( HB_SOCKET_T sd, BOOL fBlocking );
HB_EXPORT extern int hb_socketSetReuseAddr( HB_SOCKET_T sd, BOOL fReuse );
HB_EXPORT extern int hb_socketSetKeepAlive( HB_SOCKET_T sd, BOOL fKeepAlive );
HB_EXPORT extern int hb_socketSetBroadcast( HB_SOCKET_T sd, BOOL fBroadcast );
HB_EXPORT extern int hb_socketSetSndBufSize( HB_SOCKET_T sd, int iSize );
HB_EXPORT extern int hb_socketSetRcvBufSize( HB_SOCKET_T sd, int iSize );
HB_EXPORT extern int hb_socketGetRcvBufSize( HB_SOCKET_T sd, int * piSize );
HB_EXPORT extern int hb_socketGetSndBufSize( HB_SOCKET_T sd, int * piSize );
HB_EXPORT extern int hb_socketSetMulticast( HB_SOCKET_T sd, int af, const char * szAddr );
HB_EXPORT extern int hb_socketSelectRead( HB_SOCKET_T sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWrite( HB_SOCKET_T sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWriteEx( HB_SOCKET_T sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketGetSockName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen );
HB_EXPORT extern int hb_socketGetPeerName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen );
HB_EXPORT extern HB_SOCKET hb_socketOpen( int domain, int type, int protocol );
HB_EXPORT extern int hb_socketClose( HB_SOCKET sd );
HB_EXPORT extern int hb_socketShutdown( HB_SOCKET sd, int iMode );
HB_EXPORT extern int hb_socketBind( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen );
HB_EXPORT extern int hb_socketListen( HB_SOCKET sd, int iBacklog );
HB_EXPORT extern HB_SOCKET hb_socketAccept( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout );
HB_EXPORT extern int hb_socketConnect( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout );
HB_EXPORT extern long hb_socketSend( HB_SOCKET sd, const void * data, long len, int flags, HB_LONG timeout );
HB_EXPORT extern long hb_socketSendTo( HB_SOCKET sd, const void * data, long len, int flags, const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecv( HB_SOCKET sd, void * data, long len, int flags, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecvFrom( HB_SOCKET sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout );
HB_EXPORT extern int hb_socketSetBlockingIO( HB_SOCKET sd, BOOL fBlocking );
HB_EXPORT extern int hb_socketSetReuseAddr( HB_SOCKET sd, BOOL fReuse );
HB_EXPORT extern int hb_socketSetKeepAlive( HB_SOCKET sd, BOOL fKeepAlive );
HB_EXPORT extern int hb_socketSetBroadcast( HB_SOCKET sd, BOOL fBroadcast );
HB_EXPORT extern int hb_socketSetSndBufSize( HB_SOCKET sd, int iSize );
HB_EXPORT extern int hb_socketSetRcvBufSize( HB_SOCKET sd, int iSize );
HB_EXPORT extern int hb_socketGetRcvBufSize( HB_SOCKET sd, int * piSize );
HB_EXPORT extern int hb_socketGetSndBufSize( HB_SOCKET sd, int * piSize );
HB_EXPORT extern int hb_socketSetMulticast( HB_SOCKET sd, int af, const char * szAddr );
HB_EXPORT extern int hb_socketSelectRead( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWrite( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayWR, BOOL fSetWR,
PHB_ITEM pArrayEX, BOOL fSetEX,

4
harbour/source/rtl/filesys.c
View File

@@ -888,11 +888,11 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode )
switch( uiDevMode )
{
case FD_BINARY:
iRet = _setmode( ( HB_NHANDLE ) hFileHandle, _O_BINARY );
iRet = _setmode( ( int ) hFileHandle, _O_BINARY );
break;
case FD_TEXT:
iRet = _setmode( ( HB_NHANDLE ) hFileHandle, _O_TEXT );
iRet = _setmode( ( int ) hFileHandle, _O_TEXT );
break;
}

4
harbour/source/rtl/gtpca/gtpca.c
View File

@@ -644,10 +644,10 @@ static int hb_gt_pca_ReadKey( PHB_GT pGT, int iEventMask )
ch = s_keyTransTbl[ ch ];
}
}
else if( !_eof( s_hFilenoStdin ) )
else if( !_eof( ( int ) s_hFilenoStdin ) )
{
BYTE bChar;
if( _read( s_hFilenoStdin, &bChar, 1 ) == 1 )
if( _read( ( int ) s_hFilenoStdin, &bChar, 1 ) == 1 )
ch = s_keyTransTbl[ bChar ];
}
#elif defined( HB_IO_WIN )

4
harbour/source/rtl/gtstd/gtstd.c
View File

@@ -370,10 +370,10 @@ static int hb_gt_std_ReadKey( PHB_GT pGT, int iEventMask )
ch = pGTSTD->keyTransTbl[ ch ];
}
}
else if( !_eof( pGTSTD->hStdin ) )
else if( !_eof( ( int ) pGTSTD->hStdin ) )
{
BYTE bChar;
if( _read( pGTSTD->hStdin, &bChar, 1 ) == 1 )
if( _read( ( int ) pGTSTD->hStdin, &bChar, 1 ) == 1 )
ch = pGTSTD->keyTransTbl[ bChar ];
}
#elif defined( HB_IO_WIN )

2
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -1758,7 +1758,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
return DefWindowProc( hWnd, message, wParam, lParam );
}
static DWORD hb_gt_wvt_ProcessMessages( void )
static WPARAM hb_gt_wvt_ProcessMessages( void )
{
MSG msg;

4
harbour/source/rtl/hbinet.c
View File

@@ -68,7 +68,7 @@
typedef struct
{
HB_SOCKET_T com;
HB_SOCKET com;
void * remote;
unsigned remotelen;
char szErrorText[ 128 ];
@@ -1157,7 +1157,7 @@ HB_FUNC( HB_INETSERVER )
HB_FUNC( HB_INETACCEPT )
{
PHB_SOCKET_STRUCT socket = HB_PARSOCKET( 1 );
HB_SOCKET_T incoming;
HB_SOCKET incoming;
void * sa;
unsigned len;

122
harbour/source/rtl/hbsocket.c
View File

@@ -382,7 +382,7 @@ PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len )
return NULL;
}
int hb_socketGetSockName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
int hb_socketGetSockName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen )
{
HB_SYMBOL_UNUSED( sd );
hb_socketSetRawError( HB_SOCKET_ERR_INVALIDHANDLE );
@@ -391,7 +391,7 @@ int hb_socketGetSockName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
return -1;
}
int hb_socketGetPeerName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
int hb_socketGetPeerName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen )
{
HB_SYMBOL_UNUSED( sd );
hb_socketSetRawError( HB_SOCKET_ERR_INVALIDHANDLE );
@@ -400,7 +400,7 @@ int hb_socketGetPeerName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
return -1;
}
HB_SOCKET_T hb_socketOpen( int domain, int type, int protocol )
HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
{
HB_SYMBOL_UNUSED( domain );
HB_SYMBOL_UNUSED( type );
@@ -409,14 +409,14 @@ HB_SOCKET_T hb_socketOpen( int domain, int type, int protocol )
return HB_NO_SOCKET;
}
int hb_socketClose( HB_SOCKET_T sd )
int hb_socketClose( HB_SOCKET sd )
{
HB_SYMBOL_UNUSED( sd );
hb_socketSetRawError( HB_SOCKET_ERR_INVALIDHANDLE );
return -1;
}
int hb_socketShutdown( HB_SOCKET_T sd, int iMode )
int hb_socketShutdown( HB_SOCKET sd, int iMode )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( iMode );
@@ -424,7 +424,7 @@ int hb_socketShutdown( HB_SOCKET_T sd, int iMode )
return -1;
}
int hb_socketBind( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen )
int hb_socketBind( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( pSockAddr );
@@ -433,7 +433,7 @@ int hb_socketBind( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen )
return -1;
}
int hb_socketListen( HB_SOCKET_T sd, int iBacklog )
int hb_socketListen( HB_SOCKET sd, int iBacklog )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( iBacklog );
@@ -441,7 +441,7 @@ int hb_socketListen( HB_SOCKET_T sd, int iBacklog )
return -1;
}
HB_SOCKET_T hb_socketAccept( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout )
HB_SOCKET hb_socketAccept( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( pSockAddr );
@@ -451,7 +451,7 @@ HB_SOCKET_T hb_socketAccept( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLe
return HB_NO_SOCKET;
}
int hb_socketConnect( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout )
int hb_socketConnect( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( pSockAddr );
@@ -461,7 +461,7 @@ int hb_socketConnect( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen, HB
return -1;
}
long hb_socketSend( HB_SOCKET_T sd, const void * data, long len, int flags, HB_LONG timeout )
long hb_socketSend( HB_SOCKET sd, const void * data, long len, int flags, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( data );
@@ -472,7 +472,7 @@ long hb_socketSend( HB_SOCKET_T sd, const void * data, long len, int flags, HB_L
return -1;
}
long hb_socketSendTo( HB_SOCKET_T sd, const void * data, long len, int flags, const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout )
long hb_socketSendTo( HB_SOCKET sd, const void * data, long len, int flags, const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( data );
@@ -485,7 +485,7 @@ long hb_socketSendTo( HB_SOCKET_T sd, const void * data, long len, int flags, co
return -1;
}
long hb_socketRecv( HB_SOCKET_T sd, void * data, long len, int flags, HB_LONG timeout )
long hb_socketRecv( HB_SOCKET sd, void * data, long len, int flags, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( data );
@@ -496,7 +496,7 @@ long hb_socketRecv( HB_SOCKET_T sd, void * data, long len, int flags, HB_LONG ti
return -1;
}
long hb_socketRecvFrom( HB_SOCKET_T sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout )
long hb_socketRecvFrom( HB_SOCKET sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( data );
@@ -509,7 +509,7 @@ long hb_socketRecvFrom( HB_SOCKET_T sd, void * data, long len, int flags, void *
return -1;
}
int hb_socketSetBlockingIO( HB_SOCKET_T sd, BOOL fBlocking )
int hb_socketSetBlockingIO( HB_SOCKET sd, BOOL fBlocking )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( fBlocking );
@@ -517,7 +517,7 @@ int hb_socketSetBlockingIO( HB_SOCKET_T sd, BOOL fBlocking )
return -1;
}
int hb_socketSetReuseAddr( HB_SOCKET_T sd, BOOL fReuse )
int hb_socketSetReuseAddr( HB_SOCKET sd, BOOL fReuse )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( fReuse );
@@ -525,7 +525,7 @@ int hb_socketSetReuseAddr( HB_SOCKET_T sd, BOOL fReuse )
return -1;
}
int hb_socketSetKeepAlive( HB_SOCKET_T sd, BOOL fKeepAlive )
int hb_socketSetKeepAlive( HB_SOCKET sd, BOOL fKeepAlive )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( fKeepAlive );
@@ -533,7 +533,7 @@ int hb_socketSetKeepAlive( HB_SOCKET_T sd, BOOL fKeepAlive )
return -1;
}
int hb_socketSetBroadcast( HB_SOCKET_T sd, BOOL fBroadcast )
int hb_socketSetBroadcast( HB_SOCKET sd, BOOL fBroadcast )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( fBroadcast );
@@ -541,7 +541,7 @@ int hb_socketSetBroadcast( HB_SOCKET_T sd, BOOL fBroadcast )
return -1;
}
int hb_socketSetSndBufSize( HB_SOCKET_T sd, int iSize )
int hb_socketSetSndBufSize( HB_SOCKET sd, int iSize )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( iSize );
@@ -549,7 +549,7 @@ int hb_socketSetSndBufSize( HB_SOCKET_T sd, int iSize )
return -1;
}
int hb_socketSetRcvBufSize( HB_SOCKET_T sd, int iSize )
int hb_socketSetRcvBufSize( HB_SOCKET sd, int iSize )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( iSize );
@@ -557,7 +557,7 @@ int hb_socketSetRcvBufSize( HB_SOCKET_T sd, int iSize )
return -1;
}
int hb_socketGetSndBufSize( HB_SOCKET_T sd, int * piSize )
int hb_socketGetSndBufSize( HB_SOCKET sd, int * piSize )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( piSize );
@@ -565,7 +565,7 @@ int hb_socketGetSndBufSize( HB_SOCKET_T sd, int * piSize )
return -1;
}
int hb_socketGetRcvBufSize( HB_SOCKET_T sd, int * piSize )
int hb_socketGetRcvBufSize( HB_SOCKET sd, int * piSize )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( piSize );
@@ -573,7 +573,7 @@ int hb_socketGetRcvBufSize( HB_SOCKET_T sd, int * piSize )
return -1;
}
int hb_socketSetMulticast( HB_SOCKET_T sd, int af, const char * szAddr )
int hb_socketSetMulticast( HB_SOCKET sd, int af, const char * szAddr )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( af );
@@ -582,7 +582,7 @@ int hb_socketSetMulticast( HB_SOCKET_T sd, int af, const char * szAddr )
return -1;
}
int hb_socketSelectRead( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectRead( HB_SOCKET sd, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( timeout );
@@ -590,7 +590,7 @@ int hb_socketSelectRead( HB_SOCKET_T sd, HB_LONG timeout )
return -1;
}
int hb_socketSelectWrite( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectWrite( HB_SOCKET sd, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( timeout );
@@ -599,7 +599,7 @@ int hb_socketSelectWrite( HB_SOCKET_T sd, HB_LONG timeout )
}
int hb_socketSelectWriteEx( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout )
{
HB_SYMBOL_UNUSED( sd );
HB_SYMBOL_UNUSED( timeout );
@@ -1158,7 +1158,7 @@ static void hb_socketSetOsError( int err )
pError->iSocketOsError = err;
}
static int hb_socketSelectRD( HB_SOCKET_T sd, HB_LONG timeout )
static int hb_socketSelectRD( HB_SOCKET sd, HB_LONG timeout )
{
struct timeval tv, * ptv;
fd_set rfds;
@@ -1206,7 +1206,7 @@ static int hb_socketSelectRD( HB_SOCKET_T sd, HB_LONG timeout )
( iResult > 0 && FD_ISSET( sd, &rfds ) ? 1 : 0 );
}
static int hb_socketSelectWR( HB_SOCKET_T sd, HB_LONG timeout )
static int hb_socketSelectWR( HB_SOCKET sd, HB_LONG timeout )
{
struct timeval tv, * ptv;
fd_set wfds;
@@ -1254,7 +1254,7 @@ static int hb_socketSelectWR( HB_SOCKET_T sd, HB_LONG timeout )
( iResult > 0 && FD_ISSET( sd, &wfds ) ? 1 : 0 );
}
static int hb_socketSelectWRE( HB_SOCKET_T sd, HB_LONG timeout )
static int hb_socketSelectWRE( HB_SOCKET sd, HB_LONG timeout )
{
struct timeval tv, * ptv;
fd_set wfds, * pefds;
@@ -1667,7 +1667,7 @@ PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len )
return pAddrItm;
}
int hb_socketGetSockName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
int hb_socketGetSockName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen )
{
int ret;
#if defined( HB_HAS_SOCKADDR_STORAGE )
@@ -1695,7 +1695,7 @@ int hb_socketGetSockName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
return ret;
}
int hb_socketGetPeerName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
int hb_socketGetPeerName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen )
{
int ret;
#if defined( __WATCOMC__ ) && defined( HB_OS_LINUX )
@@ -1729,9 +1729,9 @@ int hb_socketGetPeerName( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen )
return ret;
}
HB_SOCKET_T hb_socketOpen( int domain, int type, int protocol )
HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
{
HB_SOCKET_T sd = HB_NO_SOCKET;
HB_SOCKET sd = HB_NO_SOCKET;
int err = 0;
#if defined( HB_SOCKET_TRANSLATE_DOMAIN )
@@ -1855,7 +1855,7 @@ HB_SOCKET_T hb_socketOpen( int domain, int type, int protocol )
return sd;
}
int hb_socketClose( HB_SOCKET_T sd )
int hb_socketClose( HB_SOCKET sd )
{
int ret;
@@ -1881,7 +1881,7 @@ int hb_socketClose( HB_SOCKET_T sd )
return ret;
}
int hb_socketShutdown( HB_SOCKET_T sd, int iMode )
int hb_socketShutdown( HB_SOCKET sd, int iMode )
{
int ret;
@@ -1931,7 +1931,7 @@ int hb_socketShutdown( HB_SOCKET_T sd, int iMode )
return ret;
}
int hb_socketBind( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen )
int hb_socketBind( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen )
{
int ret;
@@ -1946,7 +1946,7 @@ int hb_socketBind( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen )
return ret;
}
int hb_socketListen( HB_SOCKET_T sd, int iBacklog )
int hb_socketListen( HB_SOCKET sd, int iBacklog )
{
int ret;
@@ -1956,9 +1956,9 @@ int hb_socketListen( HB_SOCKET_T sd, int iBacklog )
return ret;
}
HB_SOCKET_T hb_socketAccept( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout )
HB_SOCKET hb_socketAccept( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen, HB_LONG timeout )
{
HB_SOCKET_T newsd = HB_NO_SOCKET;
HB_SOCKET newsd = HB_NO_SOCKET;
int ret;
#if defined( HB_HAS_SOCKADDR_STORAGE )
struct sockaddr_storage st;
@@ -2003,7 +2003,7 @@ HB_SOCKET_T hb_socketAccept( HB_SOCKET_T sd, void ** pSockAddr, unsigned * puiLe
return newsd;
}
int hb_socketConnect( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout )
int hb_socketConnect( HB_SOCKET sd, const void * pSockAddr, unsigned uiLen, HB_LONG timeout )
{
int ret, blk;
@@ -2035,7 +2035,7 @@ int hb_socketConnect( HB_SOCKET_T sd, const void * pSockAddr, unsigned uiLen, HB
return ret;
}
long hb_socketSend( HB_SOCKET_T sd, const void * data, long len, int flags, HB_LONG timeout )
long hb_socketSend( HB_SOCKET sd, const void * data, long len, int flags, HB_LONG timeout )
{
long lSent = 0;
int ret = 0;
@@ -2073,7 +2073,7 @@ long hb_socketSend( HB_SOCKET_T sd, const void * data, long len, int flags, HB_L
return lSent;
}
long hb_socketSendTo( HB_SOCKET_T sd, const void * data, long len, int flags,
long hb_socketSendTo( HB_SOCKET sd, const void * data, long len, int flags,
const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout )
{
long lSent = 0;
@@ -2109,7 +2109,7 @@ long hb_socketSendTo( HB_SOCKET_T sd, const void * data, long len, int flags,
return lSent;
}
long hb_socketRecv( HB_SOCKET_T sd, void * data, long len, int flags, HB_LONG timeout )
long hb_socketRecv( HB_SOCKET sd, void * data, long len, int flags, HB_LONG timeout )
{
long lReceived = 0;
int ret = 0;
@@ -2139,7 +2139,7 @@ long hb_socketRecv( HB_SOCKET_T sd, void * data, long len, int flags, HB_LONG ti
return lReceived;
}
long hb_socketRecvFrom( HB_SOCKET_T sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout )
long hb_socketRecvFrom( HB_SOCKET sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout )
{
long lReceived = 0;
int ret = 0;
@@ -2192,7 +2192,7 @@ long hb_socketRecvFrom( HB_SOCKET_T sd, void * data, long len, int flags, void *
return lReceived;
}
int hb_socketSetBlockingIO( HB_SOCKET_T sd, BOOL fBlocking )
int hb_socketSetBlockingIO( HB_SOCKET sd, BOOL fBlocking )
{
int ret;
#if defined( HB_OS_WIN )
@@ -2232,7 +2232,7 @@ int hb_socketSetBlockingIO( HB_SOCKET_T sd, BOOL fBlocking )
return ret;
}
int hb_socketSetReuseAddr( HB_SOCKET_T sd, BOOL fReuse )
int hb_socketSetReuseAddr( HB_SOCKET sd, BOOL fReuse )
{
/* it allows to reuse port immediately without timeout used to
* clean all pending connections addressed to previous port owner
@@ -2241,41 +2241,41 @@ int hb_socketSetReuseAddr( HB_SOCKET_T sd, BOOL fReuse )
return setsockopt( sd, SOL_SOCKET, SO_REUSEADDR, ( const char * ) &val, sizeof( val ) );
}
int hb_socketSetKeepAlive( HB_SOCKET_T sd, BOOL fKeepAlive )
int hb_socketSetKeepAlive( HB_SOCKET sd, BOOL fKeepAlive )
{
int val = fKeepAlive ? 1 : 0;
return setsockopt( sd, SOL_SOCKET, SO_KEEPALIVE, ( const char * ) &val, sizeof( val ) );
}
int hb_socketSetBroadcast( HB_SOCKET_T sd, BOOL fBroadcast )
int hb_socketSetBroadcast( HB_SOCKET sd, BOOL fBroadcast )
{
int val = fBroadcast ? 1 : 0;
return setsockopt( sd, SOL_SOCKET, SO_BROADCAST, ( const char * ) &val, sizeof( val ) );
}
int hb_socketSetSndBufSize( HB_SOCKET_T sd, int iSize )
int hb_socketSetSndBufSize( HB_SOCKET sd, int iSize )
{
return setsockopt( sd, SOL_SOCKET, SO_SNDBUF, ( const char * ) &iSize, sizeof( iSize ) );
}
int hb_socketSetRcvBufSize( HB_SOCKET_T sd, int iSize )
int hb_socketSetRcvBufSize( HB_SOCKET sd, int iSize )
{
return setsockopt( sd, SOL_SOCKET, SO_RCVBUF, ( const char * ) &iSize, sizeof( iSize ) );
}
int hb_socketGetSndBufSize( HB_SOCKET_T sd, int * piSize )
int hb_socketGetSndBufSize( HB_SOCKET sd, int * piSize )
{
socklen_t len = sizeof( * piSize );
return getsockopt( sd, SOL_SOCKET, SO_SNDBUF, ( char * ) piSize, &len );
}
int hb_socketGetRcvBufSize( HB_SOCKET_T sd, int * piSize )
int hb_socketGetRcvBufSize( HB_SOCKET sd, int * piSize )
{
socklen_t len = sizeof( * piSize );
return getsockopt( sd, SOL_SOCKET, SO_RCVBUF, ( char * ) piSize, &len );
}
int hb_socketSetMulticast( HB_SOCKET_T sd, int af, const char * szAddr )
int hb_socketSetMulticast( HB_SOCKET sd, int af, const char * szAddr )
{
if( af == HB_SOCK_AF_INET )
{
@@ -2321,7 +2321,7 @@ int hb_socketSetMulticast( HB_SOCKET_T sd, int af, const char * szAddr )
return -1;
}
int hb_socketSelectRead( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectRead( HB_SOCKET sd, HB_LONG timeout )
{
int ret;
@@ -2332,7 +2332,7 @@ int hb_socketSelectRead( HB_SOCKET_T sd, HB_LONG timeout )
return ret;
}
int hb_socketSelectWrite( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectWrite( HB_SOCKET sd, HB_LONG timeout )
{
int ret;
@@ -2343,7 +2343,7 @@ int hb_socketSelectWrite( HB_SOCKET_T sd, HB_LONG timeout )
return ret;
}
int hb_socketSelectWriteEx( HB_SOCKET_T sd, HB_LONG timeout )
int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout )
{
int ret;
@@ -2359,12 +2359,12 @@ int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayEX, BOOL fSetEX,
HB_LONG timeout, HB_SOCK_FUNC pFunc )
{
HB_SOCKET_T maxsd, sd;
HB_SOCKET maxsd, sd;
int i, ret;
ULONG ulLen, ulPos, ul;
PHB_ITEM pItemSets[ 3 ];
BOOL pSet[ 3 ];
fd_set fds[3], *pfds[ 3 ];
fd_set fds[ 3 ], *pfds[ 3 ];
struct timeval tv, *ptv;
pItemSets[ 0 ] = pArrayRD;
@@ -2390,9 +2390,9 @@ int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
{
HB_TYPE type = hb_arrayGetType( pItemSets[ i ], ul );
if( type & HB_IT_NUMERIC )
sd = ( HB_SOCKET_T ) hb_arrayGetNInt( pItemSets[ i ], ul );
sd = ( HB_SOCKET ) hb_arrayGetNInt( pItemSets[ i ], ul );
else if( type & HB_IT_POINTER )
sd = ( HB_SOCKET_T ) ( HB_PTRDIFF ) hb_arrayGetPtr( pItemSets[ i ], ul );
sd = ( HB_SOCKET ) ( HB_PTRDIFF ) hb_arrayGetPtr( pItemSets[ i ], ul );
else
sd = HB_NO_SOCKET;
}
@@ -2435,9 +2435,9 @@ int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
{
HB_TYPE type = hb_arrayGetType( pItemSets[ i ], ul );
if( type & HB_IT_NUMERIC )
sd = ( HB_SOCKET_T ) hb_arrayGetNInt( pItemSets[ i ], ul );
sd = ( HB_SOCKET ) hb_arrayGetNInt( pItemSets[ i ], ul );
else if( type & HB_IT_POINTER )
sd = ( HB_SOCKET_T ) ( HB_PTRDIFF ) hb_arrayGetPtr( pItemSets[ i ], ul );
sd = ( HB_SOCKET ) ( HB_PTRDIFF ) hb_arrayGetPtr( pItemSets[ i ], ul );
else
sd = HB_NO_SOCKET;
}