Changeset 4842

Timestamp:

Jan 27, 2008, 5:03:58 PM (14 years ago)

Author:

charles

Message:

tr_ioRecalculateHash(): use a static buffer instead of malloc/free.

File:

• trunk/libtransmission/inout.c (modified) (3 diffs)

trunk/libtransmission/inout.c

@@ -18 +18 @@
 #include <sys/stat.h>
 #include <unistd.h>
+
+#include <openssl/sha.h>
 
 #include "transmission.h"
@@ -225 +227 @@
                       uint8_t     * setme )
 {
-    int n;
-    int ret;
-    uint8_t * buf;
+    int offset;
+    int bytesLeft;
+    uint8_t buf[4096];
     const tr_info * info;
+    SHA_CTX sha;
 
     assert( tor != NULL );
@@ -235 +238 @@
 
     info = &tor->info;
-    n = tr_torPieceCountBytes( tor, pieceIndex );
-
-    buf = tr_new( uint8_t, n );
-    ret = tr_ioRead( tor, pieceIndex, 0, n, buf );
-    if( !ret )
-        tr_sha1( setme, buf, n, NULL );
-    tr_free( buf );
-
-    return ret;
+    offset = 0;
+    bytesLeft = tr_torPieceCountBytes( tor, pieceIndex );
+    SHA1_Init( &sha );
+
+    while( bytesLeft > 0 )
+    {
+        const int bytesThisPass = MIN( bytesLeft, (int)sizeof(buf) );
+        int ret = tr_ioRead( tor, pieceIndex, offset, bytesThisPass, buf );
+        if( ret )
+            return ret;
+        SHA1_Update( &sha, buf, bytesThisPass );
+        bytesLeft -= bytesThisPass;
+        offset += bytesThisPass;
+    }
+
+    SHA1_Final( setme, &sha );
+    return 0;
 }