(trunk libT) make tr_isAddress() and tr_isDirection() inline

diff --git a/libtransmission/net.c b/libtransmission/net.c
index e28063a39d56624140307cadf233dd836d74f518..b51177955e8b51bdcc4854508e56e8cadcddc995 100644 (file)
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -98,12 +98,6 @@ tr_suspectAddress( const tr_address * a, const char * source )
     }
 }
 
-tr_bool
-tr_isAddress( const tr_address * a )
-{
-    return a && ( a->type==TR_AF_INET || a->type==TR_AF_INET6 );
-}
-
 const char * 
 tr_ntop( const tr_address * src, char * dst, int size ) 
 {

diff --git a/libtransmission/net.h b/libtransmission/net.h
index 6fe3019fa157ae75b4a28540e095e1fc4e88f26f..1953557fff659e05b0ab8162786928f8aa9e61a0 100644 (file)
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -86,7 +86,8 @@ int tr_compareAddresses( const tr_address * a,
 void tr_normalizeV4Mapped( tr_address * const addr );
 
 void tr_suspectAddress( const tr_address * a, const char * source );
-tr_bool tr_isAddress( const tr_address * a );
+
+#define tr_isAddress(a) ( ((a)!=NULL) && ( (a)->type==TR_AF_INET || (a)->type==TR_AF_INET6 ) )
 
 typedef struct tr_net_af_support
 {

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index d44458233d2efdc8e5e602cef7b4628961275129..6c4e744c13792bb3babbfa76db8bec9fe343093d 100644 (file)
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -153,8 +153,6 @@ canReadWrapper( tr_peerIo * io )
     tr_bool err = 0;
     tr_session * session = io->session;
 
-    assert( tr_isPeerIo( io ) );
-
     dbgmsg( io, "canRead" );
 
     /* try to consume the input buffer */
@@ -923,8 +921,6 @@ tr_peerIoTryRead( tr_peerIo * io, size_t howmuch )
 {
     int res = 0;
 
-    assert( tr_isPeerIo( io ) );
-
     if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, howmuch )))
     {
         int e;
@@ -955,8 +951,6 @@ tr_peerIoTryWrite( tr_peerIo * io, size_t howmuch )
 {
     int n;
 
-    assert( tr_isPeerIo( io ) );
-
     if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_UP, howmuch )))
     {
         int e;

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index f2eb26e79fdfcc09325c0c855ee4b95c67ef7d2d..24ff8afdc20d5db5f0833f864d6ede66c4a91097 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -1415,7 +1415,7 @@ void tr_torrentSetDoneDate( tr_torrent  * torrent,
                             time_t        doneDate );
 
 /** @brief Sanity checker to test that the direction is TR_UP or TR_DOWN */
-tr_bool tr_isDirection( tr_direction );
+#define tr_isDirection(d) (((d)==TR_UP) || ((d)==TR_DOWN))
 
 /** @} */
 

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 303b97d3cda3d124f16044c8744427b5abc23631..97a925060db6cf1058765d27a5731527c848b623 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1277,12 +1277,6 @@ tr_base64_decode( const void * input,
     return ret;
 }
 
-tr_bool
-tr_isDirection( tr_direction dir )
-{
-    return dir==TR_UP || dir==TR_DOWN;
-}
-
 int
 tr_ptr2int( void* v )
 {