From e1325fa1737367a7b25b46766f60d8cf82cea929 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Mon, 1 Nov 1999 07:40:19 +0000 Subject: [PATCH] Changed NS_ENSURE and NS_ENSURE_NOT occurences to be NS_ENSURE_TRUE and NS_ENSURE_FALSE respectively. git-svn-id: svn://10.0.0.236/trunk@52377 18797224-902f-48f8-a5cc-f745e15eee43 --- .../appshell/eventloop/photon/nsCAppLoop.cpp | 2 +- .../appshell/eventloop/windows/nsCAppLoop.cpp | 2 +- .../eventloop/windows/nsCBreathLoop.cpp | 2 +- .../eventloop/windows/nsCThreadLoop.cpp | 2 +- .../appshell/eventloop/xp/nsCBaseLoop.cpp | 26 +++++++++---------- .../appshell/nativeApp/nsCNativeAppImpl.cpp | 12 ++++----- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mozilla/xpcom/appshell/eventloop/photon/nsCAppLoop.cpp b/mozilla/xpcom/appshell/eventloop/photon/nsCAppLoop.cpp index b3a5574f79a..ad0f73830b5 100644 --- a/mozilla/xpcom/appshell/eventloop/photon/nsCAppLoop.cpp +++ b/mozilla/xpcom/appshell/eventloop/photon/nsCAppLoop.cpp @@ -48,7 +48,7 @@ NS_METHOD nsCAppLoop::Create(nsISupports* aOuter, const nsIID& aIID, NS_ENSURE_NO_AGGREGATION(aOuter); nsCAppLoop* app = new nsCAppLoop(); - NS_ENSURE(app, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(app, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(app); nsresult rv = app->QueryInterface(aIID, ppv); diff --git a/mozilla/xpcom/appshell/eventloop/windows/nsCAppLoop.cpp b/mozilla/xpcom/appshell/eventloop/windows/nsCAppLoop.cpp index 9b101db2813..756e092042e 100644 --- a/mozilla/xpcom/appshell/eventloop/windows/nsCAppLoop.cpp +++ b/mozilla/xpcom/appshell/eventloop/windows/nsCAppLoop.cpp @@ -42,7 +42,7 @@ NS_METHOD nsCAppLoop::Create(nsISupports* aOuter, const nsIID& aIID, NS_ENSURE_NO_AGGREGATION(aOuter); nsCAppLoop* app = new nsCAppLoop(); - NS_ENSURE(app, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(app, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(app); nsresult rv = app->QueryInterface(aIID, ppv); diff --git a/mozilla/xpcom/appshell/eventloop/windows/nsCBreathLoop.cpp b/mozilla/xpcom/appshell/eventloop/windows/nsCBreathLoop.cpp index d376b7ced63..2deb55b96b3 100644 --- a/mozilla/xpcom/appshell/eventloop/windows/nsCBreathLoop.cpp +++ b/mozilla/xpcom/appshell/eventloop/windows/nsCBreathLoop.cpp @@ -42,7 +42,7 @@ NS_METHOD nsCBreathLoop::Create(nsISupports* aOuter, const nsIID& aIID, NS_ENSURE_NO_AGGREGATION(aOuter); nsCBreathLoop* app = new nsCBreathLoop(); - NS_ENSURE(app, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(app, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(app); nsresult rv = app->QueryInterface(aIID, ppv); diff --git a/mozilla/xpcom/appshell/eventloop/windows/nsCThreadLoop.cpp b/mozilla/xpcom/appshell/eventloop/windows/nsCThreadLoop.cpp index 999ca1b7bdb..78c8f4a0bbc 100644 --- a/mozilla/xpcom/appshell/eventloop/windows/nsCThreadLoop.cpp +++ b/mozilla/xpcom/appshell/eventloop/windows/nsCThreadLoop.cpp @@ -42,7 +42,7 @@ NS_METHOD nsCThreadLoop::Create(nsISupports* aOuter, const nsIID& aIID, NS_ENSURE_NO_AGGREGATION(aOuter); nsCThreadLoop* app = new nsCThreadLoop(); - NS_ENSURE(app, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(app, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(app); nsresult rv = app->QueryInterface(aIID, ppv); diff --git a/mozilla/xpcom/appshell/eventloop/xp/nsCBaseLoop.cpp b/mozilla/xpcom/appshell/eventloop/xp/nsCBaseLoop.cpp index 77867fe7ac3..223b4b70363 100644 --- a/mozilla/xpcom/appshell/eventloop/xp/nsCBaseLoop.cpp +++ b/mozilla/xpcom/appshell/eventloop/xp/nsCBaseLoop.cpp @@ -101,7 +101,7 @@ NS_IMETHODIMP nsCBaseLoop::CloneEvent(nsIEvent* event, nsIEvent** newEvent) if(event) { platformEventData = GetPlatformEventData(event); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); } nsCEvent* cEvent = new nsCEvent(platformEventData); @@ -122,7 +122,7 @@ NS_IMETHODIMP nsCBaseLoop::CreateNewEvent(nsIEvent** newEvent) NS_ENSURE_ARG_POINTER(newEvent); nsCEvent* event = new nsCEvent(); - NS_ENSURE(event, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY); event->AddRef(); nsresult rv = event->QueryInterface(NS_GET_IID(nsIEvent), (void**)newEvent); @@ -138,7 +138,7 @@ NS_IMETHODIMP nsCBaseLoop::CreateNewEventFilter(nsIEventFilter** newFilter) NS_ENSURE_ARG_POINTER(newFilter); nsCEventFilter* filter = new nsCEventFilter(); - NS_ENSURE(filter, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(filter, NS_ERROR_OUT_OF_MEMORY); filter->AddRef(); nsresult rv = filter->QueryInterface(NS_GET_IID(nsIEventFilter), (void**)newFilter); @@ -160,7 +160,7 @@ NS_IMETHODIMP nsCBaseLoop::GetNextEvent(nsIEventFilter* filter, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(localFilter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformGetNextEvent(platformFilterData, platformEventData); } @@ -176,7 +176,7 @@ NS_IMETHODIMP nsCBaseLoop::PeekNextEvent(nsIEventFilter* filter, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(localFilter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformPeekNextEvent(platformFilterData, platformEventData, fRemoveEvent); } @@ -186,7 +186,7 @@ NS_IMETHODIMP nsCBaseLoop::TranslateEvent(nsIEvent* event) NS_ENSURE_ARG(event); void* platformEventData = GetPlatformEventData(event); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformTranslateEvent(platformEventData); } @@ -196,7 +196,7 @@ NS_IMETHODIMP nsCBaseLoop::DispatchEvent(nsIEvent* event) NS_ENSURE_ARG(event); void* platformEventData = GetPlatformEventData(event); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformDispatchEvent(platformEventData); } @@ -206,7 +206,7 @@ NS_IMETHODIMP nsCBaseLoop::SendLoopEvent(nsIEvent* event, PRInt32* result) NS_ENSURE_ARG(event); void* platformEventData = GetPlatformEventData(event); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformSendLoopEvent(platformEventData, result); } @@ -216,7 +216,7 @@ NS_IMETHODIMP nsCBaseLoop::PostLoopEvent(nsIEvent* event) NS_ENSURE_ARG(event); void* platformEventData = GetPlatformEventData(event); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); return PlatformPostLoopEvent(platformEventData); } @@ -278,7 +278,7 @@ nsresult nsCBaseLoop::RunWithNoListener(nsIEvent* event, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(filter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); while(NS_OK == (rv = RetrieveNextEvent(platformFilterData, platformEventData))) { @@ -299,7 +299,7 @@ nsresult nsCBaseLoop::RunWithTranslateListener(nsIEvent* event, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(filter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); while(NS_OK == (rv = RetrieveNextEvent(platformFilterData, platformEventData))) { @@ -328,7 +328,7 @@ nsresult nsCBaseLoop::RunWithDispatchListener(nsIEvent* event, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(filter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); while(NS_OK == (rv = RetrieveNextEvent(platformFilterData, platformEventData))) { @@ -358,7 +358,7 @@ nsresult nsCBaseLoop::RunWithTranslateAndDispatchListener(nsIEvent* event, void* platformEventData = GetPlatformEventData(event); void* platformFilterData = GetPlatformFilterData(filter); - NS_ENSURE(platformEventData, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(platformEventData, NS_ERROR_FAILURE); while(NS_OK == (rv = RetrieveNextEvent(platformFilterData, platformEventData))) { diff --git a/mozilla/xpcom/appshell/nativeApp/nsCNativeAppImpl.cpp b/mozilla/xpcom/appshell/nativeApp/nsCNativeAppImpl.cpp index 172693ff5d2..7857fe1c484 100644 --- a/mozilla/xpcom/appshell/nativeApp/nsCNativeAppImpl.cpp +++ b/mozilla/xpcom/appshell/nativeApp/nsCNativeAppImpl.cpp @@ -46,7 +46,7 @@ NS_IMETHODIMP nsCNativeAppImpl::Create(nsISupports* aOuter, const nsIID& aIID, NS_ENSURE_NO_AGGREGATION(aOuter); nsCNativeAppImpl* app = new nsCNativeAppImpl(); - NS_ENSURE(app, NS_ERROR_OUT_OF_MEMORY); + NS_ENSURE_TRUE(app, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(app); nsresult rv = app->QueryInterface(aIID, ppv); @@ -74,12 +74,12 @@ NS_IMETHODIMP nsCNativeAppImpl::CreateEventLoop(const PRUnichar* EventLoopName, switch(type) { case nsEventLoopTypes::MainAppLoop: - NS_ENSURE_NOT(GetLoop(type), NS_ERROR_UNEXPECTED); + NS_ENSURE_FALSE(GetLoop(type), NS_ERROR_UNEXPECTED); progID = NS_EVENTLOOP_APP_PROGID; break; case nsEventLoopTypes::ThreadLoop: - NS_ENSURE_NOT(GetLoop(PR_CurrentThread()), NS_ERROR_UNEXPECTED); + NS_ENSURE_FALSE(GetLoop(PR_CurrentThread()), NS_ERROR_UNEXPECTED); progID = NS_EVENTLOOP_THREAD_PROGID; break; @@ -103,7 +103,7 @@ NS_IMETHODIMP nsCNativeAppImpl::CreateEventLoop(const PRUnichar* EventLoopName, if(NS_FAILED(pvtLoop->LoopInit(EventLoopName))) return NS_ERROR_FAILURE; - NS_ENSURE(AddLoop(EventLoopName, PR_CurrentThread(), loop, type), + NS_ENSURE_TRUE(AddLoop(EventLoopName, PR_CurrentThread(), loop, type), NS_ERROR_FAILURE); *eventLoop = loop; @@ -122,7 +122,7 @@ NS_IMETHODIMP nsCNativeAppImpl::FindEventLoop(const PRUnichar* EventLoopName, while(PR_TRUE) // Do this in case GetEventLoop fails. Provides list cleanup { loopInfo = GetLoop(EventLoopName); - NS_ENSURE(loopInfo, NS_ERROR_INVALID_ARG); + NS_ENSURE_TRUE(loopInfo, NS_ERROR_INVALID_ARG); loopInfo->GetEventLoop(eventLoop); if(!eventLoop) @@ -131,7 +131,7 @@ NS_IMETHODIMP nsCNativeAppImpl::FindEventLoop(const PRUnichar* EventLoopName, break; } - NS_ENSURE(*eventLoop, NS_ERROR_INVALID_ARG); + NS_ENSURE_TRUE(*eventLoop, NS_ERROR_INVALID_ARG); return NS_OK; }