Changeset 4880

Timestamp:

Jan 31, 2008, 6:00:56 AM (14 years ago)

Author:

charles

Message:

(1.0x) bencode tweaks.

File:

• branches/1.0x/libtransmission/bencode.c (modified) (9 diffs)

branches/1.0x/libtransmission/bencode.c

@@ -120 +120 @@
     if( errno || ( endptr != end ) ) /* incomplete parse */
         err = TR_ERROR;
-    else if( val && *(const char*)begin=='0' ) /* the spec forbids leading zeroes */
+    else if( val && *(const char*)begin=='0' ) /* no leading zeroes! */
         err = TR_ERROR;
     else {
@@ -226 +226 @@
  */
 int
-tr_bencParse( const void  * buf_in,
-              const void  * bufend_in,
+tr_bencParse( const void     * buf_in,
+              const void     * bufend_in,
               benc_val_t     * top,
               const uint8_t ** setme_end )
@@ -248 +248 @@
             benc_val_t * node;
 
-            if(( err = tr_bencParseInt( (const uint8_t*)buf, bufend, &end, &val )))
+            if(( err = tr_bencParseInt( buf, bufend, &end, &val )))
                 return err;
 
@@ -567 +567 @@
 
 static struct SaveNode*
-nodeNewSimple( const benc_val_t * val )
+nodeNewLeaf( const benc_val_t * val )
 {
     struct SaveNode * node;
@@ -585 +585 @@
         case TYPE_INT:
         case TYPE_STR:
-            return nodeNewSimple( val );
+            return nodeNewLeaf( val );
             break;
         case TYPE_LIST:
@@ -616 +616 @@
  */
 static void
-depthFirstWalk( const benc_val_t * top, struct WalkFuncs * walkFuncs, void * user_data )
+bencWalk( const benc_val_t   * top,
+          struct WalkFuncs   * walkFuncs,
+          void               * user_data )
 {
     tr_ptrArray * stack = tr_ptrArrayNew( );
@@ -721 +723 @@
     walkFuncs.listBeginFunc = saveListBeginFunc;
     walkFuncs.containerEndFunc = saveContainerEndFunc;
-
-    depthFirstWalk( top, &walkFuncs, out );
+    bencWalk( top, &walkFuncs, out );
     
     if( len != NULL )
@@ -763 +764 @@
         walkFuncs.listBeginFunc = freeContainerBeginFunc;
         walkFuncs.containerEndFunc = freeDummyFunc;
-        depthFirstWalk( val, &walkFuncs, freeme );
+        bencWalk( val, &walkFuncs, freeme );
 
         tr_ptrArrayFree( freeme, tr_free );
@@ -847 +848 @@
     walkPrint.out = stderr;
     walkPrint.depth = 0;
-    depthFirstWalk( val, &walkFuncs, &walkPrint );
-}
+    bencWalk( val, &walkFuncs, &walkPrint );
+}