Changeset 13300

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.

Location:

trunk/libtransmission

Files:

• announcer-http.c (modified) (8 diffs)
• announcer.c (modified) (2 diffs)
• peer-msgs.c (modified) (2 diffs)
• utils.c (modified) (2 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 );
+}

trunk/libtransmission/announcer.c

@@ -754 +754 @@
         int i;
         char name[128];
+        char * message;
         struct evbuffer * buf = evbuffer_new( );
 
@@ -764 +765 @@
         }
 
-        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 );
     }
 }

trunk/libtransmission/peer-msgs.c

@@ -240 +240 @@
         struct evbuffer * buf = evbuffer_new( );
         char *            base = tr_basename( file );
+        char *            message;
 
         evbuffer_add_printf( buf, "[%s] %s - %s [%s]: ",
@@ -250 +251 @@
         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 );
     }
 }

trunk/libtransmission/utils.c

@@ -232 +232 @@
         struct evbuffer * buf = evbuffer_new( );
         char *            base = tr_basename( file );
+        char *            message;
+        const char      * str;
 
         evbuffer_add_printf( buf, "[%s] ",
@@ -242 +244 @@
         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 );
     }
 }