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

2015-03-02 16:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/hbinet.c
  * contrib/hbssl/ssl_inet.c
    ! fixed unfinished code with error code translation - thanks to Abe
This commit is contained in:
Przemysław Czerpak
2015-03-02 16:08:37 +01:00
parent d976db49c9
commit a6c8ffc884
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-03-02 16:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/hbinet.c
* contrib/hbssl/ssl_inet.c
! fixed unfinished code with error code translation - thanks to Abe
2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/rddads/ads1.c
* removed unnecessary casting

3
contrib/hbssl/ssl_inet.c
View File

@@ -1,4 +1,3 @@
/*
* Harbour Project source code:
* SSL encryption for Harbour hb_inet*() connections
*
@@ -101,7 +100,7 @@ static long hb_inetReadSSL( PHB_ZNETSTREAM pStream, HB_SOCKET sd,
iToRead = timeout < 0 ? 1 : hb_socketSelectRead( sd, timeout );
if( iToRead <= 0 )
pStream->error = iToRead == 0 ?
HB_INET_ERR_TIMEOUT : hb_socketGetError();
HB_SOCKET_ERR_TIMEOUT : hb_socketGetError();
else
iToRead = ( int ) len;
}

16
src/rtl/hbinet.c
View File

@@ -143,20 +143,18 @@ static int s_inetGetError( PHB_SOCKET_STRUCT socket )
{
int iError;
if( socket->errorFunc )
iError = socket->errorFunc( socket->stream );
else
{
iError = hb_socketGetError();
if( iError == HB_SOCKET_ERR_TIMEOUT )
iError = HB_INET_ERR_TIMEOUT;
}
iError = socket->errorFunc ? socket->errorFunc( socket->stream ) :
hb_socketGetError();
if( iError == HB_SOCKET_ERR_TIMEOUT )
iError = HB_INET_ERR_TIMEOUT;
return iError;
}
static HB_BOOL s_inetIsTimeout( PHB_SOCKET_STRUCT socket )
{
return s_inetGetError( socket ) == HB_SOCKET_ERR_TIMEOUT;
return s_inetGetError( socket ) == HB_INET_ERR_TIMEOUT;
}
static void hb_inetGetError( PHB_SOCKET_STRUCT socket )