Changeset 8588

Timestamp:

Jun 2, 2009, 1:48:48 AM (13 years ago)

Author:

charles

Message:

(trunk) #2131: clean up benc read/write API

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• gtk/conf.c (modified) (1 diff)
• gtk/tr-core.c (modified) (1 diff)
• libtransmission/bencode-test.c (modified) (8 diffs)
• libtransmission/bencode.c (modified) (9 diffs)
• libtransmission/bencode.h (modified) (2 diffs)
• libtransmission/json-test.c (modified) (3 diffs)
• libtransmission/makemeta.c (modified) (1 diff)
• libtransmission/metainfo.c (modified) (1 diff)
• libtransmission/peer-msgs.c (modified) (2 diffs)
• libtransmission/resume.c (modified) (2 diffs)
• libtransmission/rpc-server.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (5 diffs)
• libtransmission/session.c (modified) (3 diffs)
• libtransmission/stats.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/tr-dht.c (modified) (2 diffs)
• qt/prefs.cc (modified) (1 diff)
• qt/session.cc (modified) (1 diff)
• third-party/dht/dht.c (modified) (1 diff)

trunk/daemon/daemon.c

@@ -299 +299 @@
     if( dumpSettings )
     {
-        struct evbuffer * buf = tr_getBuffer( );
-
-        tr_bencSaveAsJSON( &settings, buf, TRUE );
-        fprintf( stderr, "%s", (char*)EVBUFFER_DATA(buf) );
-
-        tr_releaseBuffer( buf );
+        char * str = tr_bencToStr( &settings, TR_FMT_JSON, NULL );
+        fprintf( stderr, "%s", str );
+        tr_free( str );
         return 0;
     }

trunk/daemon/remote.c

@@ -633 +633 @@
         if( addArg )
         {
-            struct evbuffer * buf = tr_getBuffer( );
-            reqs[reqCount++] = tr_strdup( tr_bencSaveAsJSON( &top, buf, FALSE ) );
-            tr_releaseBuffer( buf );
+            reqs[reqCount++] = tr_bencToStr( &top, TR_FMT_JSON_LEAN, NULL );
         }
 

trunk/gtk/conf.c

@@ -429 +429 @@
 
     g_key_file_free( keyfile );
-    tr_bencSaveJSONFile( new_file, &dict );
+    tr_bencToFile( &dict, TR_FMT_JSON, new_file );
     tr_bencFree( &dict );
 }

trunk/gtk/tr-core.c

@@ -1445 +1445 @@
 tr_core_exec( TrCore * core, const tr_benc * top )
 {
-    char * json = tr_bencToJSON( top, FALSE );
+    char * json = tr_bencToStr( top, TR_FMT_JSON_LEAN, NULL );
     tr_core_exec_json( core, json );
     tr_free( json );

trunk/libtransmission/bencode-test.c

@@ -174 +174 @@
 #endif
         check( end == (const uint8_t*)str + len );
-        saved = tr_bencSave( &val, &savedLen );
+        saved = tr_bencToStr( &val, TR_FMT_BENC, &savedLen );
         check( !strcmp( saved, str ) );
         check( len == (size_t)savedLen );
@@ -215 +215 @@
     check( tr_bencGetInt( &val.val.l.vals[2], &i ) );
     check( i == 16 );
-    saved = tr_bencSave( &val, &len );
+    saved = tr_bencToStr( &val, TR_FMT_BENC, &len );
     check( !strcmp( saved, (char*)buf ) );
     tr_free( saved );
@@ -231 +231 @@
     check( !err );
     check( end == buf + 2 );
-    saved = tr_bencSave( &val, &len );
+    saved = tr_bencToStr( &val, TR_FMT_BENC, &len );
     check( !strcmp( saved, "le" ) );
     tr_free( saved );
@@ -274 +274 @@
     check( ( child = tr_bencListChild( &val, 0 ) ) );
     check( ( child2 = tr_bencListChild( child, 0 ) ) );
-    saved = tr_bencSave( &val, &len );
+    saved = tr_bencToStr( &val, TR_FMT_BENC, &len );
     check( !strcmp( saved, "lld1:ai64e1:bi32eeee" ) );
     tr_free( saved );
@@ -285 +285 @@
     check( !err );
     check( end == buf + 2 );
-    saved = tr_bencSave( &val, &len );
+    saved = tr_bencToStr( &val, TR_FMT_BENC, &len );
     check( !strcmp( saved, "le" ) );
     tr_free( saved );
@@ -325 +325 @@
 
     tr_bencLoad( benc_str, strlen( benc_str ), &top, NULL );
-    serialized = tr_bencSaveAsJSON( &top, buf, TRUE );
+    tr_bencToBuf( &top, TR_FMT_JSON, buf );
+    serialized = (char*) EVBUFFER_DATA( buf );
     stripWhitespace( serialized );
 #if 0
@@ -444 +445 @@
     check( !err );
     check( end == in + ( depth * 2 ) );
-    saved = tr_bencSave( &val, &len );
+    saved = tr_bencToStr( &val, TR_FMT_BENC, &len );
     check( !strcmp( saved, (char*)in ) );
     tr_free( in );
@@ -505 +506 @@
     tr_bencDictAddStr( &top, "this-is-a-string", "this-is-a-string" );
 
-    benc = tr_bencSave( &top, &len );
+    benc = tr_bencToStr( &top, TR_FMT_BENC, &len );
     check( !strcmp( benc, "d14:this-is-a-booli1e14:this-is-a-real8:0.50000016:this-is-a-string16:this-is-a-string14:this-is-an-inti1234ee" ) )
     check( !tr_bencParse( benc, benc+len, &top2, &end ) )

trunk/libtransmission/bencode.c

@@ -18 +18 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h> /* close() */
 
 #include <locale.h>
@@ -1135 +1136 @@
                                             saveContainerEndFunc };
 
