mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) remove a small number of redundant or unnecessary asserts

This commit is contained in:
Charles Kerr 2009-01-08 04:43:00 +00:00
parent 17ef142fc9
commit 98420365e9
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtransmission/peer-io.c
View File

@ -172,12 +172,7 @@ tr_isPeerIo( const tr_peerIo * io )
&& ( io->magicNumber == MAGIC_NUMBER )
&& ( io->refCount > 0 )
&& ( tr_isBandwidth( &io->bandwidth ) )
&& ( tr_isAddress( &io->addr ) )
&& ( tr_isBool( io->isEncrypted ) )
&& ( tr_isBool( io->isIncoming ) )
&& ( tr_isBool( io->peerIdIsSet ) )
&& ( tr_isBool( io->extendedProtocolSupported ) )
&& ( tr_isBool( io->fastExtensionSupported ) );
&& ( tr_isAddress( &io->addr ) );
}
static void
@ -841,8 +836,6 @@ tr_peerIoFlush( tr_peerIo * io, tr_direction dir, size_t limit )
static void
event_enable( tr_peerIo * io, short event )
{
assert( tr_isPeerIo( io ) );
if( event & EV_READ )
event_add( &io->event_read, NULL );
@ -853,8 +846,6 @@ event_enable( tr_peerIo * io, short event )
static void
event_disable( struct tr_peerIo * io, short event )
{
assert( tr_isPeerIo( io ) );
if( event & EV_READ )
event_del( &io->event_read );
@ -868,13 +859,11 @@ tr_peerIoSetEnabled( tr_peerIo * io,
tr_direction dir,
tr_bool isEnabled )
{
short event;
const short event = dir == TR_UP ? EV_WRITE : EV_READ;
assert( tr_isPeerIo( io ) );
assert( tr_isDirection( dir ) );
event = dir == TR_UP ? EV_WRITE : EV_READ;
if( isEnabled )
event_enable( io, event );
else

2
libtransmission/utils.h
View File

@ -300,7 +300,7 @@ char* tr_strndup( const void * str, int len ) TR_GNUC_MALLOC;
static inline char* tr_strdup( const void * in )
{
return tr_strndup( in, in ? strlen( (const char*)in ) : 0 );
return tr_strndup( in, in ? strlen( in ) : 0 );
}
/* @brief same argument list as bsearch() */