Index: /trunk/libtransmission/utils.c =================================================================== --- /trunk/libtransmission/utils.c (revision 13191) +++ /trunk/libtransmission/utils.c (revision 13300) @@ -232,4 +232,6 @@ struct evbuffer * buf = evbuffer_new( ); char * base = tr_basename( file ); + char * message; + const char * str; evbuffer_add_printf( buf, "[%s] ", @@ -242,10 +244,11 @@ evbuffer_add_printf( buf, " (%s:%d)\n", base, line ); /* FIXME(libevent2) ifdef this out for nonwindows platforms */ - OutputDebugString( evbuffer_pullup( buf, -1 ) ); + message = evbuffer_free_to_str( buf ); + OutputDebugString( message ); if( fp ) - fputs( (const char*)evbuffer_pullup( buf, -1 ), fp ); - + fputs( message, fp ); + + tr_free( message ); tr_free( base ); - evbuffer_free( buf ); } } Index: /trunk/libtransmission/peer-msgs.c =================================================================== --- /trunk/libtransmission/peer-msgs.c (revision 13154) +++ /trunk/libtransmission/peer-msgs.c (revision 13300) @@ -240,4 +240,5 @@ struct evbuffer * buf = evbuffer_new( ); char * base = tr_basename( file ); + char * message; evbuffer_add_printf( buf, "[%s] %s - %s [%s]: ", @@ -250,8 +251,10 @@ va_end( args ); evbuffer_add_printf( buf, " (%s:%d)\n", base, line ); - fputs( (const char*)evbuffer_pullup( buf, -1 ), fp ); + + message = evbuffer_free_to_str( buf ); + fputs( message, fp ); tr_free( base ); - evbuffer_free( buf ); + tr_free( message ); } } Index: /trunk/libtransmission/announcer.c =================================================================== --- /trunk/libtransmission/announcer.c (revision 13155) +++ /trunk/libtransmission/announcer.c (revision 13300) @@ -754,4 +754,5 @@ int i; char name[128]; + char * message; struct evbuffer * buf = evbuffer_new( ); @@ -764,6 +765,7 @@ } - tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", evbuffer_pullup( buf, -1 ) ); - evbuffer_free( buf ); + message = evbuffer_free_to_str( buf ); + tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", message ); + tr_free( message ); } } Index: /trunk/libtransmission/announcer-http.c =================================================================== --- /trunk/libtransmission/announcer-http.c (revision 13191) +++ /trunk/libtransmission/announcer-http.c (revision 13300) @@ -51,5 +51,5 @@ } -static struct evbuffer * +static char* announce_url_new( const tr_session * session, const tr_announce_request * req ) { @@ -117,5 +117,5 @@ } - return buf; + return evbuffer_free_to_str( buf ); } @@ -288,6 +288,5 @@ { struct announce_data * d; - struct evbuffer * buf = announce_url_new( session, request ); - const char * url = (const char *) evbuffer_pullup( buf, -1 ); + char * url = announce_url_new( session, request ); d = tr_new0( struct announce_data, 1 ); @@ -303,5 +302,5 @@ tr_webRun( session, url, NULL, NULL, on_announce_done, d ); - evbuffer_free( buf ); + tr_free( url ); } @@ -430,5 +429,5 @@ } -static struct evbuffer * +static char * scrape_url_new( const tr_scrape_request * req ) { @@ -447,5 +446,5 @@ } - return buf; + return evbuffer_free_to_str( buf ); } @@ -458,6 +457,5 @@ int i; struct scrape_data * d; - struct evbuffer * buf = scrape_url_new( request ); - const char * url = (const char *) evbuffer_pullup( buf, -1 ); + char * url = scrape_url_new( request ); d = tr_new0( struct scrape_data, 1 ); @@ -478,4 +476,4 @@ tr_webRun( session, url, NULL, NULL, on_scrape_done, d ); - evbuffer_free( buf ); -} + tr_free( url ); +}