Changeset 5772

Timestamp:

May 8, 2008, 3:25:21 AM (14 years ago)

Author:

charles

Message:

add a couple of benc utility functions

Location:

trunk/libtransmission

Files:

• bencode-test.c (modified) (1 diff)
• bencode.c (modified) (4 diffs)
• bencode.h (modified) (4 diffs)

trunk/libtransmission/bencode-test.c

@@ -238 +238 @@
     check( !err );
     check( end == buf + strlen( (const char*)buf ) );
-    check(( child = tr_bencListGetNthChild( &val, 0 )));
-    check(( child2 = tr_bencListGetNthChild( child, 0 )));
+    check(( child = tr_bencListChild( &val, 0 )));
+    check(( child2 = tr_bencListChild( child, 0 )));
     saved = tr_bencSave( &val, &len );
     check( !strcmp( saved, "lld1:ai64e1:bi32eeee" ) );

trunk/libtransmission/bencode.c

@@ -377 +377 @@
 }
 
+int
+tr_bencListSize( const tr_benc * list )
+{
+    return tr_bencIsList( list ) ? list->val.l.count : 0;
+}
+
 tr_benc*
-tr_bencListGetNthChild( tr_benc * val, int i )
+tr_bencListChild( tr_benc * val, int i )
 {
     tr_benc * ret = NULL;
@@ -389 +395 @@
 tr_bencGetInt ( const tr_benc * val, int64_t * setme )
 {
-    int success = FALSE;
-    if( tr_bencIsInt( val )) {
+    const int success = tr_bencIsInt( val );
+    if( success )
         *setme = val->val.i ;
-        success = TRUE;
-    }
+    return success;
+}
+
+int
+tr_bencGetStr( const tr_benc * val, const char ** setme )
+{
+    const int success = tr_bencIsString( val );
+    if( success )
+        *setme = val->val.s.s;
     return success;
 }
@@ -405 +418 @@
         found = tr_bencGetInt( child, setme );
     return found;
+}
+
+int
+tr_bencDictFindDouble( tr_benc * dict, const char * key, double * setme )
+{
+    const char * str;
+    const int success = tr_bencDictFindStr( dict, key, &str );
+    if( success )
+        *setme = strtod( str, NULL );
+    return success;
 }
 
@@ -592 +615 @@
     tr_bencInitStrDup( child, val );
     return child;
+}
+tr_benc*
+tr_bencDictAddDouble( tr_benc * dict, const char * key, double d )
+{
+    char buf[128];
+    snprintf( buf, sizeof( buf ), "%f", d );
+    return tr_bencDictAddStr( dict, key, buf );
 }
 tr_benc*

trunk/libtransmission/bencode.h

@@ -70 +70 @@
 void      tr_bencFree( tr_benc * );
 int       tr_bencDictFindInt( tr_benc * dict, const char * key, int64_t * setme );
+int       tr_bencDictFindDouble( tr_benc * dict, const char * key, double * setme );
 int       tr_bencDictFindStr( tr_benc * dict, const char * key, const char ** setme );
 int       tr_bencDictFindList( tr_benc * dict, const char * key, tr_benc ** setme );
@@ -104 +105 @@
 /* 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 );
 tr_benc    * tr_bencDictAddInt( tr_benc * dict, const char * key, int64_t val );
 tr_benc    * tr_bencDictAddStr( tr_benc * dict, const char * key, const char * val );
@@ -116 +118 @@
 
 int tr_bencGetInt( const tr_benc * val, int64_t * setme );
+int tr_bencGetStr( const tr_benc * val, const char ** setme );
 
 int tr_bencIsType( const tr_benc *, int type );
@@ -143 +146 @@
 **/
 
-tr_benc * tr_bencListGetNthChild( tr_benc * list, int n );
+int       tr_bencListSize( const tr_benc * list );
+tr_benc * tr_bencListChild( tr_benc * list, int n );