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

(trunk libT) make the tr_bitsetToBenc() and tr_bitsetFromBenc() functions follow bitset.c's variable naming convention of how the "this" pointer is named

This commit is contained in:
Jordan Lee 2011-02-24 04:14:12 +00:00
parent f4992d885c
commit 25366156b1
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libtransmission/bitset.c
View File

@ -204,7 +204,7 @@ tr_bitsetOr( tr_bitfield * a, const tr_bitset * b )
***/ ***/
tr_bool tr_bool
tr_bitsetFromBenc( tr_bitset * bitset, tr_benc * benc ) tr_bitsetFromBenc( tr_bitset * b, tr_benc * benc )
{ {
size_t buflen; size_t buflen;
const uint8_t * buf; const uint8_t * buf;
@ -214,22 +214,22 @@ tr_bitsetFromBenc( tr_bitset * bitset, tr_benc * benc )
{ {
if( ( buflen == 3 ) && !memcmp( buf, "all", 3 ) ) if( ( buflen == 3 ) && !memcmp( buf, "all", 3 ) )
{ {
tr_bitsetSetHaveAll( bitset ); tr_bitsetSetHaveAll( b );
handled = TRUE; handled = TRUE;
} }
else if( ( buflen == 4 ) && !memcmp( buf, "none", 4 ) ) else if( ( buflen == 4 ) && !memcmp( buf, "none", 4 ) )
{ {
tr_bitsetSetHaveNone( bitset ); tr_bitsetSetHaveNone( b );
handled = TRUE; handled = TRUE;
} }
else else
{ {
bitset->haveAll = FALSE; b->haveAll = FALSE;
bitset->haveNone = FALSE; b->haveNone = FALSE;
tr_free( bitset->bitfield.bits ); tr_free( b->bitfield.bits );
bitset->bitfield.bits = tr_memdup( buf, buflen ); b->bitfield.bits = tr_memdup( buf, buflen );
bitset->bitfield.byteCount = buflen; b->bitfield.byteCount = buflen;
bitset->bitfield.bitCount = buflen * 8; b->bitfield.bitCount = buflen * 8;
handled = TRUE; handled = TRUE;
} }
} }
@ -238,19 +238,19 @@ tr_bitsetFromBenc( tr_bitset * bitset, tr_benc * benc )
} }
void void
tr_bitsetToBenc( const tr_bitset * bitset, tr_benc * benc ) tr_bitsetToBenc( const tr_bitset * b, tr_benc * benc )
{ {
if( bitset->haveAll ) if( b->haveAll )
{ {
tr_bencInitStr( benc, "all", 3 ); tr_bencInitStr( benc, "all", 3 );
} }
else if( bitset->haveNone ) else if( b->haveNone )
{ {
tr_bencInitStr( benc, "none", 4 ); tr_bencInitStr( benc, "none", 4 );
} }
else else
{ {
const tr_bitfield * bf = &bitset->bitfield; const tr_bitfield * bf = &b->bitfield;
const size_t n = tr_bitfieldCountTrueBits( bf ); const size_t n = tr_bitfieldCountTrueBits( bf );
if( n == bf->bitCount ) if( n == bf->bitCount )