mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Charles Kerr 2010-09-22 15:17:16 +00:00
parent f79d45effb
commit 599c5a8cc4
3 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libtransmission/session.c
View file

@ -511,8 +511,6 @@ tr_sessionInit( const char * tag,
tr_session * session; tr_session * session;
struct init_data data; struct init_data data;
tr_msgInit( );
assert( tr_bencIsDict( clientSettings ) ); assert( tr_bencIsDict( clientSettings ) );
/* initialize the bare skeleton of the session object */ /* initialize the bare skeleton of the session object */

29
libtransmission/utils.c
View file

@ -62,8 +62,7 @@
time_t transmission_now = 0; time_t transmission_now = 0;
tr_msg_level messageLevel = TR_MSG_INF; tr_msg_level messageLevel = TR_MSG_ERR;
static tr_lock * messageLock = NULL;
static tr_bool messageQueuing = FALSE; static tr_bool messageQueuing = FALSE;
static tr_msg_list * messageQueue = NULL; static tr_msg_list * messageQueue = NULL;
static tr_msg_list ** messageQueueTail = &messageQueue; static tr_msg_list ** messageQueueTail = &messageQueue;
@ -79,15 +78,15 @@ static int messageQueueCount = 0;
**** ****
***/ ***/
void static tr_lock*
tr_msgInit( void ) getMessageLock( void )
{ {
const char * env = getenv( "TR_DEBUG" ); static tr_lock * l = NULL;
messageLevel = ( env ? atoi( env ) : 0 ) + 1;
messageLevel = MAX( 1, messageLevel );
if( messageLock == NULL ) if( !l )
messageLock = tr_lockNew( ); l = tr_lockNew( );
return l;
} }
FILE* FILE*
@ -147,7 +146,7 @@ tr_msg_list *
tr_getQueuedMessages( void ) tr_getQueuedMessages( void )
{ {
tr_msg_list * ret; tr_msg_list * ret;
tr_lockLock( messageLock ); tr_lockLock( getMessageLock( ) );
ret = messageQueue; ret = messageQueue;
messageQueue = NULL; messageQueue = NULL;
@ -155,7 +154,7 @@ tr_getQueuedMessages( void )
messageQueueCount = 0; messageQueueCount = 0;
tr_lockUnlock( messageLock ); tr_lockUnlock( getMessageLock( ) );
return ret; return ret;
} }
@ -268,9 +267,7 @@ tr_msg( const char * file, int line,
const int err = errno; /* message logging shouldn't affect errno */ const int err = errno; /* message logging shouldn't affect errno */
char buf[1024]; char buf[1024];
va_list ap; va_list ap;
tr_lockLock( getMessageLock( ) );
if( messageLock != NULL )
tr_lockLock( messageLock );
/* build the text message */ /* build the text message */
*buf = '\0'; *buf = '\0';
@ -328,9 +325,7 @@ tr_msg( const char * file, int line,
} }
} }
if( messageLock != NULL ) tr_lockUnlock( getMessageLock( ) );
tr_lockUnlock( messageLock );
errno = err; errno = err;
} }

2
libtransmission/utils.h
View file

@ -114,8 +114,6 @@ const char * tr_strip_positional_args( const char * fmt );
***** *****
****/ ****/
void tr_msgInit( void );
#define TR_MAX_MSG_LOG 10000 #define TR_MAX_MSG_LOG 10000
extern tr_msg_level messageLevel; extern tr_msg_level messageLevel;