From c7f061cafc11746384f0a1a7edd3ea67f74931c7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 27 Nov 2009 15:25:14 +0000 Subject: [PATCH] (trunk libT) make tr_msgLoggingIsActive() an inlined function. suggested by BentMyWookie --- libtransmission/session.c | 2 ++ libtransmission/utils.c | 13 ++----------- libtransmission/utils.h | 9 ++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libtransmission/session.c b/libtransmission/session.c index de7d61cca..9e398c67d 100644 --- a/libtransmission/session.c +++ b/libtransmission/session.c @@ -593,6 +593,8 @@ tr_sessionInit( const char * tag, tr_session * session; struct init_data data; + tr_msgInit( ); + assert( tr_bencIsDict( clientSettings ) ); /* initialize the bare skeleton of the session object */ diff --git a/libtransmission/utils.c b/libtransmission/utils.c index 3bb426dde..acae1f233 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -45,8 +45,8 @@ #include "version.h" +int messageLevel = 0; static tr_lock * messageLock = NULL; -static int messageLevel = 0; static tr_bool messageQueuing = FALSE; static tr_msg_list * messageQueue = NULL; static tr_msg_list ** messageQueueTail = &messageQueue; @@ -73,8 +73,7 @@ tr_timeUpdate( time_t now ) **** ***/ - -static void +void tr_msgInit( void ) { static tr_bool initialized = FALSE; @@ -301,14 +300,6 @@ tr_deepLog( const char * file, **** ***/ -int -tr_msgLoggingIsActive( int level ) -{ - tr_msgInit( ); - - return messageLevel >= level; -} - void tr_msg( const char * file, int line, int level, const char * name, diff --git a/libtransmission/utils.h b/libtransmission/utils.h index 962a88796..81dbd257a 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -123,7 +123,14 @@ void tr_assertImpl( const char * file, int line, const char * test, const char * do { if( ! ( test ) ) tr_assertImpl( __FILE__, __LINE__, #test, fmt, __VA_ARGS__ ); } while( 0 ) #endif -int tr_msgLoggingIsActive( int level ); +void tr_msgInit( void ); + +extern int messageLevel; + +static TR_INLINE tr_bool tr_msgLoggingIsActive( int level ) +{ + return messageLevel >= level; +} void tr_msg( const char * file, int line,