Changeset 7552 for trunk/libtransmission/bencode.c

Timestamp:

Dec 30, 2008, 10:07:39 PM (12 years ago)

Author:

charles

Message:

(trunk libT) have tr_bencSaveAsJSON() use an evbuffer

File:

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

trunk/libtransmission/bencode.c

@@ -1312 +1312 @@
 
 char*
-tr_bencSaveAsJSON( const tr_benc * top,
-                   int *           len )
-{
-    char *           ret;
+tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out )
+{
     struct WalkFuncs walkFuncs;
     struct jsonWalk  data;
 
-    data.out = tr_getBuffer( );
+    evbuffer_drain( out, EVBUFFER_LENGTH( out ) );
+
+    data.out = out;
     data.parents = NULL;
 
@@ -1330 +1330 @@
     bencWalk( top, &walkFuncs, &data );
 
-    if( EVBUFFER_LENGTH( data.out ) )
-        evbuffer_add_printf( data.out, "\n" );
-    if( len )
-        *len = EVBUFFER_LENGTH( data.out );
-    ret = tr_strndup( EVBUFFER_DATA( data.out ), EVBUFFER_LENGTH( data.out ) );
-
-    tr_releaseBuffer( data.out );
-    return ret;
+    if( EVBUFFER_LENGTH( out ) )
+        evbuffer_add_printf( out, "\n" );
+
+    return (char*) EVBUFFER_DATA( out );
 }
 
@@ -1466 +1462 @@
                      const tr_benc * b )
 {
-    int       len;
-    char *    content = tr_bencSaveAsJSON( b, &len );
-    const int err = saveFile( filename, content, len );
-
-    tr_free( content );
+    struct evbuffer * buf = tr_getBuffer( );
+    const char * json = tr_bencSaveAsJSON( b, buf );
+    const int err = saveFile( filename, json, EVBUFFER_LENGTH( buf ) );
+    tr_releaseBuffer( buf );
     return err;
 }