Changeset 9562

Timestamp:

Nov 25, 2009, 4:12:55 AM (13 years ago)

Author:

charles

Message:

(trunk libT) more work on magnet links.

Location:

trunk/libtransmission

Files:

• bitfield.c (modified) (1 diff)
• bitset.h (modified) (5 diffs)

trunk/libtransmission/bitfield.c

@@ -163 +163 @@
                const tr_bitfield * b )
 {
-    uint8_t *      ait;
-    const uint8_t *aend, *bit;
-
-    assert( a->byteCount == b->byteCount );
-
-    for( ait = a->bits, bit = b->bits, aend = ait + a->byteCount;
-         ait != aend; )
+    uint8_t * ait;
+    const uint8_t *aend, *bit, *bend;
+
+    for( ait = a->bits, aend = ait + a->byteCount,
+         bit = b->bits, bend = bit + b->byteCount;
+         ait != aend && bit != bend; )
+    {
         *ait++ |= *bit++;
+    }
 
     return a;

trunk/libtransmission/bitset.h

@@ -17 +17 @@
 #ifndef TR_BITSET_H
 #define TR_BITSET_H 1
-
-#include <assert.h>
 
 #include "transmission.h"
@@ -53 +51 @@
         tr_bitfieldDestruct( &b->bitfield );
         tr_bitfieldConstruct( &b->bitfield, size );
-        assert( b->bitfield.byteCount >= tmp->byteCount );
-        memcpy( &b->bitfield.bits, tmp->bits, tmp->byteCount );
+        memcpy( b->bitfield.bits, tmp->bits, tmp->byteCount );
 
         tr_bitfieldFree( tmp );
@@ -65 +62 @@
     if( b->haveAll ) return TRUE;
     if( b->haveNone ) return FALSE;
+    if( nth >= b->bitfield.bitCount ) return FALSE;
     return tr_bitfieldHasFast( &b->bitfield, nth );
 }
@@ -73 +71 @@
     if( b->haveAll ) return TRUE;
     if( b->haveNone ) return FALSE;
+    if( nth >= b->bitfield.bitCount ) return FALSE;
     return tr_bitfieldHas( &b->bitfield, nth );
 }
@@ -124 +123 @@
     if( !b->haveAll ) {
         b->haveNone = 0;
-        tr_bitsetReserve( b, i );
+        tr_bitsetReserve( b, i+1 );
         ret = tr_bitfieldAdd( &b->bitfield, i );
     }