From 6681107c00886f584b95c86e7bc2808be0723c57 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 4 Jan 2009 17:46:27 +0000 Subject: [PATCH] (trunk libT) remove a small memory leak in the request-list unit test s.t. valgrind will be happy --- libtransmission/request-list-test.c | 1 + libtransmission/request-list.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libtransmission/request-list-test.c b/libtransmission/request-list-test.c index 5d3f854a7..2dd972105 100644 --- a/libtransmission/request-list-test.c +++ b/libtransmission/request-list-test.c @@ -105,6 +105,7 @@ testFoo( void ) check( !reqListHas( &list, &b ) ); check( !reqListHas( &list, &c ) ); + reqListClear( &list ); return 0; } diff --git a/libtransmission/request-list.c b/libtransmission/request-list.c index a18030f76..5aee6f49e 100644 --- a/libtransmission/request-list.c +++ b/libtransmission/request-list.c @@ -16,11 +16,9 @@ #include "utils.h" static int -compareRequests( const void * va, const void * vb ) +compareRequests( const struct peer_request * a, + const struct peer_request * b ) { - const struct peer_request * a = va; - const struct peer_request * b = vb; - if( a->index != b->index ) return a->index < b->index ? -1 : 1; @@ -62,6 +60,8 @@ reqListCopy( struct request_list * dest, const struct request_list * src ) dest->sort = tr_memdup( src->sort, dest->len * sizeof( struct peer_request ) ); } +typedef int (*compareFunc)(const void * a, const void * b ); + static int reqListSortPos( const struct request_list * list, const struct peer_request * req, @@ -71,7 +71,7 @@ reqListSortPos( const struct request_list * list, list->sort, list->len, sizeof( struct peer_request ), - compareRequests, + (compareFunc)compareRequests, exactMatch ); }