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

(trunk libT) silence a gcc 4.4 warning: "dereferencing type-punned pointer will break strict-aliasing rules"

This commit is contained in:
Charles Kerr 2009-06-14 19:17:10 +00:00
parent e082548030
commit 813640d6f3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libtransmission/peer-msgs.c
View File

@ -543,12 +543,16 @@ tr_generateAllowedSet( tr_piece_index_t * setmePieces,
if( addr->type == TR_AF_INET )
{
uint8_t w[SHA_DIGEST_LENGTH + 4];
uint8_t w[SHA_DIGEST_LENGTH + 4], *walk=w;
uint8_t x[SHA_DIGEST_LENGTH];
*(uint32_t*)w = ntohl( htonl( addr->addr.addr4.s_addr ) & 0xffffff00 ); /* (1) */
memcpy( w + 4, infohash, SHA_DIGEST_LENGTH ); /* (2) */
tr_sha1( x, w, sizeof( w ), NULL ); /* (3) */
uint32_t ui32 = ntohl( htonl( addr->addr.addr4.s_addr ) & 0xffffff00 ); /* (1) */
memcpy( w, &ui32, sizeof( uint32_t ) );
walk += sizeof( uint32_t );
memcpy( walk, infohash, SHA_DIGEST_LENGTH ); /* (2) */
walk += SHA_DIGEST_LENGTH;
tr_sha1( x, w, walk-w, NULL ); /* (3) */
assert( sizeof( w ) == walk-w );
while( setSize<desiredSetSize )
{