Changeset 13300
- Timestamp:
- May 17, 2012, 5:40:31 PM (9 years ago)
- Location:
- trunk/libtransmission
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/announcer-http.c
r13191 r13300 51 51 } 52 52 53 static struct evbuffer*53 static char* 54 54 announce_url_new( const tr_session * session, const tr_announce_request * req ) 55 55 { … … 117 117 } 118 118 119 return buf;119 return evbuffer_free_to_str( buf ); 120 120 } 121 121 … … 288 288 { 289 289 struct announce_data * d; 290 struct evbuffer * buf = announce_url_new( session, request ); 291 const char * url = (const char *) evbuffer_pullup( buf, -1 ); 290 char * url = announce_url_new( session, request ); 292 291 293 292 d = tr_new0( struct announce_data, 1 ); … … 303 302 tr_webRun( session, url, NULL, NULL, on_announce_done, d ); 304 303 305 evbuffer_free( buf);304 tr_free( url ); 306 305 } 307 306 … … 430 429 } 431 430 432 static struct evbuffer *431 static char * 433 432 scrape_url_new( const tr_scrape_request * req ) 434 433 { … … 447 446 } 448 447 449 return buf;448 return evbuffer_free_to_str( buf ); 450 449 } 451 450 … … 458 457 int i; 459 458 struct scrape_data * d; 460 struct evbuffer * buf = scrape_url_new( request ); 461 const char * url = (const char *) evbuffer_pullup( buf, -1 ); 459 char * url = scrape_url_new( request ); 462 460 463 461 d = tr_new0( struct scrape_data, 1 ); … … 478 476 tr_webRun( session, url, NULL, NULL, on_scrape_done, d ); 479 477 480 evbuffer_free( buf);481 } 478 tr_free( url ); 479 } -
trunk/libtransmission/announcer.c
r13155 r13300 754 754 int i; 755 755 char name[128]; 756 char * message; 756 757 struct evbuffer * buf = evbuffer_new( ); 757 758 … … 764 765 } 765 766 766 tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", evbuffer_pullup( buf, -1 ) ); 767 evbuffer_free( buf ); 767 message = evbuffer_free_to_str( buf ); 768 tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", message ); 769 tr_free( message ); 768 770 } 769 771 } -
trunk/libtransmission/peer-msgs.c
r13154 r13300 240 240 struct evbuffer * buf = evbuffer_new( ); 241 241 char * base = tr_basename( file ); 242 char * message; 242 243 243 244 evbuffer_add_printf( buf, "[%s] %s - %s [%s]: ", … … 250 251 va_end( args ); 251 252 evbuffer_add_printf( buf, " (%s:%d)\n", base, line ); 252 fputs( (const char*)evbuffer_pullup( buf, -1 ), fp ); 253 254 message = evbuffer_free_to_str( buf ); 255 fputs( message, fp ); 253 256 254 257 tr_free( base ); 255 evbuffer_free( buf);258 tr_free( message ); 256 259 } 257 260 } -
trunk/libtransmission/utils.c
r13191 r13300 232 232 struct evbuffer * buf = evbuffer_new( ); 233 233 char * base = tr_basename( file ); 234 char * message; 235 const char * str; 234 236 235 237 evbuffer_add_printf( buf, "[%s] ", … … 242 244 evbuffer_add_printf( buf, " (%s:%d)\n", base, line ); 243 245 /* FIXME(libevent2) ifdef this out for nonwindows platforms */ 244 OutputDebugString( evbuffer_pullup( buf, -1 ) ); 246 message = evbuffer_free_to_str( buf ); 247 OutputDebugString( message ); 245 248 if( fp ) 246 fputs( (const char*)evbuffer_pullup( buf, -1 ), fp ); 247 249 fputs( message, fp ); 250 251 tr_free( message ); 248 252 tr_free( base ); 249 evbuffer_free( buf );250 253 } 251 254 }
Note: See TracChangeset
for help on using the changeset viewer.