colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change uses of _DEBUG and _DEBUG_DB defines to be DEBUG, since that's the only symbol that gets defined by configuring with --enable-debug.

This commit is contained in:
Brian Cox 2017-04-12 21:44:51 -07:00
parent a1e614d694
commit 8ba032c424
52 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/archive.cpp
View File

@ -421,7 +421,7 @@ void cMemoryArchive::AllocateMemory(int len) // throw(eArchive)
{
// grow the buffer
// only error if we are in debug mode
#ifdef _DEBUG
#ifdef DEBUG
if (len > mMaxAllocatedLen)
ThrowAndAssert(eArchiveOutOfMem());
#endif

2
src/core/cmdlineparser.cpp
View File

@ -378,7 +378,7 @@ void cCmdLineParser::AddDependency(int argId1, int argId2, bool mutual )
///////////////////////////////////////////////////////////////////////////////
// TraceContents
///////////////////////////////////////////////////////////////////////////////
#ifdef _DEBUG
#ifdef DEBUG
void cCmdLineParser::TraceContents(int dl)
{
cDebug d("cCmdLineParser::TraceContents");

2
src/core/cmdlineparser.h
View File

@ -139,7 +139,7 @@ public:
// given an argId, fill out the strings with the argument and alias strings. Returns false
// if the argId cannot be found. This method is not very fast, so don't use it often.
#ifdef _DEBUG
#ifdef DEBUG
void TraceContents(int dl = -1) ;
#endif
private:

4
src/core/codeconvert.cpp
View File

@ -496,7 +496,7 @@ namespace /*Unique*/
d.TraceDebug( "Converted to: %s\n", util_output_bytes( (void*)pConvertedTo, nTo ).c_str() );
char aBuffer[ MB_LEN_MAX ];
#ifdef _DEBUG
#ifdef DEBUG
for( size_t foo = 0; foo < sizeof( aBuffer ); foo++ )
aBuffer[ foo ] = 0xCD;
#endif
@ -651,7 +651,7 @@ namespace /*Unique*/
{
cDebug d( "tss_Converter< BufferT, SourceT >()" );
#ifdef _DEBUG
#ifdef DEBUG
for( size_t s = nBufferItems; s; s-- )
pBuffer[s] = 0xCD;
d.TraceDebug( "sizeof buffer: %d, sizeof source: %d\n", sizeof( BufferT ), sizeof( SourceT ) );

2
src/core/debug.cpp
View File

@ -307,7 +307,7 @@ void cDebug::DebugOut( const char* lpOutputString, ... )
vsnprintf(buf, 2048, lpOutputString, args);
va_end(args);
#ifdef _DEBUG
#ifdef DEBUG
TCERR << buf;
#endif //_DEBUG

4
src/core/debug.h
View File

@ -156,11 +156,11 @@ private:
#endif
};
#ifdef _DEBUG
#ifdef DEBUG
#define TRACE cDebug::DebugOut
#else
#define TRACE 1 ? (void)0 : cDebug::DebugOut
#endif // _DEBUG
#endif // DEBUG
//////////////////////////////////////////////////////////////////////////////////
// inline implementation

4
src/core/errortable.cpp
View File

@ -35,7 +35,7 @@
#include "stdcore.h"
#include "errortable.h"
#ifdef _DEBUG
#ifdef DEBUG
#include "package.h"
#include "corestrings.h"
#endif
@ -52,7 +52,7 @@ cErrorTable* cErrorTable::GetInstance()
///////////////////////////////////////////////////////////////////////////////
// AssertMsgValidity
///////////////////////////////////////////////////////////////////////////////
#ifdef _DEBUG
#ifdef DEBUG
void cErrorTable::AssertMsgValidity(const TCHAR* msg)
{
// Check to see that the first part of this error message is not too long.

4
src/core/errortable.h
View File

@ -66,14 +66,14 @@ public:
static cErrorTable* GetInstance();
private:
#ifdef _DEBUG
#ifdef DEBUG
static void AssertMsgValidity(const TCHAR* msg);
#endif
};
inline void cErrorTable::Put( const eError& e, const TCHAR* msg )
{
#ifdef _DEBUG
#ifdef DEBUG
AssertMsgValidity(msg);
#endif

2
src/core/file_unix.cpp
View File

@ -322,7 +322,7 @@ cFile::File_t cFile::Seek( File_t offset, SeekFrom From) const //throw(eFile)
if (fseeko( mpData->mpCurrStream, offset, apiFrom ) != 0)
{
#ifdef _DEBUG
#ifdef DEBUG
cDebug d("cFile::Seek");
d.TraceDebug("Seek failed!\n");
#endif

4
src/core/fileheader.cpp
View File

@ -111,7 +111,7 @@ void cFileHeaderID::Write(iSerializer* pSerializer) const // throw (eSerializer,
cFileHeader::cFileHeader()
: mVersion(0)
{
#ifdef _DEBUG
#ifdef DEBUG
mEncoding = LAST_ENCODING; // set to invalid value so we can assert on write
#else
mEncoding = NO_ENCODING;
@ -213,7 +213,7 @@ void cFileHeader::Read(iSerializer* pSerializer, int32 /*version*/) // throw (eS
void cFileHeader::Write(iSerializer* pSerializer) const // throw (eSerializer, eArchive)
{
#ifdef _DEBUG
#ifdef DEBUG
// check that we set some values
cFileHeaderID id;
ASSERT(mID != id);

6
src/core/hashtable.h
View File

@ -172,7 +172,7 @@ public:
int32 GetNumValues() const { return mValuesInTable; };
// returns number of table entries filled
#ifdef _DEBUG
#ifdef DEBUG
void TraceDiagnostics() const;
// traces hash table statistics
#endif
@ -503,7 +503,7 @@ uint32 cHashTable<KEY_TYPE, VAL_TYPE, COMPARE_OP, CONVERTER>::Hash( const KEY_TY
return hindex;
}
#ifdef _DEBUG
#ifdef DEBUG
template <class KEY_TYPE, class VAL_TYPE, class COMPARE_OP, class CONVERTER>
void cHashTable<KEY_TYPE, VAL_TYPE, COMPARE_OP, CONVERTER>::TraceDiagnostics() const
@ -537,7 +537,7 @@ void cHashTable<KEY_TYPE, VAL_TYPE, COMPARE_OP, CONVERTER>::TraceDiagnostics() c
d.TraceDebug("-- Slots with >1 item: %d (%lf %%)\n",numMultiSlot, ((double)numMultiSlot / (double)slotsFilled) * 100.0);
d.TraceDebug("--------------------------------------------------\n");
}
#endif // _DEBUG
#endif // DEBUG
#endif //__HASHTABLE_H

2
src/core/ntmbs.cpp
View File

@ -46,7 +46,7 @@
// Module-wide Helpers
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#ifndef TSS_Raise // Should add file and line info in _DEBUG mode!!!!
#ifndef TSS_Raise // Should add file and line info in DEBUG mode!!!!
#define TSS_Raise( Xcpt, pkg, ids ) \
throw Xcpt( TSS_GetString( pkg, ids ) )

6
src/core/package.h
View File

@ -142,17 +142,17 @@
Messages m_messages // Decare a Stringtable
#ifdef _DEBUG
#ifdef DEBUG
#define TSS_BeginStringtable( pkg ) \
void pkg::LoadStrings() \
{ cDebug d( #pkg "::LoadStrings()" ); \
d.TraceDebug("Loading strings for " #pkg " package.\n"); \
Messages::Pair astr[] = { // Define a Stringtable
#else // _DEBUG
#else // DEBUG
#define TSS_BeginStringtable( pkg ) \
void pkg::LoadStrings() \
{ Messages::Pair astr[] = { // Define a Stringtable
#endif // _DEBUG
#endif // DEBUG
#define TSS_EndStringtable( pkg ) \
}; m_messages.Put( \

12
src/core/refcountobj.cpp
View File

@ -41,7 +41,7 @@
#include "errorutil.h"
#ifdef _DEBUG
#ifdef DEBUG
int cRefCountObj::objectCounter = 0;
int cRefCountObj::referenceCounter = 0;
@ -68,7 +68,7 @@ struct cRefCountObj_Debug
}
} gRefCountObj_Debug;
#endif // _DEBUG
#endif // DEBUG
cRefCountObj::cRefCountObj()
{
@ -76,7 +76,7 @@ cRefCountObj::cRefCountObj()
//std::cout << "Allocated RefObj(" << std::hex << (int)this << ")\n";
#ifdef _DEBUG
#ifdef DEBUG
++objectCounter;
++referenceCounter;
@ -95,7 +95,7 @@ cRefCountObj::~cRefCountObj()
//std::cout << "Deleted RefObj(" << std::hex << (int)this << ")\n";
#ifdef _DEBUG
#ifdef DEBUG
--objectCounter;
cDebug d("cRefCountObj::~cRefCountObj");
d.TraceNever("Object Destroyed[%p] %s Objects Left = %d\n", this, typeid(*this).name(), objectCounter);
@ -128,7 +128,7 @@ void cRefCountObj::AddRef() const
++mRefCount;
#ifdef _DEBUG
#ifdef DEBUG
++referenceCounter;
#endif
}
@ -140,7 +140,7 @@ void cRefCountObj::Release() const
Delete();
}
#ifdef _DEBUG
#ifdef DEBUG
--referenceCounter;
#endif
}

2
src/core/refcountobj.h
View File

@ -77,7 +77,7 @@ protected:
private:
mutable int mRefCount;
#ifdef _DEBUG
#ifdef DEBUG
private:
static int objectCounter;
static int referenceCounter;

2
src/core/resources.h
View File

@ -241,7 +241,7 @@ Resource_Class::Get( ConstKeyRef id ) const
if ( at == m_table.end() )
{
#ifdef _DEBUG
#ifdef DEBUG
std::cerr << "*** Error Resource_Class::Get() [" __FILE__ ":" << __LINE__ << "]: Resource not found\n";
#endif

2
src/core/serializerimpl.cpp
View File

@ -274,7 +274,7 @@ iTypedSerializable* cSerializerImpl::ReadObjectDynCreate()
// unable to find the creation function...
d.TraceError("Unable to find creation function for non-ref counted object %d\n", crc);
TOSTRINGSTREAM str;
#ifdef _DEBUG
#ifdef DEBUG
// Let's only report the actual crc in debug mode
str << (int32)crc << std::ends;
#endif

2
src/core/srefcounttbl.cpp
View File

@ -119,7 +119,7 @@ int cSerRefCountTable::Add(const iSerRefCountObj* pObj, int id)
// creates a new cSerRefCountTable
void cSerRefCountTableMap::AddSerializer(const cSerializer* pSerializer)
{
#ifdef _DEBUG
#ifdef DEBUG
// make sure we don't have this serialzier in here yet
{
std::map<const cSerializer*, cSerRefCountTable*>::iterator itr;

2
src/core/stdcore.h
View File

@ -62,7 +62,7 @@
#pragma warning( disable: 4100 ) // Formal argument not used
#pragma warning( disable: 4710 ) // Compiler did not inline function
#ifndef _DEBUG // ASSERT's are disabled give a lot of these
#ifndef DEBUG // ASSERT's are disabled give a lot of these
#pragma warning( disable: 4702 ) // ---Unreachable Code
#endif

2
src/db/blockfile.cpp
View File

@ -326,7 +326,7 @@ void cBlockFile::AssertValid() const
//
// make sure the archive length and block count match up
//
#ifdef _DEBUG
#ifdef DEBUG
if (mpArchive->Length() != (GetBlockSize() * GetNumBlocks()))
{
cDebug d("cBlockFile::AssertValid");

2
src/db/blockfile.h
View File

@ -46,7 +46,7 @@
#include "block.h"
#endif
#ifdef _DEBUG
#ifdef DEBUG
#undef _BLOCKFILE_DEBUG // If we dont do this, test does not compile on unix
#define _BLOCKFILE_DEBUG // If we dont do this, test does not compile on unix
#endif

28
src/fco/fconame.cpp
View File

@ -97,7 +97,7 @@ cFCOName::cFCOName(iFCONameInfo* pNI) :
{
SetNameInfo(pNI);
mpPathName = new cFCOName_i;
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
cDebug d("cFCOName::cFCOName(iFCONameInfo*)");
d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount());
@ -111,7 +111,7 @@ cFCOName::cFCOName(const cFCOName& rhs) :
mbCaseSensitive(rhs.mbCaseSensitive)
{
mpPathName->AddRef();
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
cDebug d("cFCOName::cFCOName(cFCOName&)");
d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount());
@ -125,7 +125,7 @@ cFCOName::cFCOName(const TSTRING& rhs, iFCONameInfo* pNI) :
mpPathName = new cFCOName_i;
ParseString(rhs.c_str());
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
cDebug d("cFCOName::cFCOName(cFCOName&,iFCONameInfo*)");
d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount());
@ -139,7 +139,7 @@ cFCOName::cFCOName(const TCHAR* rhs, iFCONameInfo* pNI) :
mpPathName = new cFCOName_i;
ParseString(rhs);
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
cDebug d("cFCOName::cFCOName(cFCOName&,iFCONameInfo*)");
d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount());
@ -148,7 +148,7 @@ cFCOName::cFCOName(const TCHAR* rhs, iFCONameInfo* pNI) :
cFCOName::~cFCOName()
{
#ifdef _DEBUG
#ifdef DEBUG
cDebug d("cFCOName::~cFCOName()");
d.TraceNever(_T("destructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount());
#endif
@ -168,7 +168,7 @@ void cFCOName::SetNameInfo(iFCONameInfo* pNI)
mbCaseSensitive = iTWFactory::GetInstance()->GetNameInfo()->IsCaseSensitive();
mDelimiter = iTWFactory::GetInstance()->GetNameInfo()->GetDelimitingChar();
}
#ifdef _DEBUG
#ifdef DEBUG
if( mpPathName != NULL ) // this could be called from the constructor before this is initialized.
mDebugStrName = AsString();
#endif
@ -185,7 +185,7 @@ cFCOName& cFCOName::operator = (const cFCOName& rhs)
mpPathName->AddRef();
mDelimiter = rhs.mDelimiter;
mbCaseSensitive = rhs.mbCaseSensitive;
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
return *this;
@ -194,7 +194,7 @@ cFCOName& cFCOName::operator = (const cFCOName& rhs)
cFCOName& cFCOName::operator = (const TSTRING& rhs)
{
*this = rhs.c_str();
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
return *this;
@ -210,7 +210,7 @@ cFCOName& cFCOName::operator = (const TCHAR* rhs)
mpPathName = new cFCOName_i;
}
ParseString(rhs);
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
return *this;
@ -320,7 +320,7 @@ void cFCOName::Clear()
{
Pop();
}
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
}
@ -392,7 +392,7 @@ void cFCOName::Read(iSerializer* pSerializer, int32 version)
mbCaseSensitive = true;
ParseString(str.c_str());
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
}
@ -443,7 +443,7 @@ void cFCOName::Push(const TSTRING& str)
cFCONameTblNode* pNode = cFCOName_i::msNameTbl.CreateNode(str);
mpPathName->mNames.push_back(pNode);
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
}
@ -465,7 +465,7 @@ const TCHAR* cFCOName::Pop()
ASSERT(pNode->GetRefCount() > 1);
const TCHAR* ret = pNode->GetString();
pNode->Release();
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
return ret;
@ -489,7 +489,7 @@ const TCHAR* cFCOName::PopFront()
ASSERT(pNode->GetRefCount() > 1);
const TCHAR* ret = pNode->GetString();
pNode->Release();
#ifdef _DEBUG
#ifdef DEBUG
mDebugStrName = AsString();
#endif
return ret;

2
src/fco/fconame.h
View File

@ -153,7 +153,7 @@ protected:
//
typedef std::vector<cFCONameTblNode*> ListType;
#ifdef _DEBUG
#ifdef DEBUG
TSTRING mDebugStrName; // so we can see this guy's value in the debug window
#endif
};

2
src/fco/fconametbl.cpp
View File

@ -156,7 +156,7 @@ cFCONameTbl::cFCONameTbl(int defSize) :
cFCONameTbl::~cFCONameTbl()
{
#ifdef _DEBUG
#ifdef DEBUG
cDebug d("cFCONameTbl::~cFCONameTbl()");
d.TraceDebug("Tracing cFCONameTblNode hash table statistics:\n");
mTable.TraceDiagnostics();

4
src/fco/fcosetws.h
View File

@ -112,7 +112,7 @@ inline void cFCOSetWS::SetSpec(const iFCOSpec* pSpec)
inline void cFCOSetWS::Insert(iFCO* pFCO)
{
// here is the only real work this class does!
#ifdef _DEBUG
#ifdef DEBUG
// TODO -- note that this doesn't do any checking if the spec is NULL. I
// am not sure if this is the right thing to do or not.
if(mpSpec)
@ -127,7 +127,7 @@ inline void cFCOSetWS::Insert(iFCO* pFCO)
mpSpec->TraceContents(cDebug::D_ERROR);
}
}
#endif // _DEBUG
#endif // DEBUG
cFCOSetImpl::Insert(pFCO);
}

10
src/fco/fcospecimpl.cpp
View File

@ -41,7 +41,7 @@
#include "fcospechelper.h"
#include "core/errorutil.h"
#ifdef _DEBUG
#ifdef DEBUG
int gFCOSpecImplCreated = 0;
int gFCOSpecImplDestroyed = 0;
#endif
@ -53,7 +53,7 @@ cFCOSpecImpl::cFCOSpecImpl(const TSTRING& name, void* pSrc, iFCOSpecHelper* pHel
mName(name),
mpHelper(pHelper)
{
#ifdef _DEBUG
#ifdef DEBUG
++gFCOSpecImplCreated;
cDebug d("cFCOSpecImpl::cFCOSpecImpl()");
d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed);
@ -65,7 +65,7 @@ cFCOSpecImpl::cFCOSpecImpl() :
mName(_T("Unnamed_FCOSpecImpl")),
mpHelper(0)
{
#ifdef _DEBUG
#ifdef DEBUG
++gFCOSpecImplCreated;
cDebug d("cFCOSpecImpl::cFCOSpecImpl()");
d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed);
@ -77,7 +77,7 @@ cFCOSpecImpl::cFCOSpecImpl(const cFCOSpecImpl& rhs) :
mpHelper(0)
{
*this = rhs;
#ifdef _DEBUG
#ifdef DEBUG
++gFCOSpecImplCreated;
cDebug d("cFCOSpecImpl::cFCOSpecImpl()");
d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed);
@ -86,7 +86,7 @@ cFCOSpecImpl::cFCOSpecImpl(const cFCOSpecImpl& rhs) :
cFCOSpecImpl::~cFCOSpecImpl()
{
#ifdef _DEBUG
#ifdef DEBUG
++gFCOSpecImplDestroyed;
cDebug d("cFCOSpecImpl::cFCOSpecImpl()");
d.TraceDetail("Deleted cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed);

4
src/fco/signature.cpp
View File

@ -267,7 +267,7 @@ void cNullSignature::Read(iSerializer* pSerializer, int32 version)
if (version > Version())
ThrowAndAssert(eSerializerVersionMismatch(_T("Null Signature Read")));
#ifdef _DEBUG
#ifdef DEBUG
int16 ret;
pSerializer->ReadInt16(ret);
ASSERT(ret == 123);
@ -276,7 +276,7 @@ void cNullSignature::Read(iSerializer* pSerializer, int32 version)
void cNullSignature::Write(iSerializer* pSerializer) const
{
#ifdef _DEBUG
#ifdef DEBUG
pSerializer->WriteInt16(123);
#endif
}

8
src/fs/fsobject.cpp
View File

@ -45,7 +45,7 @@
IMPLEMENT_SERREFCOUNT(cFSObject, _T("FSObject"), 0, 1)
// Debug stuff
#ifdef _DEBUG
#ifdef DEBUG
static int gNumFSObjectCreate = 0;
static int gNumFSObjectDestroy = 0;
@ -75,7 +75,7 @@ public:
cFSObject::cFSObject(const cFCOName& name) :
mName(name)
{
#ifdef _DEBUG
#ifdef DEBUG
gNumFSObjectCreate++;
#endif
}
@ -83,14 +83,14 @@ cFSObject::cFSObject(const cFCOName& name) :
cFSObject::cFSObject() :
mName(_T("undefined"))
{
#ifdef _DEBUG
#ifdef DEBUG
gNumFSObjectCreate++;
#endif
}
cFSObject::~cFSObject()
{
#ifdef _DEBUG
#ifdef DEBUG
gNumFSObjectDestroy++;
#endif
}

2
src/fs/fsobject.h
View File

@ -82,7 +82,7 @@ public:
virtual void TraceContents(int dl = -1) const;
#ifdef _DEBUG
#ifdef DEBUG
static void TraceStats() ;
// this TRACEs statistics on FSObject usage that is pertinent to performance or mem leakage
// concerns.

2
src/fs/fspropcalc.cpp
View File

@ -399,7 +399,7 @@ void cFSPropCalc::VisitFSObject(cFSObject& obj)
propsToCheck ^= inBoth;
}
#ifdef _DEBUG
#ifdef DEBUG
d.TraceDetail("----->Collision Action = %s\n", mCollAction == iFCOPropCalc::PROP_LEAVE ? "Leave" : "Replace");
d.TraceDetail("----->Object's valid properties (a):\n");
obj.GetPropSet()->GetValidVector().TraceContents(cDebug::D_DETAIL);

4
src/parser/tokens.l
View File

@ -311,12 +311,12 @@ END {WS}*{DIRECTIVE}{WS}*end
*mpstring = strW;
#ifdef _DEBUG
#ifdef DEBUG
TSTRING strDisplay = *mpstring;
cDisplayEncoder e;
e.Encode( strDisplay );
d.TraceDetail("interpreted as --> <%s>\n", strDisplay.c_str());
#endif // _DEBUG
#endif // DEBUG
// attach to lval
yylval.mpString = mpstring;

2
src/tripwire/integritycheck.cpp
View File

@ -324,7 +324,7 @@ void cIntegrityCheck::ProcessDir( cDbDataSourceIter dbIter, iFCODataSourceIter*
return;
}
#ifdef _DEBUG
#ifdef DEBUG
if( dbIter.Done() )
{
d.TraceDebug( "Processing directory %s\n", pIter->GetParentName().AsString().c_str() );

4
src/tripwire/tripwiremain.cpp
View File

@ -64,7 +64,7 @@ static TSTRING util_GetWholeCmdLine( int argc, const TCHAR *argv[] );
// global new() and delete() overrides -- this is done to do performance testing
///////////////////////////////////////////////////////////////////////////////
/*
#ifdef _DEBUG
#ifdef DEBUG
#if defined(HAVE_MALLOC_H)
#include <malloc.h>
#endif
@ -269,7 +269,7 @@ exit:
// print out the max memory usage...
/*
#ifdef _DEBUG
#ifdef DEBUG
TCOUT << _T("Maximum memory footprint = ") << gMaxAlloc << std::endl;
#endif
*/

12
src/tripwire/twcmdline.cpp
View File

@ -158,7 +158,7 @@ iTWMode* cTWCmdLine::GetMode(int argc, const TCHAR *const * argv)
else if (_tcscmp(argv[1], _T("--test")) == 0)
mode = MODE_TEST;
#ifdef _DEBUG_DB
#ifdef DEBUG
if (_tcscmp(argv[1], _T("--explore")) == 0)
mode = MODE_EXPLORE;
if (_tcscmp(argv[1], _T("--verifydb")) == 0)
@ -204,8 +204,8 @@ iTWMode* cTWCmdLine::GetMode(int argc, const TCHAR *const * argv)
pRtn = new cTWModeVersion;
break;
//Explore and Debug modes are invisible unless _DEBUG_DB is defined.
#ifdef _DEBUG_DB
//Explore and Debug modes are invisible unless DEBUG is defined.
#ifdef DEBUG
case cTWCmdLine::MODE_EXPLORE:
pRtn = new cTWModeExploreDb;
break;
@ -2441,7 +2441,7 @@ int cTWModeHelp::Execute(cErrorQueue* pQueue)
TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_UPDATE );
TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_UPDATE_POLICY );
TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_TEST );
#ifdef _DEBUG_DB
#ifdef DEBUG
// TODO: Do we need help messages for these modes? DRA
#endif
//We're done, return
@ -2539,7 +2539,7 @@ bool util_GetEditor( TSTRING& strEd )
//Encase the explore and debug modes in this ifdef, since they are for internal
//use only.
#ifdef _DEBUG_DB
#ifdef DEBUG
//#############################################################################
// cTWModeExploreDb
@ -2724,6 +2724,6 @@ int cTWModeDebugDb::Execute(cErrorQueue* pQueue)
}
#endif //_DEBUG_DB
#endif //DEBUG

6
src/tripwire/twcmdline.h
View File

@ -361,8 +361,8 @@ private:
cTWModeHelp_i* mpData;
};
//These two modes are invisible if _DEBUG_DB is not defined.
#ifdef _DEBUG_DB
//These two modes are invisible if DEBUG is not defined.
#ifdef DEBUG
///////////////////////////////////////////////////////////////////////////////
// Explore Db
@ -404,7 +404,7 @@ private:
cTWModeDebugDb_i* mpData;
};
#endif //_DEBUG_DB
#endif //DEBUG
///////////////////////////////////////////////////////////////////////////////
// Version Mode

4
src/tw/configfile.cpp
View File

@ -238,7 +238,7 @@ void cConfigFile::WriteString( TSTRING& configText ) // throw( eFSServices )
void cConfigFile::ReadString(const TSTRING configText) // throw( eConfigFile );
{
#ifdef _DEBUG
#ifdef DEBUG
// NOTE:BAM -- debug only code !
TCERR << _T("*** begin config text ***") << std::endl;
TCERR << configText << std::endl;
@ -266,7 +266,7 @@ void cConfigFile::ReadString(const TSTRING configText) // throw( eConfigFile );
CheckThatAllMandatoryKeyWordsExists();
#ifdef _DEBUG
#ifdef DEBUG
// NOTE:BAM -- debug only code !
TSTRING sTemp;
WriteString( sTemp );

4
src/tw/dbdatasource.cpp
View File

@ -64,14 +64,14 @@ cDbDataSourceIter::cDbDataSourceIter(cHierDatabase* pDb, int genreNum )
genreNum = cGenreSwitcher::GetInstance()->CurrentGenre();
mFCOCreateFunc = cGenreSwitcher::GetInstance()->GetFactoryForGenre( (cGenre::Genre)genreNum )->GetCreateFunc();
#ifdef _DEBUG
#ifdef DEBUG
//
// make some assertions about the current genre's name info
//
iFCONameInfo* pNameInfo = cGenreSwitcher::GetInstance()->GetFactoryForGenre( (cGenre::Genre)genreNum )->GetNameInfo();
ASSERT( pDb->IsCaseSensitive() == pNameInfo->IsCaseSensitive() );
ASSERT( pDb->GetDelimitingChar() == pNameInfo->GetDelimitingChar() );
#endif //#ifdef _DEBUG
#endif //#ifdef DEBUG
}
///////////////////////////////////////////////////////////////////////////////

2
src/tw/fcodatabasefile.cpp
View File

@ -62,7 +62,7 @@ cFCODatabaseFile::tEntry::tEntry( cGenre::Genre genre )
}
cFCODatabaseFile::cFCODatabaseFile()
#ifdef _DEBUG
#ifdef DEBUG
: mFileName( _T("Unknown file name") )
#else
: mFileName( _T("") ) // If we don't know the filename, lets just not have one in release mode.

2
src/tw/fcoreport.cpp
View File

@ -722,7 +722,7 @@ void cFCOReport::AddChangedFCO(const cFCOReportSpecIter& iter, const iFCO* pOldF
// make some assertions about the iterator
#ifdef _DEBUG
#ifdef DEBUG
// make sure iter points to one of our spec lists
cFCOReport_i::GenreSpecList::iterator genreIter;
for (genreIter = mpData->mGenreList.begin(); ; ++genreIter)

2
src/tw/textreportviewer.cpp
View File

@ -2006,7 +2006,7 @@ void cTextReportViewer::GetChar()
// sequence was not a valid mb character
// (searched MB_CUR_MAX chars and didn't find a complete mb character)
d.TraceDebug( _T("Invalid mb char found!\n") );
#ifdef _DEBUG
#ifdef DEBUG
for( int j = 0; j < MB_CUR_MAX; j++ )
d.TraceDebug( _T("%u\n"), (size_t)(unsigned char)mCurrentChar[j] );
#endif

2
src/tw/twinit.cpp
View File

@ -292,7 +292,7 @@ void cTWInit::Init( const TSTRING& strArgv0 )
tw_HandleSignal( SIGSEGV ); // Segmentation fault
tw_HandleSignal( SIGQUIT ); // Quit signal - issued from terminal (CTRL-\)
tw_HandleSignal( SIGILL ); // Illegal instruction - probably won't be an issue.
#ifndef _DEBUG
#ifndef DEBUG
tw_HandleSignal( SIGTRAP ); // We don't want to mess up the debugger in debug builds...
#endif
tw_HandleSignal( SIGABRT ); // Supposedly we can only get this signal by calling abort()

2
src/tw/twstrings.cpp
View File

@ -42,7 +42,7 @@
#define UNICODE_STR _T("")
#ifdef _DEBUG
#ifdef DEBUG
# define DEBUG_STR _T("d")
#else
# define DEBUG_STR _T("")

2
src/tw/twutil.cpp
View File

@ -1126,7 +1126,7 @@ static struct termios Otty;
static void RestoreEcho(int sig)
{
#if SUPPORTS_TERMIOS
#ifdef _DEBUG
#ifdef DEBUG
std::cout << "Caught signal, resetting echo."<< std::endl;
sleep(2);
#endif

8
src/twadmin/keygeneration.cpp
View File

@ -85,7 +85,7 @@ static void GeneratePublicPrivateKeys(void* pParams, const cElGamalSig::KeySize
try {
cKeyFile keyfile;
#ifdef _DEBUG
#ifdef DEBUG
cDebug d("GeneratePublicPrivateKeys");
d.TraceDebug("calling keyfile.GenerateKeys()\n");
#endif
@ -101,7 +101,7 @@ static void GeneratePublicPrivateKeys(void* pParams, const cElGamalSig::KeySize
return;
}
#ifdef _DEBUG
#ifdef DEBUG
d.TraceDebug(_T("writing to keyfile %s\n"), pGK->keyPath);
#endif
@ -135,7 +135,7 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig
passphrase.swapbytes();
#endif
#ifdef _DEBUG
#ifdef DEBUG
// test reading in the keys
wc16_string passphrase_copy = passphrase.c_str();
wc16_string passphrase_copy2 = passphrase.c_str();
@ -169,7 +169,7 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig
return false;
}
#ifdef _DEBUG
#ifdef DEBUG
// test reading in the keys
cKeyFile keyfile;

10
src/twcrypto/crypto.cpp
View File

@ -476,7 +476,7 @@ void cRSAPublicKey::Write(void* pDataStream) const
WRITE_INTEGER(e);
}
#ifdef _DEBUG
#ifdef DEBUG
void cRSAPublicKey::TraceContents()
{
cDebug d("cRSAPublicKey::TraceContents");
@ -687,7 +687,7 @@ void cRSA::GenerateKeys(cRSAPrivateKey*& retPrivate, cRSAPublicKey*& retPublic)
retPublic->mpData->mpKey = pNewPublicKey;
retPublic->mpData->mKeyLength = mpData->mKeyBits;
#ifdef _DEBUG
#ifdef DEBUG
int l;
l = retPublic->mpData->mpKey->MaxPlainTextLength();
ASSERT(l == GetBlockSizePlain());
@ -954,7 +954,7 @@ bool cElGamalSigPublicKey::IsEqual(const cElGamalSigPublicKey& rhs) const
;
}
#ifdef _DEBUG
#ifdef DEBUG
void cElGamalSigPublicKey::TraceContents()
{
cDebug d("cElGamalSigPublicKey::TraceContents");
@ -1167,7 +1167,7 @@ void cElGamalSig::GenerateKeys(cElGamalSigPrivateKey*& retPrivate, cElGamalSigPu
retPublic->mpData->mpKey = pNewPublicKey;
retPublic->mpData->mKeyLength = (int16)mpData->mKeyBits;
#ifdef _DEBUG
#ifdef DEBUG
int l;
l = retPublic->mpData->mpKey->SignatureLength();
ASSERT(l + PLAIN_BLOCK_SIZE <= GetBlockSizeCipher());
@ -1250,7 +1250,7 @@ void RandomizeBytes(int8* destbuf, int len)
for (mask = 0xb147688c; time(NULL) - start < 1; mask += 0x8984cc88)
;
#ifdef _DEBUG
#ifdef DEBUG
time_t t = time(NULL);
t ^= mask;

4
src/twcrypto/crypto.h
View File

@ -209,7 +209,7 @@ public:
int GetWriteLen() const;
void Write(void* pDataStream) const;
#ifdef _DEBUG
#ifdef DEBUG
void TraceContents();
#endif
@ -315,7 +315,7 @@ public:
// This is used to make sure the key used to sign the config
// file is the same as the key we are currently using.
#ifdef _DEBUG
#ifdef DEBUG
void TraceContents();
#endif

2
src/twcrypto/keyfile.cpp
View File

@ -398,7 +398,7 @@ void cKeyFile::ProtectKeys(int8* passphrase, int passphraseLen) // throw eKeyFil
des.ProcessBlock(mpPrivateKeyMem + i, mpPrivateKeyMem + i);
}
#ifdef _DEBUG
#ifdef DEBUG
// try decoding it just to see if it worked
if (GetPrivateKey(passphrase, passphraseLen) == 0)
{

8
src/twparser/parserhelper.cpp
View File

@ -64,7 +64,7 @@ static bool util_IsOctal( const char ch );
static int util_GetEscapeValueOfChar( char ch );
static int util_GetRecurseDepth( const cParseNamedAttrList* pList ); //throw( eParserHelper )
static void util_LoseSurroundingWS( TSTRING& str );
#ifdef _DEBUG
#ifdef DEBUG
static bool util_AsciiCharsActLikeTheyShould();
#endif
@ -226,7 +226,7 @@ void cPreprocessor::PopState()
ASSERT( ! mStateStack.empty() );
mStateStack.pop();
#ifdef _DEBUG
#ifdef DEBUG
if( !Empty() && TopState() == STATE_ACCEPT )
d.TraceDebug(_T("State == STATE_ACCEPT\n"));
else
@ -502,7 +502,7 @@ void cParserUtil::InterpretEscapedString( const std::string& strEscapedString, T
}
}
#ifdef _DEBUG
#ifdef DEBUG
std::string str;
str = "before: <";
@ -1085,7 +1085,7 @@ void util_LoseSurroundingWS( TSTRING& str )
}
#ifdef _DEBUG
#ifdef DEBUG
bool util_AsciiCharsActLikeTheyShould()
{
// we need numbers whose character

4
src/twparser/policyparser.cpp
View File

@ -170,7 +170,7 @@ std::string cPolicyParser::ConvertMultibyte( std::istream& in )
throw eParserBadCharacter();
}
#ifdef _DEBUG
#ifdef DEBUG
TCERR << _T("*** begin policy text ***") << std::endl;
std::cerr << ss.str() << std::endl;
TCERR << _T("*** end policy text ***") << std::endl << std::endl;
@ -179,7 +179,7 @@ std::string cPolicyParser::ConvertMultibyte( std::istream& in )
// convert it to single byte escaped
std::string str = util_ConvertMB( ss.str() );
#ifdef _DEBUG
#ifdef DEBUG
TCERR << _T("*** begin policy converted to ***") << std::endl;
std::cerr << str << std::endl;
TCERR << _T("*** end policy converted to ***") << std::endl << std::endl;

4
src/twparser/yylex.cpp
View File

@ -1121,12 +1121,12 @@ yy_scan::yylex()
*mpstring = strW;
#ifdef _DEBUG
#ifdef DEBUG
TSTRING strDisplay = *mpstring;
cDisplayEncoder e;
e.Encode( strDisplay );
d.TraceDetail("interpreted as --> <%s>\n", strDisplay.c_str());
#endif // _DEBUG
#endif // DEBUG
// attach to lval
yylval.mpString = mpstring;

6
src/twtest/cmdlineparser_t.cpp
View File

@ -88,7 +88,7 @@ const TCHAR* argv5[] =
_T("frog")
};
#ifdef _DEBUG
#ifdef DEBUG
static void PrintCmdLine(int argc, const TCHAR** argv, cDebug d)
{
TSTRING str;
@ -104,7 +104,7 @@ static void PrintCmdLine(int argc, const TCHAR** argv, cDebug d)
static void test_parse(cCmdLineParser& parser, const int argc, const TCHAR** argv, bool should_throw)
{
#ifdef _DEBUG
#ifdef DEBUG
cDebug d("test_parse");
PrintCmdLine(argc, argv, d);
#endif
@ -122,7 +122,7 @@ static void test_parse(cCmdLineParser& parser, const int argc, const TCHAR** arg
TEST(threw == should_throw);
#ifdef _DEBUG
#ifdef DEBUG
parser.TraceContents();
#endif
}

2
src/twtest/hashtable_t.cpp
View File

@ -110,7 +110,7 @@ void HashTest1()
}
// get statistics
#ifdef _DEBUG
#ifdef DEBUG
htable.TraceDiagnostics();
#endif