Changeset 6613

Timestamp:

Aug 21, 2008, 4:12:17 PM (15 years ago)

Author:

charles

Message:

more metainfo/bencode cleanup

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (2 diffs)
• clients.c (modified) (1 diff)
• metainfo.c (modified) (10 diffs)
• rpc-server.c (modified) (1 diff)
• session.c (modified) (1 diff)
• tracker.c (modified) (2 diffs)
• utils-test.c (modified) (1 diff)
• utils.c (modified) (6 diffs)
• utils.h (modified) (1 diff)

trunk/libtransmission/bencode.c

@@ -913 +913 @@
     if( len )
         *len = EVBUFFER_LENGTH( out );
-    ret = tr_strndup( (char*) EVBUFFER_DATA( out ), EVBUFFER_LENGTH( out ) );
+    ret = tr_strndup( EVBUFFER_DATA( out ), EVBUFFER_LENGTH( out ) );
     evbuffer_free( out );
     return ret;
@@ -1222 +1222 @@
     if( len )
         *len = EVBUFFER_LENGTH( data.out );
-    ret = tr_strndup( (char*) EVBUFFER_DATA( data.out ), EVBUFFER_LENGTH( data.out ) );
+    ret = tr_strndup( EVBUFFER_DATA( data.out ), EVBUFFER_LENGTH( data.out ) );
     evbuffer_free( data.out );
     return ret;

trunk/libtransmission/clients.c

@@ -376 +376 @@
         }
 
-        tr_strlcpy( buf, (const char*)EVBUFFER_DATA(out), buflen );
+        tr_strlcpy( buf, EVBUFFER_DATA( out ), buflen );
         evbuffer_free( out );
     }

trunk/libtransmission/metainfo.c

