From 2b8124d3adfac79b8d9587fc19d19214c6c030d4 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Sat, 12 Feb 2011 17:27:47 +0000 Subject: [PATCH] (trunk) #4019 "Minor patch, kill useless casts in transmission source." -- fixed. patch by jlouis jlouis used Coccinelle to scan transmission's source for redundant code that casts a type to its own type. --- daemon/remote.c | 2 +- libtransmission/fdlimit.c | 2 +- libtransmission/handshake.c | 6 +++--- libtransmission/json.c | 2 +- libtransmission/peer-mgr.c | 4 ++-- libtransmission/utils.c | 2 +- libtransmission/utils.h | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9db09a403..875fdcaba 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2277,7 +2277,7 @@ processArgs( const char * rpcurl, int argc, const char ** argv ) } default: { - fprintf( stderr, "got opt [%d]\n", (int)c ); + fprintf( stderr, "got opt [%d]\n", c ); showUsage( ); break; } diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c index c80953e40..73edf6dbc 100644 --- a/libtransmission/fdlimit.c +++ b/libtransmission/fdlimit.c @@ -793,7 +793,7 @@ tr_fdSetPeerLimit( tr_session * session, int socket_limit ) #endif gFd->public_socket_limit = socket_limit; - tr_dbg( "socket limit is %d", (int)gFd->socket_limit ); + tr_dbg( "socket limit is %d", gFd->socket_limit ); } int diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c index 020129c1c..4bd2875d3 100644 --- a/libtransmission/handshake.c +++ b/libtransmission/handshake.c @@ -265,7 +265,7 @@ parseHandshake( tr_handshake * handshake, uint8_t peer_id[PEER_ID_LEN]; dbgmsg( handshake, "payload: need %d, got %zu", - (int)HANDSHAKE_SIZE, evbuffer_get_length( inbuf ) ); + HANDSHAKE_SIZE, evbuffer_get_length( inbuf ) ); if( evbuffer_get_length( inbuf ) < HANDSHAKE_SIZE ) return READ_LATER; @@ -608,7 +608,7 @@ readHandshake( tr_handshake * handshake, uint8_t hash[SHA_DIGEST_LENGTH]; dbgmsg( handshake, "payload: need %d, got %zu", - (int)INCOMING_HANDSHAKE_LEN, evbuffer_get_length( inbuf ) ); + INCOMING_HANDSHAKE_LEN, evbuffer_get_length( inbuf ) ); if( evbuffer_get_length( inbuf ) < INCOMING_HANDSHAKE_LEN ) return READ_LATER; @@ -757,7 +757,7 @@ readYa( tr_handshake * handshake, int len; dbgmsg( handshake, "in readYa... need %d, have %zu", - (int)KEY_LEN, evbuffer_get_length( inbuf ) ); + KEY_LEN, evbuffer_get_length( inbuf ) ); if( evbuffer_get_length( inbuf ) < KEY_LEN ) return READ_LATER; diff --git a/libtransmission/json.c b/libtransmission/json.c index 01b08b802..1e4b5e944 100644 --- a/libtransmission/json.c +++ b/libtransmission/json.c @@ -91,7 +91,7 @@ callback( void * vdata, case JSON_T_FLOAT: data->hasContent = TRUE; - tr_bencInitReal( getNode( data ), (double)value->vu.float_value ); + tr_bencInitReal( getNode( data ), value->vu.float_value ); break; case JSON_T_NULL: diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index cc8dec102..9b72af6fd 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -803,10 +803,10 @@ comparePieceByWeight( const void * va, const void * vb ) /* primary key: weight */ missing = tr_cpMissingBlocksInPiece( &tor->completion, a->index ); pending = a->requestCount; - ia = missing > pending ? missing - pending : (int)(tor->blockCountInPiece + pending); + ia = missing > pending ? missing - pending : (tor->blockCountInPiece + pending); missing = tr_cpMissingBlocksInPiece( &tor->completion, b->index ); pending = b->requestCount; - ib = missing > pending ? missing - pending : (int)(tor->blockCountInPiece + pending); + ib = missing > pending ? missing - pending : (tor->blockCountInPiece + pending); if( ia < ib ) return -1; if( ia > ib ) return 1; diff --git a/libtransmission/utils.c b/libtransmission/utils.c index f8fe9439f..60e757789 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -201,7 +201,7 @@ tr_getLogTimeStr( char * buf, int buflen ) seconds = tv.tv_sec; tr_localtime_r( &seconds, &now_tm ); strftime( tmp, sizeof( tmp ), "%H:%M:%S", &now_tm ); - milliseconds = (int)( tv.tv_usec / 1000 ); + milliseconds = tv.tv_usec / 1000; tr_snprintf( buf, buflen, "%s.%03d", tmp, milliseconds ); return buf; diff --git a/libtransmission/utils.h b/libtransmission/utils.h index f063c85d3..ab8d99a47 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -323,13 +323,13 @@ void evbuffer_ref_cleanup_tr_free( const void * data UNUSED, size_t datalen UNUS void* tr_memdup( const void * src, size_t byteCount ); #define tr_new( struct_type, n_structs ) \ - ( (struct_type *) tr_malloc ( ( (size_t) sizeof ( struct_type ) ) * ( ( size_t) ( n_structs ) ) ) ) + ( (struct_type *) tr_malloc ( sizeof ( struct_type ) * ( ( size_t) ( n_structs ) ) ) ) #define tr_new0( struct_type, n_structs ) \ - ( (struct_type *) tr_malloc0 ( ( (size_t) sizeof ( struct_type ) ) * ( ( size_t) ( n_structs ) ) ) ) + ( (struct_type *) tr_malloc0 ( sizeof ( struct_type ) * ( ( size_t) ( n_structs ) ) ) ) #define tr_renew( struct_type, mem, n_structs ) \ - ( (struct_type *) realloc ( ( mem ), ( (size_t) sizeof ( struct_type ) ) * ( ( size_t) ( n_structs ) ) ) ) + ( (struct_type *) realloc ( ( mem ), sizeof ( struct_type ) * ( ( size_t) ( n_structs ) ) ) ) void* tr_valloc( size_t bufLen );