Changeset 13300 for trunk/libtransmission/announcer-http.c

Timestamp:

May 17, 2012, 5:40:31 PM (9 years ago)

Author:

jordan

Message:

(trunk libT) #4894 -- don't use evbuffer_add_printf() and evbuffer_pullup() together.

File:

• trunk/libtransmission/announcer-http.c (modified) (8 diffs)

trunk/libtransmission/announcer-http.c

@@ -51 +51 @@
 }
 
-static struct evbuffer *
+static char*
 announce_url_new( const tr_session * session, const tr_announce_request * req )
 {
@@ -117 +117 @@
     }
 
-    return buf;
+    return evbuffer_free_to_str( buf );
 }
 
@@ -288 +288 @@
 {
     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 +302 @@
     tr_webRun( session, url, NULL, NULL, on_announce_done, d );
 
-    evbuffer_free( buf );
+    tr_free( url );
 }
 
@@ -430 +429 @@
 }
 
-static struct evbuffer *
+static char *
 scrape_url_new( const tr_scrape_request * req )
 {
@@ -447 +446 @@
     }
 
-    return buf;
+    return evbuffer_free_to_str( buf );
 }
 
@@ -458 +457 @@
     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 +476 @@
     tr_webRun( session, url, NULL, NULL, on_scrape_done, d );
 
-    evbuffer_free( buf );
-}
+    tr_free( url );
+}