From 62c84afafe00eb5d90cb6c1683ff7d619e2dd0f8 Mon Sep 17 00:00:00 2001 From: Mindaugas Kavaliauskas Date: Tue, 21 Sep 2010 16:12:26 +0000 Subject: [PATCH] 2010-09-21 19:10 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/rddsql/sqlbase.c ! fixed connection freeing in RDDI_DISCONNECT * harbour/include/hbsocket.h * added socket item API functions --- harbour/ChangeLog | 6 ++++++ harbour/contrib/rddsql/sqlbase.c | 2 +- harbour/include/hbsocket.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a82e351e05..787206b8bd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-21 19:10 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * harbour/contrib/rddsql/sqlbase.c + ! fixed connection freeing in RDDI_DISCONNECT + * harbour/include/hbsocket.h + * added socket item API functions + 2010-09-21 01:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/doc/en/class_qbrush.txt * contrib/hbqt/qtgui/doc/en/class_qcolor.txt diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index cfa9e748b0..673a659122 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -1048,7 +1048,7 @@ static HB_ERRCODE sqlbaseRddInfo( LPRDDNODE pRDD, HB_USHORT uiIndex, HB_ULONG ul if ( pConn && ! pConn->uiAreaCount && pConn->pSDD->Disconnect( pConn ) == HB_SUCCESS ) { hb_xfree( pConn ); - s_pConnection[ ulConn ] = NULL; + s_pConnection[ ulConn - 1 ] = NULL; if( s_ulConnectionCurrent == ulConn ) { s_ulConnectionCurrent = 0; diff --git a/harbour/include/hbsocket.h b/harbour/include/hbsocket.h index ac16c859a5..a76e832346 100644 --- a/harbour/include/hbsocket.h +++ b/harbour/include/hbsocket.h @@ -117,6 +117,12 @@ extern HB_EXPORT int hb_socketSelect( PHB_ITEM pArrayRD, HB_BOOL fSetRD PHB_ITEM pArrayEX, HB_BOOL fSetEX, HB_MAXINT timeout, HB_SOCKET_FUNC pFunc ); +/* Harbour level socket item API functions */ +extern HB_EXPORT HB_SOCKET hb_socketParam( int iParam ); +extern HB_EXPORT HB_SOCKET hb_socketItemGet( PHB_ITEM pItem ); +extern HB_EXPORT PHB_ITEM hb_socketItemPut( PHB_ITEM pItem, HB_SOCKET sd ); +extern HB_EXPORT void hb_socketItemClear( PHB_ITEM pItem ); + HB_EXTERN_END #endif /* HB_SOCKET_H_ */