-char*
-tr_bencSave( const tr_benc * top,
-             int *           len )
-{
-    char * ret;
-    struct evbuffer * out = tr_getBuffer( );
-
-    bencWalk( top, &saveFuncs, out );
-
-    if( len )
-        *len = EVBUFFER_LENGTH( out );
-    ret = tr_strndup( EVBUFFER_DATA( out ), EVBUFFER_LENGTH( out ) );
-
-    tr_releaseBuffer( out );
-    return ret;
-}
-
 /***
 ****
@@ -1241 +1225 @@
                 if( !( i % 2 ) )
                     evbuffer_add( data->out, ": ", data->doIndent ? 2 : 1 );
-                else
-                {
+                else {
+                    const tr_bool isLast = parentState->childIndex == parentState->childCount;
+                    if( !isLast ) {
+                        evbuffer_add( data->out, ", ", data->doIndent ? 2 : 1 );
+                        jsonIndent( data );
+                    }
+                }
+                break;
+            }
+
+            case TR_TYPE_LIST:
+            {
+                const tr_bool isLast = ++parentState->childIndex == parentState->childCount;
+                if( !isLast ) {
                     evbuffer_add( data->out, ", ", data->doIndent ? 2 : 1 );
                     jsonIndent( data );
                 }
-                break;
-            }
-
-            case TR_TYPE_LIST:
-            {
-                ++parentState->childIndex;
-                evbuffer_add( data->out, ", ", data->doIndent ? 2 : 1 );
-                jsonIndent( data );
                 break;
             }
@@ -1396 +1384 @@
                       void *          vdata )
 {
-    size_t            i;
     struct jsonWalk * data = vdata;
-    char *            str;
     int               emptyContainer = FALSE;
-
-    /* trim out the trailing comma, if any */
-    str = (char*) EVBUFFER_DATA( data->out );
-    for( i = EVBUFFER_LENGTH( data->out ) - 1; i > 0; --i )
-    {
-        if( isspace( str[i] ) ) continue;
-        if( str[i] == ',' )
-            EVBUFFER_LENGTH( data->out ) = i;
-        if( str[i] == '{' || str[i] == '[' )
-            emptyContainer = TRUE;
-        break;
-    }
 
     jsonPopParent( data );
@@ -1430 +1404 @@
                                                 jsonListBeginFunc,
                                                 jsonContainerEndFunc };
