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

(trunk libT) tr_set_compare() is only used in one place, so make it a private function there instead of leaving it public in utils.h

This commit is contained in:
Jordan Lee 2011-03-22 23:42:25 +00:00
parent 503035fa7e
commit 14277760d7
3 changed files with 65 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libtransmission/peer-msgs.c
View File

@ -2105,6 +2105,71 @@ pexElementCb( void * vpex, void * userData )
diffs->elements[diffs->elementCount++] = *pex;
}
/**
* @brief find the differences and commonalities in two sorted sets
* @param a the first set
* @param aCount the number of elements in the set 'a'
* @param b the second set
* @param bCount the number of elements in the set 'b'
* @param compare the sorting method for both sets
* @param elementSize the sizeof the element in the two sorted sets
* @param in_a called for items in set 'a' but not set 'b'
* @param in_b called for items in set 'b' but not set 'a'
* @param in_both called for items that are in both sets
* @param userData user data passed along to in_a, in_b, and in_both
*/
static void
tr_set_compare( const void * va, size_t aCount,
const void * vb, size_t bCount,
int compare( const void * a, const void * b ),
size_t elementSize,
tr_set_func in_a_cb,
tr_set_func in_b_cb,
tr_set_func in_both_cb,
void * userData )
{
const uint8_t * a = va;
const uint8_t * b = vb;
const uint8_t * aend = a + elementSize * aCount;
const uint8_t * bend = b + elementSize * bCount;
while( a != aend || b != bend )
{
if( a == aend )
{
( *in_b_cb )( (void*)b, userData );
b += elementSize;
}
else if( b == bend )
{
( *in_a_cb )( (void*)a, userData );
a += elementSize;
}
else
{
const int val = ( *compare )( a, b );
if( !val )
{
( *in_both_cb )( (void*)a, userData );
a += elementSize;
b += elementSize;
}
else if( val < 0 )
{
( *in_a_cb )( (void*)a, userData );
a += elementSize;
}
else if( val > 0 )
{
( *in_b_cb )( (void*)b, userData );
b += elementSize;
}
}
}
}
static void
sendPex( tr_peermsgs * msgs )
{

55
libtransmission/utils.c
View File

@ -359,61 +359,6 @@ tr_memdup( const void * src, size_t byteCount )
****
***/
void
tr_set_compare( const void * va, size_t aCount,
const void * vb, size_t bCount,
int compare( const void * a, const void * b ),
size_t elementSize,
tr_set_func in_a_cb,
tr_set_func in_b_cb,
tr_set_func in_both_cb,
void * userData )
{
const uint8_t * a = va;
const uint8_t * b = vb;
const uint8_t * aend = a + elementSize * aCount;
const uint8_t * bend = b + elementSize * bCount;
while( a != aend || b != bend )
{
if( a == aend )
{
( *in_b_cb )( (void*)b, userData );
b += elementSize;
}
else if( b == bend )
{
( *in_a_cb )( (void*)a, userData );
a += elementSize;
}
else
{
const int val = ( *compare )( a, b );
if( !val )
{
( *in_both_cb )( (void*)a, userData );
a += elementSize;
b += elementSize;
}
else if( val < 0 )
{
( *in_a_cb )( (void*)a, userData );
a += elementSize;
}
else if( val > 0 )
{
( *in_b_cb )( (void*)b, userData );
b += elementSize;
}
}
}
}
/***
****
***/
const char*
tr_strip_positional_args( const char* str )
{

22
libtransmission/utils.h
View File

@ -404,28 +404,6 @@ char* tr_strsep( char ** str, const char * delim );
typedef void ( tr_set_func )( void * element, void * userData );
/**
* @brief find the differences and commonalities in two sorted sets
* @param a the first set
* @param aCount the number of elements in the set 'a'
* @param b the second set
* @param bCount the number of elements in the set 'b'
* @param compare the sorting method for both sets
* @param elementSize the sizeof the element in the two sorted sets
* @param in_a called for items in set 'a' but not set 'b'
* @param in_b called for items in set 'b' but not set 'a'
* @param in_both called for items that are in both sets
* @param userData user data passed along to in_a, in_b, and in_both
*/
void tr_set_compare( const void * a, size_t aCount,
const void * b, size_t bCount,
int compare( const void * a, const void * b ),
size_t elementSize,
tr_set_func in_a_cb,
tr_set_func in_b_cb,
tr_set_func in_both_cb,
void * userData );
int compareInt( const void * va, const void * vb );
void tr_sha1_to_hex( char * out, const uint8_t * sha1 ) TR_GNUC_NONNULL(1,2);