Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove a redundant level check in tr_msg()

Browse Source
This commit is contained in:
Mitchell Livingston
2009-12-05 01:02:37 +00:00
parent 162c2f0f64
commit 8efe3f7cce
1 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/utils.c
+50 -53
View File
@@ -298,67 +298,64 @@ tr_msg( const char * file, int line,
const char * fmt, ... )
{
const int err = errno; /* message logging shouldn't affect errno */
char buf[MAX_STACK_ARRAY_SIZE];
va_list ap;
tr_lockLock( messageLock );
if( messageLevel >= level )
/* build the text message */
*buf = '\0';
va_start( ap, fmt );
evutil_vsnprintf( buf, sizeof( buf ), fmt, ap );
va_end( ap );
OutputDebugString( buf );
if( *buf )
{
char buf[MAX_STACK_ARRAY_SIZE];
va_list ap;
/* build the text message */
*buf = '\0';
va_start( ap, fmt );
evutil_vsnprintf( buf, sizeof( buf ), fmt, ap );
va_end( ap );
OutputDebugString( 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 );
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;
*messageQueueTail = newmsg;
messageQueueTail = &newmsg->next;
++messageQueueCount;
if (messageQueueCount > TR_MAX_MSG_LOG)
{
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;
fp = tr_getLog( );
if( fp == NULL )
fp = stderr;
tr_getLogTimeStr( timestr, sizeof( timestr ) );
if( name )
fprintf( fp, "[%s] %s: %s\n", timestr, name, buf );
else
{
char timestr[64];
FILE * fp;
fp = tr_getLog( );
if( fp == NULL )
fp = stderr;
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 );
}
fprintf( fp, "[%s] %s\n", timestr, buf );
fflush( fp );
}
}