-
-static void
-tr_bencSaveAsJSONImpl( const tr_benc * top, struct evbuffer * out, tr_bool doIndent )
-{
-    struct jsonWalk data;
-
-    evbuffer_drain( out, EVBUFFER_LENGTH( out ) );
-
-    data.doIndent = doIndent;
-    data.out = out;
-    data.parents = NULL;
-
-    bencWalk( top, &jsonWalkFuncs, &data );
-
-    if( EVBUFFER_LENGTH( out ) )
-        evbuffer_add_printf( out, "\n" );
-}
-
-char*
-tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent )
-{
-    tr_bencSaveAsJSONImpl( top, out, doIndent );
-    return (char*) EVBUFFER_DATA( out );
-}
-
-char*
-tr_bencToJSON( const tr_benc * top, tr_bool doIndent )
-{
-    char * ret;
-    struct evbuffer * buf = evbuffer_new( );
-    tr_bencSaveAsJSON( top, buf, doIndent );
-    ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
-    evbuffer_free( buf );
-    return ret;
-}
 
 /***
@@ -1552 +1491 @@
 }
 
-/*** 
-**** 
-***/ 
-
-static int
-saveFile( const char * filename, struct evbuffer * buf )
+/***
+****
+***/
+
+void
+tr_bencToBuf( const tr_benc * top, tr_fmt_mode mode, struct evbuffer * buf )
+{
+    evbuffer_drain( buf, EVBUFFER_LENGTH( buf ) );
+
+    switch( mode )
+    {
+        case TR_FMT_BENC:
+            bencWalk( top, &saveFuncs, buf );
+            break;
+
+        case TR_FMT_JSON:
+        case TR_FMT_JSON_LEAN: {
+            struct jsonWalk data;
+            data.doIndent = mode==TR_FMT_JSON;
+            data.out = buf;
+            data.parents = NULL;
+            bencWalk( top, &jsonWalkFuncs, &data );
+            if( EVBUFFER_LENGTH( buf ) )
+                evbuffer_add_printf( buf, "\n" );
+            break;
+        }
+    }
+}
+
+char*
+tr_bencToStr( const tr_benc * top, tr_fmt_mode mode, int * len )
+{
+    char * ret;
+    struct evbuffer * buf = evbuffer_new( );
+    tr_bencToBuf( top, mode, buf );
+    ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+    if( len != NULL )
+        *len = (int) EVBUFFER_LENGTH( buf );
+    evbuffer_free( buf );
+    return ret;
+}
+
+int
+tr_bencToFile( const tr_benc * top, tr_fmt_mode mode, const char * filename )
 {
     int err = 0;
@@ -1568 +1545 @@
                 filename, tr_strerror( errno ) );
     }
-    else if( evbuffer_write( buf, fd ) == -1 )
-    {
-        err = errno;
-        tr_err( _( "Couldn't save file \"%1$s\": %2$s" ),
-               filename, tr_strerror( errno ) );
-    }
-
-    if( !err )
-        tr_dbg( "tr_bencSaveFile saved \"%s\"", filename );
-    if( fd >= 0 )
+    else
+    {
+        struct evbuffer * buf = evbuffer_new( );
+        tr_bencToBuf( top, mode, buf );
+        if( evbuffer_write( buf, fd ) == -1 )
+        {
+            err = errno;
+            tr_err( _( "Couldn't save file \"%1$s\": %2$s" ),
+                   filename, tr_strerror( errno ) );
+        }
+
+        if( !err )
+            tr_dbg( "tr_bencToFile saved \"%s\"", filename );
         close( fd );
-
-    return err;
-}
-
-int
-tr_bencSaveFile( const char * filename, const tr_benc * top )
-{
-    int err;
-    struct evbuffer * buf = evbuffer_new( );
-    bencWalk( top, &saveFuncs, buf );
-    err = saveFile( filename, buf );
-    evbuffer_free( buf );
-    return err;
-}
-
-int
-tr_bencSaveJSONFile( const char * filename, const tr_benc * top )
-{
-    int err;
-    struct evbuffer * buf = evbuffer_new( );
-    tr_bencSaveAsJSONImpl( top, buf, TRUE );
-    err = saveFile( filename, buf );
-    evbuffer_free( buf );
+    }
+
     return err;
 }
@@ -1610 +1569 @@
 
 int
