From 8efe3f7cce0682b65de65a6557cdddcbc5ce92ef Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sat, 5 Dec 2009 01:02:37 +0000
Subject: [PATCH] remove a redundant level check in tr_msg()

---
 libtransmission/utils.c | 97 ++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index fb08a3d15..727a8767a 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -298,67 +298,64 @@ tr_msg( const char * file, int line,
         const char * fmt, ... )
 {
     const int err = errno; /* message logging shouldn't affect errno */
-    tr_lockLock( messageLock );
+    char buf[MAX_STACK_ARRAY_SIZE];
+    va_list ap;
 
-    if( messageLevel >= level )
-    {
-        char buf[MAX_STACK_ARRAY_SIZE];
-        va_list ap;
+    tr_lockLock( messageLock );
 
-        /* build the text message */
-        *buf = '\0';
-        va_start( ap, fmt );
-        evutil_vsnprintf( buf, sizeof( buf ), fmt, ap );
-        va_end( ap );
+    /* build the text message */
+    *buf = '\0';
+    va_start( ap, fmt );
+    evutil_vsnprintf( buf, sizeof( buf ), fmt, ap );
+    va_end( ap );
 
-        OutputDebugString( buf );
+    OutputDebugString( buf );
 
-        if( *buf )
+    if( *buf )
+    {
+        if( messageQueuing )
         {
-            if( messageQueuing )
+            tr_msg_list * newmsg;
+            newmsg = tr_new0( tr_msg_list, 1 );
+            newmsg->level = level;
+            newmsg->when = tr_time( );
+            newmsg->message = tr_strdup( buf );
+            newmsg->file = file;
+            newmsg->line = line;
+            newmsg->name = tr_strdup( name );
+
+            *messageQueueTail = newmsg;
+            messageQueueTail = &newmsg->next;
+            ++messageQueueCount;
+            
+            if (messageQueueCount > TR_MAX_MSG_LOG)
             {
-                tr_msg_list * newmsg;
-                newmsg = tr_new0( tr_msg_list, 1 );
-                newmsg->level = level;
-                newmsg->when = tr_time( );
-                newmsg->message = tr_strdup( buf );
-                newmsg->file = file;
-                newmsg->line = line;
-                newmsg->name = tr_strdup( name );
-
-                *messageQueueTail = newmsg;
-                messageQueueTail = &newmsg->next;
-                ++messageQueueCount;
+                tr_msg_list * old = messageQueue;
+                messageQueue = old->next;
+                old->next = NULL;
+                tr_freeMessageList(old);
                 
-                if (messageQueueCount > TR_MAX_MSG_LOG)
-                {
-                    tr_msg_list * old = messageQueue;
-                    messageQueue = old->next;
-                    old->next = NULL;
-                    tr_freeMessageList(old);
-                    
-                    --messageQueueCount;
-                    
-                    assert( messageQueueCount == TR_MAX_MSG_LOG );
-                }
+                --messageQueueCount;
+                
+                assert( messageQueueCount == TR_MAX_MSG_LOG );
             }
-            else
-            {
-                char timestr[64];
-                FILE * fp;
+        }
+        else
+        {
+            char timestr[64];
+            FILE * fp;
 
-                fp = tr_getLog( );
-                if( fp == NULL )
-                    fp = stderr;
+            fp = tr_getLog( );
+            if( fp == NULL )
+                fp = stderr;
 
-                tr_getLogTimeStr( timestr, sizeof( timestr ) );
+            tr_getLogTimeStr( timestr, sizeof( timestr ) );
 
-                if( name )
-                    fprintf( fp, "[%s] %s: %s\n", timestr, name, buf );
-                else
-                    fprintf( fp, "[%s] %s\n", timestr, buf );
-                fflush( fp );
-            }
+            if( name )
+                fprintf( fp, "[%s] %s: %s\n", timestr, name, buf );
+            else
+                fprintf( fp, "[%s] %s\n", timestr, buf );
+            fflush( fp );
         }
     }
 
-- 
2.40.0