Changeset 6146 for trunk/libtransmission/bencode.c

Timestamp:

Jun 11, 2008, 8:09:36 PM (14 years ago)

Author:

charles

Message:

#966: allow blocklist support in the daemon. add extra info in the man page explaining how to add blocklists.

File:

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

trunk/libtransmission/bencode.c

@@ -34 +34 @@
 #include "transmission.h"
 #include "bencode.h"
+#include "json.h"
 #include "list.h"
 #include "ptrarray.h"
@@ -1222 +1223 @@
 ***/
 
-int
-tr_bencSaveFile( const char * filename,  const tr_benc * b )
+static int
+saveFile( const char * filename, const char * content, size_t len )
 {
     int err = TR_OK;
-    int len;
-    char * content = tr_bencSave( b, &len );
     FILE * out = NULL;
 
@@ -1246 +1245 @@
     if( !err )
         tr_dbg( "tr_bencSaveFile saved \"%s\"", filename );
-    tr_free( content );
     if( out )
         fclose( out );
+    return err;
+}
+
+int
+tr_bencSaveFile( const char * filename,  const tr_benc * b )
+{
+    int len;
+    char * content = tr_bencSave( b, &len );
+    const int err = saveFile( filename, content, len );
+    tr_free( content );
     return err;
 }
@@ -1263 +1271 @@
     return ret;
 }
+
+int
+tr_bencSaveJSONFile( const char * filename, const tr_benc * b )
+{
+    int len;
+    char * content = tr_bencSaveAsJSON( b, &len );
+    const int err = saveFile( filename, content, len );
+    tr_free( content );
+    return err;
+}
+
+int
+tr_bencLoadJSONFile( const char * filename, tr_benc * b )
+{
+    int ret;
+    size_t contentLen;
+    uint8_t * content = tr_loadFile( filename, &contentLen );
+    ret = content ? tr_jsonParse( content, contentLen, b, NULL )
+                  : TR_ERROR_IO_OTHER;
+    tr_free( content );
+    return ret;
+}