don't use macros with variable number of arguments - no version of VC supports it

use existing WARN macro which falls back to printf if LOG isn't yet constructed
This commit is contained in:
Chris Danford
2007-04-24 05:24:14 +00:00
parent 44437edc12
commit 79fd5b35fd
7 changed files with 44 additions and 50 deletions
+3 -5
View File
@@ -49,8 +49,6 @@
#include "RageLog.h"
#include <errno.h>
#define WARN(...) if( LOG ) LOG->Warn( __VA_ARGS__ ); else fprintf( stderr, __VA_ARGS__ )
enum ThreadRequest
{
REQ_OPEN,
@@ -159,7 +157,7 @@ ThreadedFileWorker::ThreadedFileWorker( RString sPath ):
/* Grab a reference to the child driver. We'll operate on it directly. */
m_pChildDriver = FILEMAN->GetFileDriver( sPath );
if( m_pChildDriver == NULL )
WARN( "ThreadedFileWorker: Mountpoint \"%s\" not found", sPath.c_str() );
WARN( ssprintf("ThreadedFileWorker: Mountpoint \"%s\" not found", sPath.c_str()) );
m_pResultFile = NULL;
m_pRequestFile = NULL;
@@ -864,7 +862,7 @@ bool RageFileDriverTimeout::Move( const RString &sOldPath, const RString &sNewPa
int iRet = m_pWorker->Move( sOldPath, sNewPath );
if( iRet == -1 )
{
WARN( "RageFileDriverTimeout::Move(%s,%s) failed", sOldPath.c_str(), sNewPath.c_str() );
WARN( ssprintf("RageFileDriverTimeout::Move(%s,%s) failed", sOldPath.c_str(), sNewPath.c_str()) );
return false;
}
@@ -876,7 +874,7 @@ bool RageFileDriverTimeout::Remove( const RString &sPath )
int iRet = m_pWorker->Remove( sPath );
if( iRet == -1 )
{
WARN( "RageFileDriverTimeout::Remove(%s) failed", sPath.c_str() );
WARN( ssprintf("RageFileDriverTimeout::Remove(%s) failed", sPath.c_str()) );
return false;
}