Changeset 6840

Timestamp:

Oct 2, 2008, 11:37:58 PM (13 years ago)

Author:

charles

Message:

(libT) eliminating tr_errno, part 3: don't use it in tr_cpBlockBitfieldSet()

Location:

trunk/libtransmission

Files:

• completion.c (modified) (2 diffs)
• completion.h (modified) (1 diff)
• fastresume.c (modified) (1 diff)
• resume.c (modified) (1 diff)

trunk/libtransmission/completion.c

@@ -234 +234 @@
 }
 
-tr_errno
+int
 tr_cpBlockBitfieldSet( tr_completion * cp,
                        tr_bitfield *   bitfield )
 {
-    tr_block_index_t i;
+    int success = FALSE;
 
     assert( cp );
@@ -244 +244 @@
     assert( cp->blockBitfield );
 
-    if( !tr_bitfieldTestFast( bitfield, cp->tor->blockCount - 1 ) )
-        return TR_ERROR_ASSERT;
-
-    tr_cpReset( cp );
-    for( i = 0; i < cp->tor->blockCount; ++i )
-        if( tr_bitfieldHasFast( bitfield, i ) )
-            tr_cpBlockAdd( cp, i );
-
-    return 0;
+    if( tr_bitfieldTestFast( bitfield, cp->tor->blockCount - 1 ) )
+    {
+        tr_block_index_t i;
+        tr_cpReset( cp );
+        for( i = 0; i < cp->tor->blockCount; ++i )
+            if( tr_bitfieldHasFast( bitfield, i ) )
+                tr_cpBlockAdd( cp, i );
+        success = TRUE;
+    }
+
+    return success;
 }
 

trunk/libtransmission/completion.h

@@ -55 +55 @@
 void                       tr_cpInvalidateDND( tr_completion * );
 
-void                       tr_cpGetAmountDone( const   tr_completion *,
-                                               float * tab,
-                                               int     tabCount );
+void                       tr_cpGetAmountDone( const   tr_completion * completion,
+                                               float                 * tab,
+                                               int                     tabCount );
 
 /* Pieces */
-int                        tr_cpPieceIsComplete(
-    const            tr_completion *,
-    tr_piece_index_t piece );
+int                        tr_cpPieceIsComplete( const tr_completion * completion,
+                                                 tr_piece_index_t      piece );
 
-void                       tr_cpPieceAdd(
-                     tr_completion *,
-    tr_piece_index_t piece );
+void                       tr_cpPieceAdd( tr_completion    * completion,
+                                          tr_piece_index_t   piece );
 
-void                       tr_cpPieceRem(
-                     tr_completion *,
-    tr_piece_index_t piece );
+void                       tr_cpPieceRem( tr_completion     * completion,
+                                           tr_piece_index_t   piece );
 
 /* Blocks */
-int                        tr_cpBlockIsComplete(
-    const            tr_completion *,
-    tr_block_index_t block );
+int                        tr_cpBlockIsComplete( const tr_completion * completion,
+                                                 tr_block_index_t block );
 
-void                       tr_cpBlockAdd(
-                     tr_completion *,
-    tr_block_index_t block );
+void                       tr_cpBlockAdd( tr_completion * completion,
+                                          tr_block_index_t block );
 
-tr_errno                   tr_cpBlockBitfieldSet(
-           tr_completion *,
-    struct tr_bitfield
-    * );
+int                        tr_cpBlockBitfieldSet( tr_completion      * completion,
+                                                  struct tr_bitfield * blocks );
 
-int                        tr_cpMissingBlocksInPiece(
-    const tr_completion * cp,
-    tr_piece_index_t
-                          piece );
+int                        tr_cpMissingBlocksInPiece( const tr_completion  * completion,
+                                                      tr_piece_index_t       piece );
 
 

trunk/libtransmission/fastresume.c

@@ -483 +483 @@
         bitfield.bitCount = bitfield.byteCount * 8;
         bitfield.bits = (uint8_t*) walk;
-        if( !tr_cpBlockBitfieldSet( tor->completion, &bitfield ) )
+        if( tr_cpBlockBitfieldSet( tor->completion, &bitfield ) )
             ret = TR_FR_PROGRESS;
-        else
-        {
+        else {
             tr_torrentUncheck( tor );
             tr_tordbg( tor, "Torrent needs to be verified" );

trunk/libtransmission/resume.c

@@ -354 +354 @@
             tmp.bitCount = tmp.byteCount * 8;
             tmp.bits = (uint8_t*) raw;
-            if( tr_cpBlockBitfieldSet( tor->completion, &tmp ) )
+            if( !tr_cpBlockBitfieldSet( tor->completion, &tmp ) )
             {
                 tr_torrentUncheck( tor );