@@ -79 +79 @@
 {
     struct stat new_sb;
-    char * new_name = getTorrentFilename( handle, inf );
-
-    if( stat( new_name, &new_sb ) || ( ( new_sb.st_mode & S_IFMT ) != S_IFREG ) )
+    char * name = getTorrentFilename( handle, inf );
+
+    if( stat( name, &new_sb ) || ( ( new_sb.st_mode & S_IFMT ) != S_IFREG ) )
     {
         char * old_name = getOldTorrentFilename( handle, inf );
@@ -92 +92 @@
             FILE * out;
             errno = 0;
-            out = fopen( new_name, "wb+" );
+            out = fopen( name, "wb+" );
             if( !out )
             {
-                tr_nerr( inf->name, _( "Couldn't create \"%1$s\": %2$s" ), new_name, tr_strerror( errno ) );
+                tr_nerr( inf->name, _( "Couldn't create \"%1$s\": %2$s" ),
+                         name, tr_strerror( errno ) );
             }
             else
             {
-                if( fwrite( content, sizeof( uint8_t ), contentLen, out ) == contentLen )
+                if( fwrite( content, sizeof( uint8_t ), contentLen, out )
+                        == contentLen )
                 {
                     tr_free( inf->torrent );
-                    inf->torrent = tr_strdup( new_name );
-                    tr_sessionSetTorrentFile( handle, inf->hashString, new_name );
+                    inf->torrent = tr_strdup( name );
+                    tr_sessionSetTorrentFile( handle, inf->hashString, name );
                     unlink( old_name );
                 }
@@ -114 +116 @@
     }
 
-    tr_free( new_name );
+    tr_free( name );
 }
 
@@ -139 +141 @@
         for( i=0; i<n; ++i ) {
             const char * str;
-            if( tr_bencGetStr( tr_bencListChild( path, i ), &str ) && strcmp( str, ".." ) ) {
+            if( tr_bencGetStr( tr_bencListChild( path, i ), &str )
+                    && strcmp( str, ".." ) ) {
                 evbuffer_add( buf, TR_PATH_DELIMITER_STR, 1 );
                 evbuffer_add( buf, str, strlen( str ) );
@@ -155 +158 @@
 
 static const char*
-parseFiles( tr_info * inf, tr_benc * files, tr_benc * length )
-{
-    tr_file_index_t i;
+parseFiles( tr_info * inf, tr_benc * files, const tr_benc * length )
+{
+    int64_t len;
 
     inf->totalSize = 0;
@@ -163 +166 @@
     if( tr_bencIsList( files ) ) /* multi-file mode */
     {
+        tr_file_index_t i;
+
         inf->isMultifile = 1;
         inf->fileCount   = tr_bencListSize( files );
@@ -191 +196 @@
         }
     }
-    else if( tr_bencIsInt( length ) ) /* single-file mode */
+    else if( tr_bencGetInt( length, &len ) ) /* single-file mode */
     {
         inf->isMultifile      = 0;
@@ -197 +202 @@
         inf->files            = tr_new0( tr_file, 1 );
         inf->files[0].name    = tr_strdup( inf->name );
-        inf->files[0].length  = length->val.i;
-        inf->totalSize       += length->val.i;
+        inf->files[0].length  = len;
+        inf->totalSize       += len;
     }
     else
@@ -226 +231 @@
         evbuffer_add( buf, "scrape", 6 );
         evbuffer_add_printf( buf, "%s", s+8 );
-        scrape = tr_strdup( ( char * ) EVBUFFER_DATA( buf ) );
+        scrape = tr_strdup( EVBUFFER_DATA( buf ) );
         evbuffer_free( buf );
     }
@@ -246 +251 @@
         int n;
         int i, j;
+        const int numTiers = tr_bencListSize( tiers );
 
         n = 0;
-        for( i=0; i<tiers->val.l.count; ++i )
-            n += tiers->val.l.vals[i].val.l.count;
+        for( i=0; i<numTiers; ++i )
+            n += tr_bencListSize( tr_bencListChild( tiers, i ) );
 
         trackers = tr_new0( tr_tracker_info, n );
         trackerCount = 0;
 
-        for( i=0; i<tiers->val.l.count; ++i ) {
-            const tr_benc * tier = &tiers->val.l.vals[i];
-            for( j=0; tr_bencIsList(tier) && j<tier->val.l.count; ++j ) {
-                const tr_benc * a = &tier->val.l.vals[j];
-                if( tr_bencIsString( a ) && tr_httpIsValidURL( a->val.s.s ) ) {
+        for( i=0; i<numTiers; ++i ) {
+            tr_benc * tier = tr_bencListChild( tiers, i );
+            const int tierSize = tr_bencListSize( tier );
+            for( j=0; j<tierSize; ++j ) {
+                const char * str;
+                if( tr_bencGetStr( tr_bencListChild( tier, j ), &str ) 
+                        && tr_httpIsValidURL( str ) )  {
                     tr_tracker_info * t = trackers + trackerCount++;
                     t->tier = i;
-                    t->announce = tr_strndup( a->val.s.s, a->val.s.i );
-                    t->scrape = announceToScrape( a->val.s.s );
-                    /*fprintf( stderr, "tier %d: %s\n", i, a->val.s.s );*/
+                    t->announce = tr_strdup( str );
+                    t->scrape = announceToScrape( str );
+                    /*fprintf( stderr, "tier %d: %s\n", i, str );*/
                 }
             }

trunk/libtransmission/rpc-server.c

@@ -559 +559 @@
 
     /* the -1 is to eat the final ", " */
-    ret = tr_strndup( (char*) EVBUFFER_DATA(out), EVBUFFER_LENGTH(out)-1 );
+    ret = tr_strndup( EVBUFFER_DATA( out ), EVBUFFER_LENGTH( out ) - 1 );
     evbuffer_free( out );
     return ret;

trunk/libtransmission/session.c

@@ -104 +104 @@
 ****
 ***/
+
+static int
+tr_stringEndsWith( const char * str, const char * end )
+{
+    const size_t slen = strlen( str );
+    const size_t elen = strlen( end );
+    return slen>=elen && !memcmp( &str[slen-elen], end, elen );
+}
 
 static void

trunk/libtransmission/tracker.c

@@ -634 +634 @@
     req->reqtype = reqtype;
     req->done_func =  isStopping ? onStoppedResponse : onTrackerResponse;
-    req->url = tr_strdup( ( char * ) EVBUFFER_DATA( url ) );
+    req->url = tr_strdup( EVBUFFER_DATA( url ) );
     memcpy( req->torrent_hash, tracker->hash, SHA_DIGEST_LENGTH );
 
@@ -655 +655 @@
     req->session = session;
     req->reqtype = TR_REQ_SCRAPE;
-    req->url = tr_strdup( ( char * ) EVBUFFER_DATA( url ) );
+    req->url = tr_strdup( EVBUFFER_DATA( url ) );
     req->done_func = onScrapeResponse;
     memcpy( req->torrent_hash, tracker->hash, SHA_DIGEST_LENGTH );

trunk/libtransmission/utils-test.c

@@ -107 +107 @@
     tr_free( out );
 
-    /* tr_stringEndsWith */
-    check( tr_stringEndsWith( "the", "the" ) );
-    check( tr_stringEndsWith( "dress", "dress" ) );
-    check( tr_stringEndsWith( "address", "dress" ) );
-    check( !tr_stringEndsWith( "foo.bin", "gfoo.bin" ) );
-    check( !tr_stringEndsWith( "xyz", "xyw" ) );
-
     /* simple bitfield tests */
     for( l=0; l<NUM_LOOPS; ++l )

trunk/libtransmission/utils.c

@@ -191 +191 @@
         va_end( args );
         evbuffer_add_printf( buf, " (%s:%d)\n", basename(myfile), line );
-        fwrite( EVBUFFER_DATA(buf), 1, EVBUFFER_LENGTH(buf), fp );
+        fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );
 
         tr_free( myfile );
@@ -544 +544 @@
     }
     if( EVBUFFER_LENGTH(evbuf) )
-        tr_strlcpy( buf, (char*)EVBUFFER_DATA(evbuf), buflen );
+        tr_strlcpy( buf, EVBUFFER_DATA( evbuf ), buflen );
     else
         *buf = '\0';
@@ -665 +665 @@
 
     if( evbuffer_add_vprintf( buf, fmt, ap ) != -1 )
-        ret = tr_strdup( (char*)EVBUFFER_DATA( buf ) );
+        ret = tr_strdup( EVBUFFER_DATA( buf ) );
 
     va_end( ap );
@@ -939 +939 @@
 
 int
-tr_stringEndsWith( const char * str, const char * end )
-{
-    const size_t slen = strlen( str );
-    const size_t elen = strlen( end );
-    return slen>=elen && !memcmp( &str[slen-elen], end, elen );
-}
-
-int
 tr_snprintf( char * buf, size_t buflen, const char * fmt, ... )
 {
@@ -964 +956 @@
  */
 size_t
-tr_strlcpy(char *dst, const char *src, size_t siz)
+tr_strlcpy(char *dst, const void * src, size_t siz)
 {
 #ifdef HAVE_STRLCPY
@@ -992 +984 @@
     }
 
-    return(s - src - 1); /* count does not include NUL */
+    return(s - (char*)src - 1); /* count does not include NUL */
 #endif
 }

trunk/libtransmission/utils.h

@@ -194 +194 @@
 char* tr_base64_decode( const void * input, int inlen, int *outlen ) TR_GNUC_MALLOC;
 
-size_t tr_strlcpy( char * dst, const char * src, size_t siz );
+size_t tr_strlcpy( char * dst, const void * src, size_t siz );
 int tr_snprintf( char * buf, size_t buflen, const char * fmt, ... );
-
-int   tr_stringEndsWith( const char * string, const char * end );
 
 const char* tr_strerror( int );