Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be a bit more paranoid about using a macro called ASSERT, which is rather common.

Browse Source
This commit is contained in:
sfraser%netscape.com 2000-02-11 22:49:55 +00:00
parent 874c1eba11
commit 87561d1721
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpfe/bootstrap/appleevents/nsAEClassDispatcher.cpp
View File

@ -39,7 +39,7 @@ AEDispatchHandler::AEDispatchHandler(DescType handlerClass, AEGenericClass* hand
, mHandlerClass(handlerClass)
, mHandler(handler)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
}
@ -62,7 +62,7 @@ void AEDispatchHandler::DispatchEvent( AEDesc * token,
const AppleEvent * appleEvent,
AppleEvent * reply)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->DispatchEvent(token, appleEvent, reply);
}
@ -77,7 +77,7 @@ void AEDispatchHandler::GetProperty( DescType desiredClass,
const AEDesc* keyData,
AEDesc* resultToken)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->GetProperty(desiredClass, containerToken, containerClass, keyForm, keyData, resultToken);
}
@ -89,7 +89,7 @@ void AEDispatchHandler::GetDataFromListOrObject( const AEDesc * tokenOrTokenLi
AEDesc * desiredTypes,
AEDesc * data)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->GetDataFromListOrObject(tokenOrTokenList, desiredTypes, data);
}
@ -105,7 +105,7 @@ void AEDispatchHandler::GetItemFromContainer( DescType desiredClass,
const AEDesc* keyData,
AEDesc* resultToken)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->GetItemFromContainer(desiredClass, containerToken, containerClass, keyForm, keyData, resultToken);
}
@ -119,7 +119,7 @@ void AEDispatchHandler::CompareObjects( DescType comparisonOperator,
const AEDesc * descriptorOrObject,
Boolean * result)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->CompareObjects(comparisonOperator, object, descriptorOrObject, result);
}
@ -134,7 +134,7 @@ void AEDispatchHandler::CountObjects( DescType desiredType,
const AEDesc * container,
long * result)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->CountObjects(desiredType, containerClass, container, result);
}
@ -146,7 +146,7 @@ void AEDispatchHandler::CountObjects( DescType desiredType,
void AEDispatchHandler::CreateSelfSpecifier( const AEDesc * token,
AEDesc * outSpecifier)
{
ASSERT(mHandler, "No handler");
AE_ASSERT(mHandler, "No handler");
mHandler->CreateSelfSpecifier(token, outSpecifier);
}

2
xpfe/bootstrap/appleevents/nsAEClassIterator.cpp
View File

@ -362,7 +362,7 @@ void AEClassIterator::CheckKeyFormSupport(DescType keyForm)
case formPropertyID: testMask = eHasFormPropertyID; break;
case formName: testMask = eHasFormName; break;
default:
ASSERT(false, "Unknown key form");
AE_ASSERT(false, "Unknown key form");
}
if ((mKeyFormSupport & testMask) == 0)
ThrowOSErr(errAEBadKeyForm);

4
xpfe/bootstrap/appleevents/nsAEDefs.h
View File

@ -50,11 +50,11 @@ typedef enum
#if DEBUG
#define ASSERT(x,msg) { if (!(x)) { DebugStr("\p"msg); } }
#define AE_ASSERT(x,msg) { if (!(x)) { DebugStr("\p"msg); } }
#else
#define ASSERT(x) ((void) 0)
#define AE_ASSERT(x) ((void) 0)
#endif

8
xpfe/bootstrap/appleevents/nsAEUtils.cpp
View File

