Changeset 11250

Timestamp:

Sep 22, 2010, 3:17:16 PM (12 years ago)

Author:

charles

Message:

(trunk daemon) #3511, part 2 of 2: get rid of the TR_DEBUG environment variable

Location:

trunk/libtransmission

Files:

• session.c (modified) (1 diff)
• utils.c (modified) (6 diffs)
• utils.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -512 +512 @@
     struct init_data data;
 
-    tr_msgInit( );
-
     assert( tr_bencIsDict( clientSettings ) );
 

trunk/libtransmission/utils.c

@@ -63 +63 @@
 time_t transmission_now = 0;
 
-tr_msg_level messageLevel = TR_MSG_INF;
-static tr_lock *      messageLock = NULL;
+tr_msg_level messageLevel = TR_MSG_ERR;
 static tr_bool        messageQueuing = FALSE;
 static tr_msg_list *  messageQueue = NULL;
@@ -80 +79 @@
 ***/
 
-void
-tr_msgInit( void )
-{
-    const char * env = getenv( "TR_DEBUG" );
-    messageLevel = ( env ? atoi( env ) : 0 ) + 1;
-    messageLevel = MAX( 1, messageLevel );
-
-    if( messageLock == NULL )
-        messageLock = tr_lockNew( );
+static tr_lock*
+getMessageLock( void )
+{
+    static tr_lock * l = NULL;
+
+    if( !l )
+        l = tr_lockNew( );
+
+    return l;
 }
 
@@ -148 +147 @@
 {
     tr_msg_list * ret;
-    tr_lockLock( messageLock );
+    tr_lockLock( getMessageLock( ) );
 
     ret = messageQueue;
@@ -156 +155 @@
     messageQueueCount = 0;
 
-    tr_lockUnlock( messageLock );
+    tr_lockUnlock( getMessageLock( ) );
     return ret;
 }
@@ -269 +268 @@
     char buf[1024];
     va_list ap;
-
-    if( messageLock != NULL )
-        tr_lockLock( messageLock );
+    tr_lockLock( getMessageLock( ) );
 
     /* build the text message */
@@ -329 +326 @@
     }
 
-    if( messageLock != NULL )
-        tr_lockUnlock( messageLock );
-
+    tr_lockUnlock( getMessageLock( ) );
     errno = err;
 }

trunk/libtransmission/utils.h

@@ -114 +114 @@
 *****
 ****/
-
-void tr_msgInit( void );
 
 #define TR_MAX_MSG_LOG 10000