Changeset 10920

Timestamp:

Jul 1, 2010, 3:14:35 PM (13 years ago)

Author:

charles

Message:

(trunk libT) fix a few -Wconversion warnings

Location:

trunk/libtransmission

Files:

• blocklist.c (modified) (4 diffs)
• blocklist.h (modified) (1 diff)
• makemeta.c (modified) (3 diffs)

trunk/libtransmission/blocklist.c

@@ -80 +80 @@
 blocklistLoad( tr_blocklist * b )
 {
-    int          fd;
-    struct stat  st;
+    int fd;
+    size_t byteCount;
+    struct stat st;
     const char * err_fmt = _( "Couldn't read \"%1$s\": %2$s" );
 
@@ -96 +97 @@
     }
 
-    b->rules = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 );
+    byteCount = (size_t) st.st_size;
+    b->rules = mmap( NULL, byteCount, PROT_READ, MAP_PRIVATE, fd, 0 );
     if( !b->rules )
     {
@@ -104 +106 @@
     }
 
-    b->byteCount = st.st_size;
-    b->ruleCount = st.st_size / sizeof( struct tr_ip_range );
     b->fd = fd;
+    b->byteCount = byteCount;
+    b->ruleCount = byteCount / sizeof( struct tr_ip_range );
 
     {
@@ -146 +148 @@
 
 tr_blocklist *
-_tr_blocklistNew( const char * filename,
-                  int          isEnabled )
+_tr_blocklistNew( const char * filename, tr_bool isEnabled )
 {
     tr_blocklist * b;

trunk/libtransmission/blocklist.h

@@ -22 +22 @@
 
 tr_blocklist* _tr_blocklistNew         ( const char              * filename,
-                                         int                       isEnabled );
+                                         tr_bool                   isEnabled );
 
 int           _tr_blocklistExists      ( const tr_blocklist      * b );

trunk/libtransmission/makemeta.c

@@ -89 +89 @@
 }
 
-static int
+static uint32_t
 bestPieceSize( uint64_t totalSize )
 {
-    const uint64_t GiB = 1073741824;
-    const uint64_t MiB = 1048576;
-    const uint64_t KiB = 1024;
+    const uint32_t GiB = 1073741824;
+    const uint32_t MiB = 1048576;
+    const uint32_t KiB = 1024;
 
     if( totalSize >=   ( 2 * GiB ) ) return 2 * MiB;
@@ -227 +227 @@
     while( totalRemain )
     {
-        uint8_t *      bufptr = buf;
-        const uint64_t thisPieceSize =
-            MIN( (uint32_t)b->pieceSize, totalRemain );
-        uint64_t       pieceRemain = thisPieceSize;
+        uint8_t * bufptr = buf;
+        const uint32_t thisPieceSize = (uint32_t) MIN( b->pieceSize, totalRemain );
+        uint32_t leftInPiece = thisPieceSize;
 
         assert( b->pieceIndex < b->pieceCount );
 
-        while( pieceRemain )
+        while( leftInPiece )
         {
-            const uint64_t n_this_pass =
-                MIN( ( b->files[fileIndex].size - off ), pieceRemain );
+            const size_t n_this_pass = (size_t) MIN( ( b->files[fileIndex].size - off ), leftInPiece );
             read( fd, bufptr, n_this_pass );
             bufptr += n_this_pass;
             off += n_this_pass;
-            pieceRemain -= n_this_pass;
+            leftInPiece -= n_this_pass;
             if( off == b->files[fileIndex].size )
             {
@@ -266 +264 @@
 
         assert( bufptr - buf == (int)thisPieceSize );
-        assert( pieceRemain == 0 );
+        assert( leftInPiece == 0 );
         tr_sha1( walk, buf, thisPieceSize, NULL );
         walk += SHA_DIGEST_LENGTH;