@ -177,7 +177,7 @@ exit:
----------------------------------------------------------------------------*/
void DisposeThreadAEInfo(TThreadAEInfo *threadAEInfo)
{
ASSERT(threadAEInfo && threadAEInfo->mSuspendCount == 0, "Bad suspend count");
AE_ASSERT(threadAEInfo && threadAEInfo->mSuspendCount == 0, "Bad suspend count");
MyDisposeBlock(threadAEInfo);
}
@ -635,7 +635,7 @@ StHandleHolder::~StHandleHolder()
----------------------------------------------------------------------------*/
StHandleHolder& StHandleHolder::operator=(Handle rhs)
{
ASSERT(mLockCount == 0, "Bad lock count");
AE_ASSERT(mLockCount == 0, "Bad lock count");
mLockCount = 0;
if (mHandle)
@ -664,7 +664,7 @@ void StHandleHolder::Lock()
void StHandleHolder::Unlock()
{
ThrowIfNil(mHandle);
ASSERT(mLockCount > 0, "Bad lock count");
AE_ASSERT(mLockCount > 0, "Bad lock count");
if (--mLockCount == 0)
HSetState(mHandle, mOldHandleState);
}
@ -714,7 +714,7 @@ Boolean AEListIterator::Next(AEDesc* outItemData)
ThrowIfOSErr(::AEGetNthDesc(&mListToken, mCurItem, typeWildCard, &keyword, outItemData));
// what about nested lists?
ASSERT(!AEListUtils::TokenContainsTokenList(outItemData), "Nested list found");
AE_ASSERT(!AEListUtils::TokenContainsTokenList(outItemData), "Nested list found");
}
else
{

2
xpfe/bootstrap/appleevents/nsAEUtils.h
View File

@ -265,7 +265,7 @@ public:
StHandleLocker(Handle inHandle)
: mHandle(inHandle)
{
ASSERT(mHandle, "No handle");
AE_ASSERT(mHandle, "No handle");
mOldHandleState = HGetState(mHandle);
HLock(mHandle);
}

18
xpfe/bootstrap/appleevents/patricia.c
View File

@ -58,7 +58,7 @@
//#include "utils.h"
#include "patricia.h"
#include "nsAEDefs.h" // for ASSERT
#include "nsAEDefs.h" // for AE_ASSERT
/* Uncomment to print verbose logging on tree activity */
//#define VERBOSE
@ -186,7 +186,7 @@ static TNode *InternalSearch(TPatriciaTree *tree, TNode *x, const unsigned char
{
TNode *p;
ASSERT(x, "No node");
AE_ASSERT(x, "No node");
do {
p = x;
@ -226,8 +226,8 @@ static int InternalTraverse(TPatriciaTree *tree, TNode *x, NodeTraverseFunction
TNode *p;
int err = 0;
ASSERT(x, "No node");
ASSERT(x->left && x->right, "Left or right child missing");
AE_ASSERT(x, "No node");
AE_ASSERT(x->left && x->right, "Left or right child missing");
#ifdef VERBOSE
printf("Visiting node %ld with left %ld and right %ld\n", x->nodeID, x->left->nodeID, x->right->nodeID);
@ -276,8 +276,8 @@ static int TraverseAndFree(TPatriciaTree *tree, TNode *x, NodeFreeFunction freeF
TNode *p;
int err = 0;
ASSERT(x, "No node");
ASSERT(x->left && x->right, "Left or right child missing");
AE_ASSERT(x, "No node");
AE_ASSERT(x->left && x->right, "Left or right child missing");
p = x->left;
if (p->bit < x->bit) {
@ -393,10 +393,10 @@ int PatriciaSearch(PatriciaTreeRef treeRef, const unsigned char *key, void **dat
TPatriciaTree *tree = (TPatriciaTree *)treeRef;
TNode *foundNode;
ASSERT(tree, "Where is my tree?");
AE_ASSERT(tree, "Where is my tree?");
foundNode = InternalSearch(tree, tree->headNode, key);
ASSERT(foundNode, "Should have found node");
AE_ASSERT(foundNode, "Should have found node");
if (memcmp(foundNode->key, key, tree->keySize) == 0) {
if (data != NULL)
@ -434,7 +434,7 @@ int PatriciaInsert(PatriciaTreeRef treeRef, NodeReplaceFunction replaceFunc, con
x = tree->headNode;
t = InternalSearch(tree, x, key);
ASSERT(t, "Should have found node");
AE_ASSERT(t, "Should have found node");
if (memcmp(t->key, key, tree->keySize) == 0) {
if (replaceFunc) (*replaceFunc)(&t->data, t->key, data, refCon);