mirror of
https://github.com/transmission/transmission
synced 2025-03-10 14:13:23 +00:00
the libevent header file comments LIED about the return value of evbuffer_add_vprintf()!
This commit is contained in:
parent
60aab6c433
commit
476de56e45
1 changed files with 22 additions and 19 deletions
|
@ -164,7 +164,8 @@ tr_vasprintf( char **strp, const char *fmt, va_list ap )
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct evbuffer * buf = evbuffer_new( );
|
struct evbuffer * buf = evbuffer_new( );
|
||||||
if( evbuffer_add_vprintf( buf, fmt, ap ) )
|
*strp = NULL;
|
||||||
|
if( evbuffer_add_vprintf( buf, fmt, ap ) < 0 )
|
||||||
ret = -1;
|
ret = -1;
|
||||||
else {
|
else {
|
||||||
ret = EVBUFFER_LENGTH( buf );
|
ret = EVBUFFER_LENGTH( buf );
|
||||||
|
@ -188,7 +189,6 @@ tr_asprintf( char **strp, const char *fmt, ...)
|
||||||
|
|
||||||
void tr_msg( int level, const char * fmt, ... )
|
void tr_msg( int level, const char * fmt, ... )
|
||||||
{
|
{
|
||||||
tr_msg_list * newmsg;
|
|
||||||
FILE * fp;
|
FILE * fp;
|
||||||
|
|
||||||
assert( NULL != messageLock );
|
assert( NULL != messageLock );
|
||||||
|
@ -198,8 +198,7 @@ void tr_msg( int level, const char * fmt, ... )
|
||||||
|
|
||||||
if( !messageLevel )
|
if( !messageLevel )
|
||||||
{
|
{
|
||||||
char * env;
|
char * env = getenv( "TR_DEBUG" );
|
||||||
env = getenv( "TR_DEBUG" );
|
|
||||||
messageLevel = ( env ? atoi( env ) : 0 ) + 1;
|
messageLevel = ( env ? atoi( env ) : 0 ) + 1;
|
||||||
messageLevel = MAX( 1, messageLevel );
|
messageLevel = MAX( 1, messageLevel );
|
||||||
}
|
}
|
||||||
|
@ -214,8 +213,11 @@ void tr_msg( int level, const char * fmt, ... )
|
||||||
tr_vasprintf( &text, fmt, ap );
|
tr_vasprintf( &text, fmt, ap );
|
||||||
va_end( ap );
|
va_end( ap );
|
||||||
|
|
||||||
|
if( text != NULL )
|
||||||
|
{
|
||||||
if( messageQueuing )
|
if( messageQueuing )
|
||||||
{
|
{
|
||||||
|
tr_msg_list * newmsg;
|
||||||
newmsg = tr_new0( tr_msg_list, 1 );
|
newmsg = tr_new0( tr_msg_list, 1 );
|
||||||
newmsg->level = level;
|
newmsg->level = level;
|
||||||
newmsg->when = time( NULL );
|
newmsg->when = time( NULL );
|
||||||
|
@ -233,6 +235,7 @@ void tr_msg( int level, const char * fmt, ... )
|
||||||
fflush( fp );
|
fflush( fp );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tr_lockUnlock( messageLock );
|
tr_lockUnlock( messageLock );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue