From 4f6d46cf99404a10178c7602de5275b91b95512c Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Wed, 19 Jan 2011 21:50:51 +0000 Subject: [PATCH] (trunk libT) minor code tweak to crypto.c's tr_sha1() function --- libtransmission/crypto.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c index fbf2d1af8..aed070db0 100644 --- a/libtransmission/crypto.c +++ b/libtransmission/crypto.c @@ -39,20 +39,16 @@ tr_sha1( uint8_t * setme, const void * content1, int content1_len, ... ) { va_list vl; SHA_CTX sha; + const void * content; SHA1_Init( &sha ); SHA1_Update( &sha, content1, content1_len ); va_start( vl, content1_len ); - for( ;; ) - { - const void * content = va_arg( vl, const void* ); - const int content_len = content ? va_arg( vl, int ) : -1; - if( content == NULL || content_len < 1 ) - break; - SHA1_Update( &sha, content, content_len ); - } + while(( content = va_arg( vl, const void* ))) + SHA1_Update( &sha, content, va_arg( vl, int ) ); va_end( vl ); + SHA1_Final( setme, &sha ); } -- 2.40.0