Changeset 10918

Timestamp:

Jul 1, 2010, 5:14:34 AM (13 years ago)

Author:

charles

Message:

(trunk libT) fix more issues found by -Wconversion

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (12 diffs)
• clients.c (modified) (3 diffs)
• completion.h (modified) (2 diffs)
• torrent-magnet.c (modified) (2 diffs)
• torrent-magnet.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• torrent.h (modified) (1 diff)
• transmission.h (modified) (4 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/announcer.c

@@ -78 +78 @@
 
 static int
-compareTransfer( int a_uploaded, int a_downloaded,
-                 int b_uploaded, int b_downloaded )
+compareTransfer( uint32_t a_uploaded, uint32_t a_downloaded,
+                 uint32_t b_uploaded, uint32_t b_downloaded )
 {
     /* higher upload count goes first */
@@ -137 +137 @@
     char * host = NULL;
     char * ret;
-    tr_urlParse( url, strlen( url ), NULL, &host, &port, NULL );
+    tr_urlParse( url, -1, NULL, &host, &port, NULL );
     ret = tr_strdup_printf( "%s:%d", ( host ? host : "invalid" ), port );
     tr_free( host );
@@ -173 +173 @@
     tr_host * host;
     char * url;
-    int up;
-    int down;
+    uint32_t up;
+    uint32_t down;
 };
 
@@ -339 +339 @@
     size_t i;
     const char * pool = "abcdefghijklmnopqrstuvwxyz0123456789";
-    const int poolSize = strlen( pool );
+    const int poolSize = 36;
 
     for( i=0; i<msglen; ++i )
@@ -386 +386 @@
     /* number of up/down/corrupt bytes since the last time we sent an
      * "event=stopped" message that was acknowledged by the tracker */
-    uint64_t byteCounts[3];
+    uint32_t byteCounts[3];
 
     tr_ptrArray trackers; /* tr_tracker_item */
@@ -618 +618 @@
 }
 
-static int
+static int8_t
 getSeedProbability( int seeds, int leechers )
 {
@@ -625 +625 @@
 
     if( seeds>=0 && leechers>=0 )
-        return (int)((100.0*seeds)/(seeds+leechers));
+        return (int8_t)((100.0*seeds)/(seeds+leechers));
 
     return -1; /* unknown */
@@ -735 +735 @@
                               "&peer_id=%s"
                               "&port=%d"
-                              "&uploaded=%" PRIu64
-                              "&downloaded=%" PRIu64
+                              "&uploaded=%" PRIu32
+                              "&downloaded=%" PRIu32
                               "&left=%" PRIu64
                               "&numwant=%d"
@@ -757 +757 @@
 
     if( tier->byteCounts[TR_ANN_CORRUPT] )
-        evbuffer_add_printf( buf, "&corrupt=%" PRIu64, tier->byteCounts[TR_ANN_CORRUPT] );
+        evbuffer_add_printf( buf, "&corrupt=%" PRIu32, tier->byteCounts[TR_ANN_CORRUPT] );
 
     str = eventName;
@@ -781 +781 @@
         inet_ntop( AF_INET6, ipv6, ipv6_readable, INET6_ADDRSTRLEN );
         evbuffer_add_printf( buf, "&ipv6=");
-        tr_http_escape( buf, ipv6_readable, strlen(ipv6_readable), TRUE );
+        tr_http_escape( buf, ipv6_readable, -1, TRUE );
     }
 
@@ -1170 +1170 @@
 
 static uint8_t *