-tr_bencLoadFile( const char * filename, tr_benc * b )
-{
-    int       err;
-    size_t    contentLen;
+tr_bencLoadFile( tr_benc * setme, tr_fmt_mode mode, const char * filename )
+{
+    int err;
+    size_t contentLen;
     uint8_t * content;
 
@@ -1621 +1580 @@
     else if( !content )
         err = ENODATA;
-    else
-        err = tr_bencLoad( content, contentLen, b, NULL );
+    else {
+        if( mode == TR_FMT_BENC )
+            err = tr_bencLoad( content, contentLen, setme, NULL );
+        else
+            err = tr_jsonParse( filename, content, contentLen, setme, NULL );
+    }
 
     tr_free( content );
     return err;
 }
-
-int
-tr_bencLoadJSONFile( const char * filename, tr_benc * b )
-{
-    int        err;
-    size_t     contentLen;
-    uint8_t  * content;
-
-    content = tr_loadFile( filename, &contentLen );
-    if( !content && errno )
-        err = errno;
-    else if( !content )
-        err = ENODATA;
-    else
-        err = tr_jsonParse( filename, content, contentLen, b, NULL );
-
-    tr_free( content );
-    return err;
-}

trunk/libtransmission/bencode.h

@@ -92 +92 @@
                        char        ** setme_end );
 
-int       tr_bencLoadFile( const char * filename, tr_benc * setme );
-
-int       tr_bencLoadJSONFile( const char * filename, tr_benc * setme );
-
 void      tr_bencFree( tr_benc * );
 
-char*     tr_bencSave( const tr_benc * val, int * len );
-
-char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent );
-
-char*     tr_bencToJSON( const tr_benc * top, tr_bool doIndent );
-
-int       tr_bencSaveFile( const char * filename, const tr_benc * );
-
-int       tr_bencSaveJSONFile( const char * filename, const tr_benc * );
-
 void      tr_bencInitStr( tr_benc *, const void * str, int str_len );
 
@@ -126 +112 @@
 ***/
 
-int       tr_bencListReserve( tr_benc *, size_t reserveCount );
+typedef enum
+{
+    TR_FMT_BENC,
+    TR_FMT_JSON,
+    TR_FMT_JSON_LEAN /* saves bandwidth by omitting all whitespace. */
+}
+tr_fmt_mode;
+
+int tr_bencToFile( const tr_benc *, tr_fmt_mode, const char * filename );
+
+char* tr_bencToStr( const tr_benc *, tr_fmt_mode, int * len );
+
+void  tr_bencToBuf( const tr_benc *, tr_fmt_mode, struct evbuffer * );
+
+/* TR_FMT_JSON_LEAN and TR_FMT_JSON are equivalent in this function. */
+int tr_bencLoadFile( tr_benc * setme, tr_fmt_mode, const char * filename );
+
+/***
+****
+***/
+
+int tr_bencListReserve( tr_benc *, size_t reserveCount );
 
 tr_benc * tr_bencListAdd( tr_benc * );

trunk/libtransmission/json-test.c

@@ -42 +42 @@
     char            * json;
     int               err;
-    struct evbuffer * buf = tr_getBuffer( );
 
     err = tr_jsonParse( NULL, in, strlen( in ), &top, NULL );
@@ -75 +74 @@
     check( tr_bencDictFindStr( &top, "key", &str ) );
     check( !strcmp( str, "Letöltések" ) );
-    json = tr_bencSaveAsJSON( &top, buf, TRUE );
+    json = tr_bencToStr( &top, TR_FMT_JSON, NULL );
     if( !err )
         tr_bencFree( &top );
@@ -90 +89 @@
     tr_free( json );
 
-    tr_releaseBuffer( buf );
     return 0;
 }

trunk/libtransmission/makemeta.c

