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

2011-01-25 16:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/vm/itemapi.c
    * do not clear parameter when NULL item is passed to
      hb_itemParamStore*() functions

  * harbour/contrib/hbnetio/netiosrv.c
  * harbour/contrib/hbnetio/readme.txt
    - removed NETIO_SRVSOCKET()

  * harbour/ChangeLog
    * marked TODO as DONE
This commit is contained in:
Przemyslaw Czerpak
2011-01-25 15:54:46 +00:00
parent e19f36ccc3
commit a05a2ec496
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-25 16:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/vm/itemapi.c
* do not clear parameter when NULL item is passed to
hb_itemParamStore*() functions
* harbour/contrib/hbnetio/netiosrv.c
* harbour/contrib/hbnetio/readme.txt
- removed NETIO_SRVSOCKET()
* harbour/ChangeLog
* marked TODO as DONE
2011-01-25 16:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbnetio/utils/netiosrv/netiosrv.prg
* Minors.
@@ -77,6 +89,7 @@
replaced by:
NETIO_SRVSTATUS( pConnSock, NETIO_SRVINFO_FILESCOUNT, @nCount )
so it can be removed too.
[DONE]
2011-01-25 12:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbnetio/utils/netiosrv/netiosrv.prg

9
harbour/contrib/hbnetio/netiosrv.c
View File

@@ -1417,15 +1417,8 @@ HB_FUNC( NETIO_SRVSTATUS )
hb_xfree( addr );
}
hb_itemParamStoreRelease( 3, pItem );
break;
}
}
hb_retni( iStatus );
}
HB_FUNC( NETIO_SRVSOCKET )
{
PHB_CONSRV conn = s_consrvParam( 1 );
if( conn )
hb_socketItemPut( hb_stackReturnItem(), conn->sd );
}

5
harbour/contrib/hbnetio/readme.txt
View File

@@ -155,8 +155,3 @@ Server side functions:
[, <nStreamID> | <nSrvInfo>, @<xData>] ) -> <nStatus>
NETIO_SRVSENDITEM( <pConnectionSocket>, <nStreamID>, <xData> ) -> <lSent>
NETIO_SRVSENDDATA( <pConnectionSocket>, <nStreamID>, <cData> ) -> <lSent>
NETIO_SRVSOCKET( <pConnectionSocket> ) -> <pHbSocket>
<pHbSocket> can be used with Harbour socket functions (hb_socket*())
Please remember that <pHbSocket> handle can be used only for statistics
and must not be used for any send/receive operations.

16
harbour/src/vm/itemapi.c
View File

@@ -128,11 +128,11 @@ HB_BOOL hb_itemParamStore( HB_USHORT uiParam, PHB_ITEM pItem )
if( hb_param( uiParam, HB_IT_BYREF ) )
{
HB_STACK_TLS_PRELOAD
if( pItem )
{
HB_STACK_TLS_PRELOAD
hb_itemCopyToRef( hb_stackItemFromBase( uiParam ), pItem );
else
hb_itemClear( hb_stackItemFromBase( uiParam ) );
}
return HB_TRUE;
}
@@ -145,11 +145,11 @@ HB_BOOL hb_itemParamStoreForward( HB_USHORT uiParam, PHB_ITEM pItem )
if( hb_param( uiParam, HB_IT_BYREF ) )
{
HB_STACK_TLS_PRELOAD
if( pItem )
{
HB_STACK_TLS_PRELOAD
hb_itemMoveToRef( hb_stackItemFromBase( uiParam ), pItem );
else
hb_itemClear( hb_stackItemFromBase( uiParam ) );
}
return HB_TRUE;
}
@@ -162,14 +162,12 @@ HB_BOOL hb_itemParamStoreRelease( HB_USHORT uiParam, PHB_ITEM pItem )
if( hb_param( uiParam, HB_IT_BYREF ) )
{
HB_STACK_TLS_PRELOAD
if( pItem )
{
HB_STACK_TLS_PRELOAD
hb_itemMoveToRef( hb_stackItemFromBase( uiParam ), pItem );
hb_itemRelease( pItem );
}
else
hb_itemClear( hb_stackItemFromBase( uiParam ) );
return HB_TRUE;
}