Changeset 12391

Timestamp:

Apr 27, 2011, 9:22:08 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) tweak the ABI of tr_bencToBuf() to match the way it's being used

Location:

trunk/libtransmission

Files:

• announcer-http.c (modified) (1 diff)
• bencode-test.c (modified) (1 diff)
• bencode.c (modified) (3 diffs)
• bencode.h (modified) (1 diff)
• rpc-server.c (modified) (1 diff)
• rpcimpl.c (modified) (6 diffs)

trunk/libtransmission/announcer-http.c

@@ -212 +212 @@
         if( getenv( "TR_CURL_VERBOSE" ) != NULL )
         {
-            struct evbuffer * buf = evbuffer_new( );
-            tr_bencToBuf( &benc, TR_FMT_JSON, buf );
+            struct evbuffer * buf = tr_bencToBuf( &benc, TR_FMT_JSON );
             fprintf( stderr, "Announce response:\n< %s\n", evbuffer_pullup( buf, -1 ) );
             tr_free( buf );

trunk/libtransmission/bencode-test.c

@@ -324 +324 @@
 
     tr_bencLoad( benc_str, strlen( benc_str ), &top, NULL );
-    tr_bencToBuf( &top, TR_FMT_JSON, buf );
+    buf = tr_bencToBuf( &top, TR_FMT_JSON );
     serialized = (char*) evbuffer_pullup( buf, -1 );
     stripWhitespace( serialized );

trunk/libtransmission/bencode.c

@@ -1607 +1607 @@
 ***/
 
-void
-tr_bencToBuf( const tr_benc * top, tr_fmt_mode mode, struct evbuffer * buf )
-{
-    evbuffer_drain( buf, evbuffer_get_length( buf ) );
+struct evbuffer *
+tr_bencToBuf( const tr_benc * top, tr_fmt_mode mode )
+{
+    struct evbuffer * buf = evbuffer_new( );
+
     evbuffer_expand( buf, 4096 ); /* alloc a little memory to start off with */
 
@@ -1631 +1632 @@
         }
     }
+
+    return buf;
 }
 
@@ -1636 +1639 @@
 tr_bencToStr( const tr_benc * top, tr_fmt_mode mode, int * len )
 {
-    char * ret;
-    struct evbuffer * buf = evbuffer_new( );
-    size_t n;
-    tr_bencToBuf( top, mode, buf );
-    n = evbuffer_get_length( buf );
-    ret = evbuffer_free_to_str( buf );
+    struct evbuffer * buf = tr_bencToBuf( top, mode );
+    const size_t n = evbuffer_get_length( buf );
+    char * ret = evbuffer_free_to_str( buf );
     if( len != NULL )
         *len = (int) n;

trunk/libtransmission/bencode.h

@@ -126 +126 @@
 char* tr_bencToStr( const tr_benc *, tr_fmt_mode, int * len );
 
-void tr_bencToBuf( const tr_benc *, tr_fmt_mode, struct evbuffer * );
+struct evbuffer * tr_bencToBuf( const tr_benc *, tr_fmt_mode );
 
 /* TR_FMT_JSON_LEAN and TR_FMT_JSON are equivalent in this function. */

trunk/libtransmission/rpc-server.c

@@ -271 +271 @@
             if( have_source )
             {
-                struct evbuffer * json = evbuffer_new( );
-                tr_bencToBuf( &top, TR_FMT_JSON, json );
+                struct evbuffer * json = tr_bencToBuf( &top, TR_FMT_JSON );
                 tr_rpc_request_exec_json( server->session,
                                           evbuffer_pullup( json, -1 ),

trunk/libtransmission/rpcimpl.c

@@ -95 +95 @@
 tr_idle_function_done( struct tr_rpc_idle_data * data, const char * result )
 {
-    struct evbuffer * buf = evbuffer_new( );
+    struct evbuffer * buf;
 
     if( result == NULL )
@@ -101 +101 @@
     tr_bencDictAddStr( data->response, "result", result );
 
-    tr_bencToBuf( data->response, TR_FMT_JSON_LEAN, buf );
+    buf = tr_bencToBuf( data->response, TR_FMT_JSON_LEAN );
     (*data->callback)( data->session, buf, data->callback_user_data );
-
     evbuffer_free( buf );
+
     tr_bencFree( data->response );
     tr_free( data->response );
@@ -1716 +1716 @@
         int64_t tag;
         tr_benc response;
-        struct evbuffer * buf = evbuffer_new( );
+        struct evbuffer * buf;
 
         tr_bencInitDict( &response, 3 );
@@ -1723 +1723 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencToBuf( &response, TR_FMT_JSON_LEAN, buf );
+
+        buf = tr_bencToBuf( &response, TR_FMT_JSON_LEAN );
         (*callback)( session, buf, callback_user_data );
-
         evbuffer_free( buf );
+
         tr_bencFree( &response );
     }
@@ -1734 +1735 @@
         tr_benc response;
         tr_benc * args_out;
-        struct evbuffer * buf = evbuffer_new( );
+        struct evbuffer * buf;
 
         tr_bencInitDict( &response, 3 );
@@ -1744 +1745 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencToBuf( &response, TR_FMT_JSON_LEAN, buf );
+
+        buf = tr_bencToBuf( &response, TR_FMT_JSON_LEAN );
         (*callback)( session, buf, callback_user_data );
-
         evbuffer_free( buf );
+
         tr_bencFree( &response );
     }