@@ -418 +418 @@
     if( !builder->result && !builder->abortFlag )
     {
-        if( tr_bencSaveFile( builder->outputFile, &top ) )
+        if( tr_bencToFile( &top, TR_FMT_BENC, builder->outputFile ) )
         {
             builder->my_errno = errno;

trunk/libtransmission/metainfo.c

@@ -367 +367 @@
     else
     {
-        int    len;
-        char * bstr = tr_bencSave( beInfo, &len );
+        int len;
+        char * bstr = tr_bencToStr( beInfo, TR_FMT_BENC, &len );
         tr_sha1( inf->hash, bstr, len, NULL );
         tr_sha1_to_hex( inf->hashString, inf->hash );

trunk/libtransmission/peer-msgs.c

@@ -992 +992 @@
     if( pex )
         tr_bencDictAddInt( m, "ut_pex", TR_LTEP_PEX );
-    buf = tr_bencSave( &val, &len );
+    buf = tr_bencToStr( &val, TR_FMT_BENC, &len );
 
     tr_peerIoWriteUint32( msgs->peer->io, out, 2 * sizeof( uint8_t ) + len );
@@ -2067 +2067 @@
 
             /* write the pex message */
-            benc = tr_bencSave( &val, &bencLen );
+            benc = tr_bencToStr( &val, TR_FMT_BENC, &bencLen );
             tr_peerIoWriteUint32( io, out, 2 * sizeof( uint8_t ) + bencLen );
             tr_peerIoWriteUint8 ( io, out, BT_LTEP );

trunk/libtransmission/resume.c

@@ -513 +513 @@
 
     filename = getResumeFilename( tor );
-    tr_bencSaveFile( filename, &top );
+    tr_bencToFile( &top, TR_FMT_BENC, filename );
     tr_free( filename );
 
@@ -532 +532 @@
     filename = getResumeFilename( tor );
 
-    if( tr_bencLoadFile( filename, &top ) )
+    if( tr_bencLoadFile( &top, TR_FMT_BENC, filename ) )
     {
         tr_tordbg( tor, "Couldn't read \"%s\"; trying old format.",

trunk/libtransmission/rpc-server.c

@@ -254 +254 @@
                 tr_bencDictAddStr( args, "metainfo", b64 );
                 tr_bencDictAddBool( args, "paused", paused );
-                tr_bencSaveAsJSON( &top, json, FALSE );
+                tr_bencToBuf( &top, TR_FMT_JSON_LEAN, json );
                 tr_rpc_request_exec_json( server->session,
                                           EVBUFFER_DATA( json ),

trunk/libtransmission/rpcimpl.c

@@ -87 +87 @@
 tr_idle_function_done( struct tr_rpc_idle_data * data, const char * result )
 {
-    struct evbuffer * buf = tr_getBuffer( );
+    struct evbuffer * buf = evbuffer_new( );
 
     if( result == NULL )
@@ -93 +93 @@
     tr_bencDictAddStr( data->response, "result", result );
 
-    tr_bencSaveAsJSON( data->response, buf, FALSE );
+    tr_bencToBuf( data->response, TR_FMT_JSON_LEAN, buf );
     (*data->callback)( data->session, (const char*)EVBUFFER_DATA(buf),
                        EVBUFFER_LENGTH(buf), data->callback_user_data );
 
-    tr_releaseBuffer( buf );
+    evbuffer_free( buf );
     tr_bencFree( data->response );
     tr_free( data->response );
@@ -1333 +1333 @@
         int64_t tag;
         tr_benc response;
-        struct evbuffer * buf = tr_getBuffer( );
+        struct evbuffer * buf = evbuffer_new( );
 
         tr_bencInitDict( &response, 3 );
@@ -1340 +1340 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf, FALSE );
+        tr_bencToBuf( &response, TR_FMT_JSON_LEAN, buf );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH( buf ), callback_user_data );
 
-        tr_releaseBuffer( buf );
+        evbuffer_free( buf );
         tr_bencFree( &response );
     }
@@ -1362 +1362 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf, FALSE );
+        tr_bencToBuf( &response, TR_FMT_JSON_LEAN, buf );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH(buf), callback_user_data );

trunk/libtransmission/session.c

@@ -477 +477 @@
     /* file settings override the defaults */
     filename = tr_buildPath( configDir, "settings.json", NULL );
-    if( !tr_bencLoadJSONFile( filename, &fileSettings ) ) {
+    if( !tr_bencLoadFile( &fileSettings, TR_FMT_JSON, filename ) ) {
         tr_bencMergeDicts( d, &fileSettings );
         tr_bencFree( &fileSettings );
@@ -502 +502 @@
     {
         tr_benc fileSettings;
-        if( !tr_bencLoadJSONFile( filename, &fileSettings ) )
+        if( !tr_bencLoadFile( &fileSettings, TR_FMT_JSON, filename ) )
         {
             tr_bencMergeDicts( &settings, &fileSettings );
@@ -522 +522 @@
 
     /* save the result */
-    tr_bencSaveJSONFile( filename, &settings );
+    tr_bencToFile( &settings, TR_FMT_JSON, filename );
     tr_inf( "Saved \"%s\"", filename );
 

trunk/libtransmission/stats.c

@@ -52 +52 @@
 
     filename = getFilename( session );
-    loaded = !tr_bencLoadJSONFile( filename, &top );
+    loaded = !tr_bencLoadFile( &top, TR_FMT_JSON, filename );
     tr_free( filename );
 
@@ -58 +58 @@
     {
         filename = getOldFilename( session );
-        loaded = !tr_bencLoadFile( filename, &top );
+        loaded = !tr_bencLoadFile( &top, TR_FMT_BENC, filename );
         tr_free( filename );
     }
@@ -97 +97 @@
     filename = getFilename( session );
     tr_deepLog( __FILE__, __LINE__, NULL, "Saving stats to \"%s\"", filename );
-    tr_bencSaveJSONFile( filename, &top );
+    tr_bencToFile( &top, TR_FMT_JSON, filename );
 
     tr_free( filename );

trunk/libtransmission/torrent.c

@@ -661 +661 @@
         {
             const char * filename = tor->info.torrent;
-            tr_bencSaveFile( filename, val );
-            tr_sessionSetTorrentFile( tor->session, tor->info.hashString,
-                                      filename );
+            tr_bencToFile( val, TR_FMT_BENC, filename );
+            tr_sessionSetTorrentFile( tor->session, tor->info.hashString, filename );
         }
     }
@@ -1948 +1947 @@
 
     /* save to the .torrent file */
-    if( !tr_bencLoadFile( tor->info.torrent, &metainfo ) )
+    if( !tr_bencLoadFile( &metainfo, TR_FMT_BENC, tor->info.torrent ) )
     {
         int       i;
@@ -1986 +1985 @@
 
             tr_metainfoFree( &tmpInfo );
-            tr_bencSaveFile( tor->info.torrent, &metainfo );
+            tr_bencToFile( &metainfo, TR_FMT_BENC, tor->info.torrent );
         }
 

trunk/libtransmission/tr-dht.c

@@ -136 +136 @@
 
     dat_file = tr_buildPath( ss->configDir, "dht.dat", NULL );
-    rc = tr_bencLoadFile(dat_file, &benc);
+    rc = tr_bencLoadFile( &benc, TR_FMT_BENC, dat_file );
     tr_free( dat_file );
     if(rc == 0) {
@@ -216 +216 @@
         tr_bencDictAddRaw( &benc, "nodes", compact, j );
         dat_file = tr_buildPath( ss->configDir, "dht.dat", NULL );
-        tr_bencSaveFile( dat_file, &benc );
+        tr_bencToFile( &benc, TR_FMT_BENC, dat_file );
         tr_free( dat_file );
     }

trunk/qt/prefs.cc

@@ -219 +219 @@
 
     /* write back out the serialized preferences */
-    char * json = tr_bencToJSON( &top, TRUE );
-    if( json && *json ) {
-        file.open( QIODevice::WriteOnly | QIODevice::Text );
-        file.write( json );
-        file.close( );
-    }
-    tr_free( json );
+    tr_bencToFile( &top, TR_FMT_JSON, file.fileName().toUtf8().constData() );
     tr_bencFree( &top );
 }

trunk/qt/session.cc

@@ -533 +533 @@
 Session :: exec( const tr_benc * request )
 {
-    char * str( tr_bencToJSON( request, FALSE ) );
+    char * str = tr_bencToStr( request, TR_FMT_JSON_LEAN, NULL );
     exec( str );
     tr_free( str );

trunk/third-party/dht/dht.c

@@ -321 +321 @@
 
 /* Determine whether id1 or id2 is closer to ref */
-int
+static int
 xorcmp(const unsigned char *id1, const unsigned char *id2,
        const unsigned char *ref)