-parseOldPeers( tr_benc * bePeers, size_t *  byteCount )
+parseOldPeers( tr_benc * bePeers, size_t * byteCount )
 {
     int       i;
@@ -1198 +1198 @@
 
         memcpy( walk, &addr, sizeof( tr_address ) );
-        port = htons( itmp );
+        port = htons( (uint16_t)itmp );
         memcpy( walk + sizeof( tr_address ), &port, 2 );
         walk += sizeof( tr_address ) + 2;

trunk/libtransmission/clients.c

@@ -23 +23 @@
 
 static int
-charint( char ch )
+charint( uint8_t ch )
 {
     if( '0' <= ch && ch <= '9' ) return      ch - '0';
@@ -32 +32 @@
 
 static int
-getShadowInt( char ch, int * setme )
+getShadowInt( uint8_t ch, int * setme )
 {
     const char * str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-";
@@ -52 +52 @@
 
 static const char*
-getMnemonicEnd( char ch )
+getMnemonicEnd( uint8_t ch )
 {
     switch( ch )

trunk/libtransmission/completion.h

@@ -93 +93 @@
 }
 
-static inline float tr_cpPercentComplete( const tr_completion * cp )
+static inline double tr_cpPercentComplete( const tr_completion * cp )
 {
     const double ratio = tr_getRatio( cp->sizeNow, tr_torrentInfo(cp->tor)->totalSize );
@@ -104 +104 @@
 }
 
-static inline float tr_cpPercentDone( const tr_completion * cp )
+static inline double tr_cpPercentDone( const tr_completion * cp )
 {
     const double ratio = tr_getRatio( cp->sizeNow, tr_cpSizeWhenDone( cp ) );

trunk/libtransmission/torrent-magnet.c

@@ -349 +349 @@
 }
 
-float
+double
 tr_torrentGetMetadataPercent( const tr_torrent * tor )
 {
-    float ret;
+    double ret;
 
     if( tr_torrentHasMetadata( tor ) )
@@ -361 +361 @@
             ret = 0.0;
         else
-            ret = (m->pieceCount - m->piecesNeededCount) / (float)m->pieceCount;
+            ret = (m->pieceCount - m->piecesNeededCount) / (double)m->pieceCount;
     }
 

trunk/libtransmission/torrent-magnet.h

@@ -34 +34 @@
 void tr_torrentSetMetadataSizeHint( tr_torrent * tor, int metadata_size );
 
-float tr_torrentGetMetadataPercent( const tr_torrent * tor );
+double tr_torrentGetMetadataPercent( const tr_torrent * tor );
 
 #endif

trunk/libtransmission/torrent.c

@@ -1842 +1842 @@
 {
     tr_file *        file;
-    const uint8_t    dnd = !doDownload;
+    const int8_t     dnd = !doDownload;
     tr_piece_index_t firstPiece, firstPieceDND;
     tr_piece_index_t lastPiece, lastPieceDND;

trunk/libtransmission/torrent.h

@@ -277 +277 @@
 tr_torPieceCountBlocks( const tr_torrent * tor, const tr_piece_index_t piece )
 {
-    return piece == tor->info.pieceCount - 1 ? tor->blockCountInLastPiece
-                                             : tor->blockCountInPiece;
+    if( piece + 1 == tor->info.pieceCount )
+        return tor->blockCountInLastPiece;
+    else
+        return tor->blockCountInPiece;
 }
 

trunk/libtransmission/transmission.h

@@ -64 +64 @@
 typedef uint32_t tr_file_index_t;
 typedef uint32_t tr_piece_index_t;
-typedef uint64_t tr_block_index_t;
+/* assuming a 16 KiB block, a 32-bit block index gives us a maximum torrent size of 63 TiB.
+ * if we ever need to grow past that, change this to uint64_t ;) */
+typedef uint32_t tr_block_index_t;
 typedef uint16_t tr_port;
 typedef uint8_t tr_bool;
@@ -1722 +1724 @@
         Range is [0..1]
         @see tr_stat.status */
-    float    recheckProgress;
+    double recheckProgress;
 
     /** How much has been downloaded of the entire torrent.
         Range is [0..1] */
-    float    percentComplete;
+    double percentComplete;
 
     /** How much of the metadata the torrent has.
@@ -1732 +1734 @@
         For magnet links, this number will from from 0 to 1 as the metadata is downloaded.
         Range is [0..1] */
-    float    metadataPercentComplete;
+    double metadataPercentComplete;
 
     /** How much has been downloaded of the files the user wants.  This differs
@@ -1738 +1740 @@
         Range is [0..1]
         @see tr_stat.leftUntilDone */
-    float    percentDone;
+    double percentDone;
 
     /** How much has been uploaded to satisfy the seed ratio.
         This is 1 if the ratio is reached or the torrent is set to seed forever.
         Range is [0..1] */
-    float    seedRatioPercentDone;
+    double seedRatioPercentDone;
 
     /** Speed all data being sent for this torrent. (KiB/s)

trunk/libtransmission/utils.c

@@ -867 +867 @@
 
 double
-tr_getRatio( double numerator, double denominator )
+tr_getRatio( uint64_t numerator, uint64_t denominator )
 {
     double ratio;
 
-    if( fabs(denominator) > 0.01 )
-        ratio = numerator / denominator;
-    else if( fabs(numerator) > 0.01 )
+    if( denominator > 0 )
+        ratio = numerator / (double)denominator;
+    else if( numerator > 0 )
         ratio = TR_RATIO_INF;
     else

trunk/libtransmission/utils.h

@@ -465 +465 @@
 /** @brief return TR_RATIO_NA, TR_RATIO_INF, or a number in [0..1]
     @return TR_RATIO_NA, TR_RATIO_INF, or a number in [0..1] */
-double tr_getRatio( double numerator, double denominator );
+double tr_getRatio( uint64_t numerator, uint64_t denominator );
 
 /**