Changeset 5810

Timestamp:

May 11, 2008, 10:42:53 PM (15 years ago)

Author:

charles

Message:

add json-to-benc parser

Location:

trunk/libtransmission

Files:

• ConvertUTF.c (added)
• ConvertUTF.h (added)
• JSON_checker.c (added)
• JSON_checker.h (added)
• Makefile.am (modified) (5 diffs)
• bencode.c (modified) (1 diff)
• bencode.h (modified) (2 diffs)
• json-test.c (added)
• json.c (added)

trunk/libtransmission/Makefile.am

@@ -5 +5 @@
 
 libtransmission_a_SOURCES = \
+    ConvertUTF.c \
+    JSON_checker.c \
     bencode.c \
     blocklist.c \
@@ -16 +18 @@
     inout.c \
     ipcparse.c \
+    json.c \
     list.c \
     makemeta.c \
@@ -42 +45 @@
 
 noinst_HEADERS = \
+    ConvertUTF.h \
+    JSON_checker.h \
     bencode.h \
     blocklist.h \
@@ -86 +91 @@
     bencode-test \
     clients-test \
+    json-test \
     test-fastset \
     test-peer-id
@@ -110 +116 @@
 clients_test_SOURCES = clients-test.c
 clients_test_LDADD = $(APPS_LDADD)
+json_test_SOURCES = json-test.c
+json_test_LDADD = $(APPS_LDADD)
 test_fastset_SOURCES = test-fastset.c
 test_fastset_LDADD = $(APPS_LDADD)

trunk/libtransmission/bencode.c

@@ -592 +592 @@
 
     assert( tr_bencIsDict( dict ) );
+    if( dict->val.l.count + 2 > dict->val.l.alloc )
+        makeroom( dict, 2 );
     assert( dict->val.l.count + 2 <= dict->val.l.alloc );
 
     keyval = dict->val.l.vals + dict->val.l.count++;
-    tr_bencInitStr( keyval, (char*)key, -1, 1 );
+    tr_bencInitStrDup( keyval, key );
 
     itemval = dict->val.l.vals + dict->val.l.count++;

trunk/libtransmission/bencode.h

@@ -57 +57 @@
 typedef tr_benc benc_val_t;
 
+int tr_jsonParse( const void      * buf,
+                  const void      * bufend,
+                  tr_benc         * setme_benc,
+                  const uint8_t  ** setme_end );
+
 int tr_bencParse( const void      * buf,
                   const void      * bufend,
@@ -103 +108 @@
 tr_benc    * tr_bencListAddList( tr_benc  * list, int reserveCount );
 tr_benc    * tr_bencListAddDict( tr_benc  * list, int reserveCount );
-/* note: key must not be freed or modified while val is in use */
 tr_benc    * tr_bencDictAdd( tr_benc * dict, const char * key );
 tr_benc    * tr_bencDictAddDouble( tr_benc * dict, const char * key, double d );