Changeset 12390

Timestamp:

Apr 27, 2011, 8:52:07 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) heap pruning: using the same mechanism as in r12388, avoid an unnecessary malloc+memcpy+free when building the URL for a webseed download request

File:

• trunk/libtransmission/webseed.c (modified) (3 diffs)

trunk/libtransmission/webseed.c

@@ -245 +245 @@
 }
 
-static char*
+static struct evbuffer *
 make_url( tr_webseed * w, const tr_file * file )
 {
-    struct evbuffer * out = evbuffer_new( );
-
-    evbuffer_add( out, w->base_url, w->base_url_len );
+    struct evbuffer * buf = evbuffer_new( );
+
+    evbuffer_add( buf, w->base_url, w->base_url_len );
 
     /* if url ends with a '/', add the torrent name */
     if( w->base_url[w->base_url_len - 1] == '/' && file->name )
-        tr_http_escape( out, file->name, strlen(file->name), false );
-
-    return evbuffer_free_to_str( out );
+        tr_http_escape( buf, file->name, strlen(file->name), false );
+
+    return buf;
 }
 
@@ -265 +265 @@
     if( tor != NULL )
     {
-        char * url;
         char range[64];
+        struct evbuffer * url;
 
         const tr_info * inf = tr_torrentInfo( tor );
@@ -291 +291 @@
         tr_snprintf( range, sizeof range, "%"PRIu64"-%"PRIu64,
                      file_offset, file_offset + this_pass - 1 );
-        tr_webRunWithBuffer( t->session, url, range, NULL,
-                             web_response_func, t, t->content );
-        tr_free( url );
+        tr_webRunWithBuffer( t->session, (char *) evbuffer_pullup( url, -1 ),
+                             range, NULL, web_response_func, t, t->content );
+        evbuffer_free( url );
     }
 }