Changeset 2495

Timestamp:

Jul 25, 2007, 5:27:19 PM (16 years ago)

Author:

charles

Message:

fix compiler warnings reported by wereHamster

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (1 diff)
• peerparse.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• utils.c (modified) (2 diffs)

trunk/libtransmission/bencode.c

@@ -378 +378 @@
 
     keyval = dict->val.l.vals + dict->val.l.count++;
-    tr_bencInitStr( keyval, key, -1, 1 );
+    tr_bencInitStr( keyval, (char*)key, -1, 1 );
 
     itemval = dict->val.l.vals + dict->val.l.count++;

trunk/libtransmission/peerparse.h

@@ -355 +355 @@
            bad share ratio . (Ticket #263) */
         const int byteCount = tr_pieceSize( index );
-        if( tor->downloadedCur >= byteCount )
+        if( tor->downloadedCur >= (uint64_t)byteCount )
             tor->downloadedCur -= byteCount;
 

trunk/libtransmission/torrent.c

@@ -708 +708 @@
     assert( (int)lastBlock < tor->blockCount );
     assert( firstBlock <= lastBlock );
-    assert( TOR_BLOCK_PIECE( tor, firstBlock ) == file->firstPiece );
-    assert( TOR_BLOCK_PIECE( tor, lastBlock ) == file->lastPiece );
+    assert( (int)TOR_BLOCK_PIECE( tor, firstBlock ) == file->firstPiece );
+    assert( (int)TOR_BLOCK_PIECE( tor, lastBlock ) == file->lastPiece );
 
     if( firstBlock == lastBlock )

trunk/libtransmission/utils.c

@@ -589 +589 @@
 {
     assert( bitfield != NULL );
-    assert( 0 <= nth);
-    assert( 0 <= BIN(nth) );
     assert( BIN(nth) < bitfield->len );
     bitfield->bits[ BIN(nth) ] |= BIT(nth);
@@ -612 +610 @@
     if( bitfield != NULL )
     {
-        const int bin = BIN(nth);
+        const size_t bin = BIN(nth);
         assert( bin < bitfield->len );
         bitfield->bits[bin] &= ~BIT(nth);