Changeset 7574

Timestamp:

Jan 2, 2009, 4:47:37 AM (12 years ago)

Author:

charles

Message:

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

Location:

trunk/libtransmission

Files:

• net.c (modified) (1 diff)
• net.h (modified) (1 diff)
• peer-io.c (modified) (3 diffs)
• transmission.h (modified) (1 diff)
• utils.c (modified) (1 diff)

trunk/libtransmission/net.c

@@ -99 +99 @@
 }
 
-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 ) 

trunk/libtransmission/net.h

@@ -87 +87 @@
 
 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

trunk/libtransmission/peer-io.c

@@ -154 +154 @@
     tr_session * session = io->session;
 
-    assert( tr_isPeerIo( io ) );
-
     dbgmsg( io, "canRead" );
 
@@ -924 +922 @@
     int res = 0;
 
-    assert( tr_isPeerIo( io ) );
-
     if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, howmuch )))
     {
@@ -956 +952 @@
     int n;
 
-    assert( tr_isPeerIo( io ) );
-
     if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_UP, howmuch )))
     {

trunk/libtransmission/transmission.h

@@ -1416 +1416 @@
 
 /** @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))
 
 /** @} */

trunk/libtransmission/utils.c

@@ -1278 +1278 @@
 }
 
-tr_bool
-tr_isDirection( tr_direction dir )
-{
-    return dir==TR_UP || dir==TR_DOWN;
-}
-
 int
 tr_ptr2int( void* v )