--- xpcom/base/nsConsoleMessage.cpp +++ xpcom/base/nsConsoleMessage.cpp @@ -56 +56 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -60 +60 @@ - return NS_OK; + return; --- xpcom/base/nsConsoleService.cpp +++ xpcom/base/nsConsoleService.cpp @@ -94,2 +94 @@ -nsresult -nsConsoleService::Init() +void nsConsoleService::Init() @@ -99,2 +99 @@ - if (!mMessages) - return NS_ERROR_OUT_OF_MEMORY; + @@ -106,2 +106 @@ - if (!mLock) - return NS_ERROR_OUT_OF_MEMORY; + @@ -109 +109 @@ - return NS_OK; + return; @@ -117 +117 @@ - array->AppendElement((nsISupports*)data); + IGNORE_NSEXCEPTION(array->AppendElement((nsISupports*)data)); @@ -122 +122 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -126 +126 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -173,3 +173,4 @@ - rv = listenersSnapshot.Count(&snapshotCount); - if (NS_FAILED(rv)) - return rv; + try { + listenersSnapshot.Count(&snapshotCount); + } + catch (nsexception &exc) { throw; } @@ -180 +180 @@ - return NS_OK; + return; @@ -186,6 +186,8 @@ - rv = listenersSnapshot.GetElementAt(i, getter_AddRefs(listener)); - if (NS_FAILED(rv)) { - returned_rv = rv; - break; // fall thru to mListening restore code below. - } - listener->Observe(message); + try { + listenersSnapshot.GetElementAt(i, getter_AddRefs(listener)); + } + catch (nsexception &exc) { + returned_rv = exc.getCode(); + break; // fall thru to mListening restore code below. + } + IGNORE_NSEXCEPTION(listener->Observe(message)); @@ -199 +199 @@ - return returned_rv; + throw nsexception(returned_rv); @@ -202 +202 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -206 +206 @@ - return this->LogMessage(msg); + return /*thower*/ this->LogMessage(msg); @@ -209 +209 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -232 +232 @@ - return NS_OK; + return; @@ -243 +243 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -263 +263 @@ - return NS_OK; + return; @@ -266 +266 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -279,3 +279,4 @@ - rv = GetProxyForListener(listener, getter_AddRefs(proxiedListener)); - if (NS_FAILED(rv)) - return rv; + try { + GetProxyForListener(listener, getter_AddRefs(proxiedListener)); + } + catch (nsexception &exc) { throw; } @@ -298 +298 @@ - return NS_OK; + return; @@ -301 +301 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -307 +307 @@ - return NS_OK; + return; @@ -310,2 +310 @@ -nsresult -nsConsoleService::GetProxyForListener(nsIConsoleListener* aListener, +void nsConsoleService::GetProxyForListener(nsIConsoleListener* aListener, @@ -317 +317 @@ - return NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, + return /*thower*/ NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, @@ -324 +324 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -341 +341 @@ - return NS_OK; + return; --- xpcom/base/nsConsoleService.h +++ xpcom/base/nsConsoleService.h @@ -55 +55 @@ - nsresult Init(); + void Init(); @@ -64 +64 @@ - nsresult GetProxyForListener(nsIConsoleListener* aListener, + void GetProxyForListener(nsIConsoleListener* aListener, --- xpcom/base/nsCycleCollector.cpp +++ xpcom/base/nsCycleCollector.cpp @@ -820 +820 @@ - nsresult BeginCycleCollection() + void BeginCycleCollection() @@ -822 +822 @@ - return NS_OK; + return; @@ -825 +825 @@ - nsresult FinishCycleCollection() + void FinishCycleCollection() @@ -827 +827 @@ - return NS_OK; + return; @@ -1003,2 +1003,2 @@ - in->QueryInterface(NS_GET_IID(nsCycleCollectionISupports), - getter_AddRefs(child)); + IGNORE_NSEXCEPTION(in->QueryInterface(NS_GET_IID(nsCycleCollectionISupports), + getter_AddRefs(child))); @@ -1204,4 +1204,6 @@ - nsresult rv = aPtrInfo->mParticipant->Traverse(aPtrInfo->mPointer, *this); - if (NS_FAILED(rv)) { - Fault("script pointer traversal failed", aPtrInfo); - } + try { + aPtrInfo->mParticipant->Traverse(aPtrInfo->mPointer, *this); + } + catch (nsexception &exc) { + Fault("script pointer traversal failed", aPtrInfo); + } @@ -1471,3 +1471,4 @@ - rv = pinfo->mParticipant->Root(pinfo->mPointer); - if (NS_FAILED(rv)) - Fault("Failed root call while unlinking", pinfo); + try { + pinfo->mParticipant->Root(pinfo->mPointer); + } + catch (nsexception &exc) Fault("Failed root call while unlinking", pinfo); @@ -1478,12 +1478,9 @@ - rv = pinfo->mParticipant->Unlink(pinfo->mPointer); - if (NS_FAILED(rv)) { - Fault("Failed unlink call while unlinking", pinfo); -#ifdef DEBUG_CC - mStats.mFailedUnlink++; -#endif - } - else { -#ifdef DEBUG_CC - ++mStats.mCollectedNode; -#endif - } + try { + pinfo->mParticipant->Unlink(pinfo->mPointer); + } + catch (nsexception &exc) { + Fault("Failed unlink call while unlinking", pinfo); +#ifdef DEBUG_CC + mStats.mFailedUnlink++; +#endif + } @@ -1494,3 +1494,4 @@ - rv = pinfo->mParticipant->Unroot(pinfo->mPointer); - if (NS_FAILED(rv)) - Fault("Failed unroot call while unlinking", pinfo); + try { + pinfo->mParticipant->Unroot(pinfo->mPointer); + } + catch (nsexception &exc) Fault("Failed unroot call while unlinking", pinfo); @@ -2046 +2046 @@ - obs->NotifyObservers(nsnull, "cycle-collector-begin", nsnull); + IGNORE_NSEXCEPTION(obs->NotifyObservers(nsnull, "cycle-collector-begin", nsnull)); @@ -2069 +2069 @@ - mRuntimes[i]->BeginCycleCollection(); + IGNORE_NSEXCEPTION(mRuntimes[i]->BeginCycleCollection()); @@ -2184 +2184 @@ - mRuntimes[i]->FinishCycleCollection(); + IGNORE_NSEXCEPTION(mRuntimes[i]->FinishCycleCollection()); @@ -2604,2 +2604 @@ -nsresult -nsCycleCollector_startup() +void nsCycleCollector_startup() @@ -2610 +2610 @@ - return sCollector ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(sCollector ? NS_OK : NS_ERROR_OUT_OF_MEMORY); --- xpcom/base/nsCycleCollector.h +++ xpcom/base/nsCycleCollector.h @@ -53,2 +53,2 @@ - virtual nsresult BeginCycleCollection() = 0; - virtual nsresult FinishCycleCollection() = 0; + virtual void BeginCycleCollection() = 0; + virtual void FinishCycleCollection() = 0; @@ -68 +68 @@ -nsresult nsCycleCollector_startup(); +void nsCycleCollector_startup(); --- xpcom/base/nsDebugImpl.cpp +++ xpcom/base/nsDebugImpl.cpp @@ -135 +135 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -140 +140 @@ - return NS_OK; + return; @@ -143 +143 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -147 +147 @@ - return NS_OK; + return; @@ -150 +150 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -154 +154 @@ - return NS_OK; + return; @@ -157 +157 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -161 +161 @@ - return NS_OK; + return; @@ -484 +484 @@ -NS_METHOD +NS_METHOD_(void) @@ -489,2 +489,2 @@ - return const_cast(&kImpl)-> - QueryInterface(aIID, aInstancePtr); + return wrap_nsexception(const_cast(&kImpl)-> + QueryInterface(aIID, aInstancePtr)); @@ -495,2 +495 @@ -NS_COM nsresult -NS_ErrorAccordingToNSPR() +NS_COM void NS_ErrorAccordingToNSPR() @@ -500,15 +500,15 @@ - case PR_OUT_OF_MEMORY_ERROR: return NS_ERROR_OUT_OF_MEMORY; - case PR_WOULD_BLOCK_ERROR: return NS_BASE_STREAM_WOULD_BLOCK; - case PR_FILE_NOT_FOUND_ERROR: return NS_ERROR_FILE_NOT_FOUND; - case PR_READ_ONLY_FILESYSTEM_ERROR: return NS_ERROR_FILE_READ_ONLY; - case PR_NOT_DIRECTORY_ERROR: return NS_ERROR_FILE_NOT_DIRECTORY; - case PR_IS_DIRECTORY_ERROR: return NS_ERROR_FILE_IS_DIRECTORY; - case PR_LOOP_ERROR: return NS_ERROR_FILE_UNRESOLVABLE_SYMLINK; - case PR_FILE_EXISTS_ERROR: return NS_ERROR_FILE_ALREADY_EXISTS; - case PR_FILE_IS_LOCKED_ERROR: return NS_ERROR_FILE_IS_LOCKED; - case PR_FILE_TOO_BIG_ERROR: return NS_ERROR_FILE_TOO_BIG; - case PR_NO_DEVICE_SPACE_ERROR: return NS_ERROR_FILE_NO_DEVICE_SPACE; - case PR_NAME_TOO_LONG_ERROR: return NS_ERROR_FILE_NAME_TOO_LONG; - case PR_DIRECTORY_NOT_EMPTY_ERROR: return NS_ERROR_FILE_DIR_NOT_EMPTY; - case PR_NO_ACCESS_RIGHTS_ERROR: return NS_ERROR_FILE_ACCESS_DENIED; - default: return NS_ERROR_FAILURE; + case PR_OUT_OF_MEMORY_ERROR: throw nsexception(NS_ERROR_OUT_OF_MEMORY); + case PR_WOULD_BLOCK_ERROR: throw nsexception(NS_BASE_STREAM_WOULD_BLOCK); + case PR_FILE_NOT_FOUND_ERROR: throw nsexception(NS_ERROR_FILE_NOT_FOUND); + case PR_READ_ONLY_FILESYSTEM_ERROR: throw nsexception(NS_ERROR_FILE_READ_ONLY); + case PR_NOT_DIRECTORY_ERROR: throw nsexception(NS_ERROR_FILE_NOT_DIRECTORY); + case PR_IS_DIRECTORY_ERROR: throw nsexception(NS_ERROR_FILE_IS_DIRECTORY); + case PR_LOOP_ERROR: throw nsexception(NS_ERROR_FILE_UNRESOLVABLE_SYMLINK); + case PR_FILE_EXISTS_ERROR: throw nsexception(NS_ERROR_FILE_ALREADY_EXISTS); + case PR_FILE_IS_LOCKED_ERROR: throw nsexception(NS_ERROR_FILE_IS_LOCKED); + case PR_FILE_TOO_BIG_ERROR: throw nsexception(NS_ERROR_FILE_TOO_BIG); + case PR_NO_DEVICE_SPACE_ERROR: throw nsexception(NS_ERROR_FILE_NO_DEVICE_SPACE); + case PR_NAME_TOO_LONG_ERROR: throw nsexception(NS_ERROR_FILE_NAME_TOO_LONG); + case PR_DIRECTORY_NOT_EMPTY_ERROR: throw nsexception(NS_ERROR_FILE_DIR_NOT_EMPTY); + case PR_NO_ACCESS_RIGHTS_ERROR: throw nsexception(NS_ERROR_FILE_ACCESS_DENIED); + default: throw nsexception(NS_ERROR_FAILURE); --- xpcom/base/nsDebugImpl.h +++ xpcom/base/nsDebugImpl.h @@ -45 +45 @@ - static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + static NS_METHOD_(void) Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); --- xpcom/base/nsError.h +++ xpcom/base/nsError.h @@ -330,2 +330 @@ -extern NS_COM nsresult -NS_ErrorAccordingToNSPR(); +extern NS_COM void NS_ErrorAccordingToNSPR(); --- xpcom/base/nsErrorService.cpp +++ xpcom/base/nsErrorService.cpp @@ -59,2 +59 @@ -nsresult -nsInt2StrHashtable::Put(PRUint32 key, const char* aData) +void nsInt2StrHashtable::Put(PRUint32 key, const char* aData) @@ -64 +64 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -69 +69 @@ - return NS_OK; + return; @@ -82,2 +82 @@ -nsresult -nsInt2StrHashtable::Remove(PRUint32 key) +void nsInt2StrHashtable::Remove(PRUint32 key) @@ -89 +89 @@ - return NS_OK; + return; @@ -96 +96 @@ -NS_METHOD +NS_METHOD_(void) @@ -102 +102 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -104 +104,3 @@ - nsresult rv = serv->QueryInterface(aIID, aInstancePtr); + try { + wrap_nsexception(serv->QueryInterface(aIID, aInstancePtr)); + } @@ -106 +106 @@ - return rv; + throw nsexception(rv); @@ -109 +109 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -112 +112 @@ - return mErrorStringBundleURLMap.Put(errorModule, stringBundleURL); + return /*thower*/ mErrorStringBundleURLMap.Put(errorModule, stringBundleURL); @@ -115 +115 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -118 +118 @@ - return mErrorStringBundleURLMap.Remove(errorModule); + return /*thower*/ mErrorStringBundleURLMap.Remove(errorModule); @@ -121 +121 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -126 +126 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -128 +128 @@ - return NS_OK; + return; @@ -131 +131 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -134 +134 @@ - return mErrorStringBundleKeyMap.Put(error, stringBundleKey); + return /*thower*/ mErrorStringBundleKeyMap.Put(error, stringBundleKey); @@ -137 +137 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -140 +140 @@ - return mErrorStringBundleKeyMap.Remove(error); + return /*thower*/ mErrorStringBundleKeyMap.Remove(error); @@ -143 +143 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -148 +148 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -150 +150 @@ - return NS_OK; + return; --- xpcom/base/nsErrorService.h +++ xpcom/base/nsErrorService.h @@ -49 +49 @@ - nsresult Put(PRUint32 key, const char* aData); + void Put(PRUint32 key, const char* aData); @@ -51 +51 @@ - nsresult Remove(PRUint32 key); + void Remove(PRUint32 key); @@ -65 +65 @@ - static NS_METHOD + static NS_METHOD_(void) --- xpcom/base/nsExceptionService.cpp +++ xpcom/base/nsExceptionService.cpp @@ -120 +120 @@ -NS_IMETHODIMP nsExceptionManager::SetCurrentException(nsIException *error) +NS_IMETHODIMP_(void) nsExceptionManager::SetCurrentException(nsIException *error) @@ -124 +124 @@ - return NS_OK; + return; @@ -128 +128 @@ -NS_IMETHODIMP nsExceptionManager::GetCurrentException(nsIException **_retval) +NS_IMETHODIMP_(void) nsExceptionManager::GetCurrentException(nsIException **_retval) @@ -133 +133 @@ - return NS_OK; + return; @@ -137 +137 @@ -NS_IMETHODIMP nsExceptionManager::GetExceptionFromProvider(nsresult rc, nsIException * defaultException, nsIException **_retval) +NS_IMETHODIMP_(void) nsExceptionManager::GetExceptionFromProvider(nsresult rc, nsIException * defaultException, nsIException **_retval) @@ -141 +141 @@ - return mService->GetExceptionFromProvider(rc, defaultException, _retval); + return wrap_nsexception(mService->GetExceptionFromProvider(rc, defaultException, _retval)); @@ -177 +177 @@ - observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); + IGNORE_NSEXCEPTION(observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE)); @@ -212 +212 @@ -NS_IMETHODIMP nsExceptionService::SetCurrentException(nsIException *error) +NS_IMETHODIMP_(void) nsExceptionService::SetCurrentException(nsIException *error) @@ -216,4 +216,5 @@ - nsresult nr = GetCurrentExceptionManager(getter_AddRefs(sm)); - if (NS_FAILED(nr)) - return nr; - return sm->SetCurrentException(error); + try { + wrap_nsexception(GetCurrentExceptionManager(getter_AddRefs(sm))); + } + catch (nsexception &exc) { throw; } + return /*thower*/ sm->SetCurrentException(error); @@ -223 +223 @@ -NS_IMETHODIMP nsExceptionService::GetCurrentException(nsIException **_retval) +NS_IMETHODIMP_(void) nsExceptionService::GetCurrentException(nsIException **_retval) @@ -227,4 +227,5 @@ - nsresult nr = GetCurrentExceptionManager(getter_AddRefs(sm)); - if (NS_FAILED(nr)) - return nr; - return sm->GetCurrentException(_retval); + try { + wrap_nsexception(GetCurrentExceptionManager(getter_AddRefs(sm))); + } + catch (nsexception &exc) { throw; } + return /*thower*/ sm->GetCurrentException(_retval); @@ -234 +234 @@ -NS_IMETHODIMP nsExceptionService::GetExceptionFromProvider(nsresult rc, +NS_IMETHODIMP_(void) nsExceptionService::GetExceptionFromProvider(nsresult rc, @@ -238 +238 @@ - return DoGetExceptionFromProvider(rc, defaultException, _retval); + return /*thower*/ DoGetExceptionFromProvider(rc, defaultException, _retval); @@ -242 +242 @@ -NS_IMETHODIMP nsExceptionService::GetCurrentExceptionManager(nsIExceptionManager * *aCurrentScriptManager) +NS_IMETHODIMP_(void) nsExceptionService::GetCurrentExceptionManager(nsIExceptionManager * *aCurrentScriptManager) @@ -250 +250 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -257 +257 @@ - return NS_OK; + return; @@ -261 +261 @@ -NS_IMETHODIMP nsExceptionService::RegisterExceptionProvider(nsIExceptionProvider *provider, PRUint32 errorModule) +NS_IMETHODIMP_(void) nsExceptionService::RegisterExceptionProvider(nsIExceptionProvider *provider, PRUint32 errorModule) @@ -269 +269 @@ - return NS_OK; + return; @@ -273 +273 @@ -NS_IMETHODIMP nsExceptionService::UnregisterExceptionProvider(nsIExceptionProvider *provider, PRUint32 errorModule) +NS_IMETHODIMP_(void) nsExceptionService::UnregisterExceptionProvider(nsIExceptionProvider *provider, PRUint32 errorModule) @@ -279 +279 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -281 +281 @@ - return NS_OK; + return; @@ -285 +285 @@ -NS_IMETHODIMP nsExceptionService::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) +NS_IMETHODIMP_(void) nsExceptionService::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) @@ -288 +288 @@ - return NS_OK; + return; @@ -291,2 +291 @@ -nsresult -nsExceptionService::DoGetExceptionFromProvider(nsresult errCode, +void nsExceptionService::DoGetExceptionFromProvider(nsresult errCode, @@ -297 +297,3 @@ - nsresult nr = GetCurrentException(_exc); + try { + GetCurrentException(_exc); + } @@ -299 +299 @@ - (*_exc)->GetResult(&nr); + IGNORE_NSEXCEPTION((*_exc)->GetResult(&nr)); @@ -302 +302 @@ - return NS_OK; + return; @@ -313 +313 @@ - return NS_OK; + return; @@ -316 +316 @@ - return provider->GetException(errCode, defaultException, _exc); + return /*thower*/ provider->GetException(errCode, defaultException, _exc); --- xpcom/base/nsExceptionService.h +++ xpcom/base/nsExceptionService.h @@ -63 +63 @@ - nsresult DoGetExceptionFromProvider(nsresult errCode, + void DoGetExceptionFromProvider(nsresult errCode, --- xpcom/base/nsISupportsBase.h +++ xpcom/base/nsISupportsBase.h @@ -86 +86 @@ - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) = 0; + NS_IMETHOD_(void) QueryInterface(REFNSIID aIID, void** aInstancePtr) = 0; --- xpcom/base/nsInterfaceRequestorAgg.cpp +++ xpcom/base/nsInterfaceRequestorAgg.cpp @@ -57 +57 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -62 +62,3 @@ - rv = mFirst->GetInterface(aIID, aResult); + try { + mFirst->GetInterface(aIID, aResult); + } @@ -64,2 +64,4 @@ - rv = mSecond->GetInterface(aIID, aResult); - return rv; + try { + mSecond->GetInterface(aIID, aResult); + } + throw nsexception(rv); @@ -68,2 +68 @@ -nsresult -NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst, +void NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst, @@ -75 +75 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -77 +77 @@ - return NS_OK; + return; --- xpcom/base/nsInterfaceRequestorAgg.h +++ xpcom/base/nsInterfaceRequestorAgg.h @@ -49,2 +49 @@ -extern NS_COM nsresult -NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst, +extern NS_COM void NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst, --- xpcom/base/nsMemoryImpl.cpp +++ xpcom/base/nsMemoryImpl.cpp @@ -175 +175 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -178 +178 @@ - return FlushMemory(NS_LITERAL_STRING("heap-minimize").get(), aImmediate); + return /*thower*/ FlushMemory(NS_LITERAL_STRING("heap-minimize").get(), aImmediate); @@ -181 +181 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -195 +195 @@ - return NS_OK; + return; @@ -199,2 +199 @@ -/*static*/ nsresult -nsMemoryImpl::InitFlusher() +/*static*/ void nsMemoryImpl::InitFlusher() @@ -205 +205 @@ - return NS_OK; + return; @@ -209,2 +209 @@ -/*static*/ nsresult -nsMemoryImpl::Create(nsISupports* outer, const nsIID& aIID, void **aResult) +/*static*/ void nsMemoryImpl::Create(nsISupports* outer, const nsIID& aIID, void **aResult) @@ -213 +213 @@ - return sGlobalMemory.QueryInterface(aIID, aResult); + return /*thower*/ sGlobalMemory.QueryInterface(aIID, aResult); @@ -216,2 +216 @@ -nsresult -nsMemoryImpl::FlushMemory(const PRUnichar* aReason, PRBool aImmediate) +void nsMemoryImpl::FlushMemory(const PRUnichar* aReason, PRBool aImmediate) @@ -227 +227 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -233 +233 @@ - return NS_OK; + return; @@ -238 +238,3 @@ - rv = RunFlushers(aReason); + try { + RunFlushers(aReason); + } @@ -242 +242,3 @@ - rv = NS_DispatchToMainThread(&sFlushEvent, NS_DISPATCH_NORMAL); + try { + NS_DispatchToMainThread(&sFlushEvent, NS_DISPATCH_NORMAL); + } @@ -245 +245 @@ - return rv; + throw nsexception(rv); @@ -248,2 +248 @@ -nsresult -nsMemoryImpl::RunFlushers(const PRUnichar* aReason) +void nsMemoryImpl::RunFlushers(const PRUnichar* aReason) @@ -253 +253 @@ - os->NotifyObservers(this, "memory-pressure", aReason); + IGNORE_NSEXCEPTION(os->NotifyObservers(this, "memory-pressure", aReason)); @@ -257 +257 @@ - return NS_OK; + return; @@ -265 +265 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -268,2 +268,2 @@ - sGlobalMemory.RunFlushers(mReason); - return NS_OK; + IGNORE_NSEXCEPTION(sGlobalMemory.RunFlushers(mReason)); + return; @@ -284 +284 @@ - sGlobalMemory.FlushMemory(NS_LITERAL_STRING("alloc-failure").get(), PR_FALSE); + IGNORE_NSEXCEPTION(sGlobalMemory.FlushMemory(NS_LITERAL_STRING("alloc-failure").get(), PR_FALSE)); @@ -295 +295 @@ - sGlobalMemory.FlushMemory(NS_LITERAL_STRING("alloc-failure").get(), PR_FALSE); + IGNORE_NSEXCEPTION(sGlobalMemory.FlushMemory(NS_LITERAL_STRING("alloc-failure").get(), PR_FALSE)); @@ -343,2 +343 @@ -nsresult -NS_GetMemoryManager(nsIMemory* *result) +void NS_GetMemoryManager(nsIMemory* *result) @@ -346 +346 @@ - return sGlobalMemory.QueryInterface(NS_GET_IID(nsIMemory), (void**) result); + return /*thower*/ sGlobalMemory.QueryInterface(NS_GET_IID(nsIMemory), (void**) result); --- xpcom/base/nsMemoryImpl.h +++ xpcom/base/nsMemoryImpl.h @@ -52 +52 @@ - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult); + NS_IMETHOD_(void) QueryInterface(REFNSIID aIID, void** aResult); @@ -58,2 +58,2 @@ - static NS_HIDDEN_(nsresult) InitFlusher(); - static NS_METHOD Create(nsISupports* outer, + static NS_HIDDEN_(void) InitFlusher(); + static NS_METHOD_(void) Create(nsISupports* outer, @@ -62,2 +62,2 @@ - NS_HIDDEN_(nsresult) FlushMemory(const PRUnichar* aReason, PRBool aImmediate); - NS_HIDDEN_(nsresult) RunFlushers(const PRUnichar* aReason); + NS_HIDDEN_(void) FlushMemory(const PRUnichar* aReason, PRBool aImmediate); + NS_HIDDEN_(void) RunFlushers(const PRUnichar* aReason); --- xpcom/base/nsStackWalk.cpp +++ xpcom/base/nsStackWalk.cpp @@ -1148 +1148 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -1178 +1178 @@ - return NS_OK; + return; @@ -1181 +1181 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -1194 +1194 @@ - return NS_OK; + return; @@ -1203 +1203 @@ - return NS_OK; + return; @@ -1217 +1217 @@ - return NS_OK; + return; @@ -1220 +1220 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -1234 +1234 @@ - return NS_OK; + return; --- xpcom/base/nsStackWalk.h +++ xpcom/base/nsStackWalk.h @@ -68 +68 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -102 +102 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -122 +122 @@ -XPCOM_API(nsresult) +XPCOM_API(void) --- xpcom/base/nsSystemInfo.cpp +++ xpcom/base/nsSystemInfo.cpp @@ -51,2 +51 @@ -nsresult -nsSystemInfo::Init() +void nsSystemInfo::Init() @@ -54 +54,3 @@ - nsresult rv = nsHashPropertyBag::Init(); + try { + nsHashPropertyBag::Init(); + } @@ -70,2 +70,4 @@ - rv = SetPropertyAsACString(NS_ConvertASCIItoUTF16(items[i].name), - nsDependentCString(buf)); + try { + wrap_nsexception(SetPropertyAsACString(NS_ConvertASCIItoUTF16(items[i].name), + nsDependentCString(buf))); + } --- xpcom/base/nsSystemInfo.h +++ xpcom/base/nsSystemInfo.h @@ -48 +48 @@ - nsresult Init(); + void Init(); --- xpcom/base/nsTraceRefcntImpl.cpp +++ xpcom/base/nsTraceRefcntImpl.cpp @@ -314 +314 @@ - nsresult DumpTotal(PRUint32 nClasses, FILE* out) { + void DumpTotal(PRUint32 nClasses, FILE* out) { @@ -316 +316 @@ - return Dump(-1, out, nsTraceRefcntImpl::ALL_STATS); + return wrap_nsexception(Dump(-1, out, nsTraceRefcntImpl::ALL_STATS)); @@ -324 +324 @@ - static nsresult PrintDumpHeader(FILE* out, const char* msg) { + static void PrintDumpHeader(FILE* out, const char* msg) { @@ -330 +330 @@ - return NS_OK; + return; @@ -333 +333 @@ - nsresult Dump(PRIntn i, FILE* out, nsTraceRefcntImpl::StatisticsType type) { + void Dump(PRIntn i, FILE* out, nsTraceRefcntImpl::StatisticsType type) { @@ -336 +336 @@ - return NS_OK; + return; @@ -374 +374 @@ - return NS_OK; + return; @@ -457,2 +457 @@ -NS_COM nsresult -nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out) +NS_COM void nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out) @@ -463 +463 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -487,2 +487,4 @@ - rv = BloatEntry::PrintDumpHeader(out, msg); - if (NS_FAILED(rv)) goto done; + try { + BloatEntry::PrintDumpHeader(out, msg); + } + catch (nsexception &exc) goto done; @@ -493 +493 @@ - total.DumpTotal(gBloatView->nentries, out); + IGNORE_NSEXCEPTION(total.DumpTotal(gBloatView->nentries, out)); @@ -518 +518 @@ - entry->Dump(i, out, type); + IGNORE_NSEXCEPTION(entry->Dump(i, out, type)); @@ -531 +531 @@ - return rv; + throw nsexception(rv); @@ -833,2 +833,2 @@ - NS_DescribeCodeAddress(aPC, &details); - NS_FormatCodeAddressDetails(aPC, &details, buf, sizeof(buf)); + IGNORE_NSEXCEPTION(NS_DescribeCodeAddress(aPC, &details)); + IGNORE_NSEXCEPTION(NS_FormatCodeAddressDetails(aPC, &details, buf, sizeof(buf))); @@ -843 +843 @@ - NS_StackWalk(PrintStackFrame, 2, aStream); + IGNORE_NSEXCEPTION(NS_StackWalk(PrintStackFrame, 2, aStream)); @@ -898 +898 @@ - nsTraceRefcntImpl::DumpStatistics(); + IGNORE_NSEXCEPTION(nsTraceRefcntImpl::DumpStatistics()); @@ -1235 +1235 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1240 +1240 @@ - return NS_OK; + return; @@ -1243 +1243 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1248 +1248 @@ - return NS_OK; + return; @@ -1251 +1251 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1255 +1255 @@ - return NS_OK; + return; @@ -1258 +1258 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1262 +1262 @@ - return NS_OK; + return; @@ -1265 +1265 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1269 +1269 @@ - return NS_OK; + return; @@ -1272 +1272 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1276 +1276 @@ - return NS_OK; + return; @@ -1281 +1281 @@ -NS_METHOD +NS_METHOD_(void) @@ -1284,2 +1284,2 @@ - return const_cast(&kTraceRefcntImpl)-> - QueryInterface(aIID, aInstancePtr); + return wrap_nsexception(const_cast(&kTraceRefcntImpl)-> + QueryInterface(aIID, aInstancePtr)); --- xpcom/base/nsTraceRefcntImpl.h +++ xpcom/base/nsTraceRefcntImpl.h @@ -58 +58 @@ - static NS_COM nsresult DumpStatistics(StatisticsType type = ALL_STATS, + static NS_COM void DumpStatistics(StatisticsType type = ALL_STATS, @@ -75 +75 @@ - static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + static NS_METHOD_(void) Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); --- xpcom/base/nsUUIDGenerator.cpp +++ xpcom/base/nsUUIDGenerator.cpp @@ -69,2 +69 @@ -nsresult -nsUUIDGenerator::Init() +void nsUUIDGenerator::Init() @@ -88 +88 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -109 +109 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -114 +114 @@ - return NS_OK; + return; @@ -117 +117 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -122 +122 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -124,5 +124,7 @@ - nsresult rv = GenerateUUIDInPlace(id); - if (NS_FAILED(rv)) { - NS_Free(id); - return rv; - } + try { + wrap_nsexception(GenerateUUIDInPlace(id)); + } + catch (nsexception &exc) { + NS_Free(id); + throw nsexception(rv); + } @@ -131 +131 @@ - return rv; + throw nsexception(rv); @@ -134 +134 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -191 +191 @@ - return NS_OK; + return; --- xpcom/base/nsUUIDGenerator.h +++ xpcom/base/nsUUIDGenerator.h @@ -53 +53 @@ - nsresult Init(); + void Init(); --- xpcom/base/nsVersionComparatorImpl.cpp +++ xpcom/base/nsVersionComparatorImpl.cpp @@ -44 +44 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -51 +51 @@ - return NS_OK; + return; --- xpcom/build/nsXPCOM.h +++ xpcom/build/nsXPCOM.h @@ -101 +101 @@ -typedef nsresult (PR_CALLBACK *nsGetModuleProc)(nsIComponentManager *aCompMgr, +typedef void (PR_CALLBACK *nsGetModuleProc)(nsIComponentManager *aCompMgr, @@ -139 +139 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -196 +196 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -216 +216 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -230 +230 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -243 +243 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -256 +256 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -269 +269 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -297 +297 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -302 +302 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -550 +550 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -553 +553 @@ -XPCOM_API(nsresult) +XPCOM_API(void) --- xpcom/build/nsXPCOMPrivate.h +++ xpcom/build/nsXPCOMPrivate.h @@ -64,9 +64,9 @@ -typedef nsresult (* InitFunc)(nsIServiceManager* *result, nsIFile* binDirectory, nsIDirectoryServiceProvider* appFileLocationProvider); -typedef nsresult (* Init3Func)(nsIServiceManager* *result, nsIFile* binDirectory, nsIDirectoryServiceProvider* appFileLocationProvider, nsStaticModuleInfo const *staticComponents, PRUint32 componentCount); -typedef nsresult (* ShutdownFunc)(nsIServiceManager* servMgr); -typedef nsresult (* GetServiceManagerFunc)(nsIServiceManager* *result); -typedef nsresult (* GetComponentManagerFunc)(nsIComponentManager* *result); -typedef nsresult (* GetComponentRegistrarFunc)(nsIComponentRegistrar* *result); -typedef nsresult (* GetMemoryManagerFunc)(nsIMemory* *result); -typedef nsresult (* NewLocalFileFunc)(const nsAString &path, PRBool followLinks, nsILocalFile* *result); -typedef nsresult (* NewNativeLocalFileFunc)(const nsACString &path, PRBool followLinks, nsILocalFile* *result); +typedef void (* InitFunc)(nsIServiceManager* *result, nsIFile* binDirectory, nsIDirectoryServiceProvider* appFileLocationProvider); +typedef void (* Init3Func)(nsIServiceManager* *result, nsIFile* binDirectory, nsIDirectoryServiceProvider* appFileLocationProvider, nsStaticModuleInfo const *staticComponents, PRUint32 componentCount); +typedef void (* ShutdownFunc)(nsIServiceManager* servMgr); +typedef void (* GetServiceManagerFunc)(nsIServiceManager* *result); +typedef void (* GetComponentManagerFunc)(nsIComponentManager* *result); +typedef void (* GetComponentRegistrarFunc)(nsIComponentRegistrar* *result); +typedef void (* GetMemoryManagerFunc)(nsIMemory* *result); +typedef void (* NewLocalFileFunc)(const nsAString &path, PRBool followLinks, nsILocalFile* *result); +typedef void (* NewNativeLocalFileFunc)(const nsACString &path, PRBool followLinks, nsILocalFile* *result); @@ -74,2 +74,2 @@ -typedef nsresult (* GetDebugFunc)(nsIDebug* *result); -typedef nsresult (* GetTraceRefcntFunc)(nsITraceRefcnt* *result); +typedef void (* GetDebugFunc)(nsIDebug* *result); +typedef void (* GetTraceRefcntFunc)(nsITraceRefcnt* *result); @@ -77,2 +77,2 @@ -typedef nsresult (* StringContainerInitFunc)(nsStringContainer&); -typedef nsresult (* StringContainerInit2Func)(nsStringContainer&, const PRUnichar *, PRUint32, PRUint32); +typedef void (* StringContainerInitFunc)(nsStringContainer&); +typedef void (* StringContainerInit2Func)(nsStringContainer&, const PRUnichar *, PRUint32, PRUint32); @@ -83,3 +83,3 @@ -typedef nsresult (* StringSetDataFunc)(nsAString&, const PRUnichar*, PRUint32); -typedef nsresult (* StringSetDataRangeFunc)(nsAString&, PRUint32, PRUint32, const PRUnichar*, PRUint32); -typedef nsresult (* StringCopyFunc)(nsAString &, const nsAString &); +typedef void (* StringSetDataFunc)(nsAString&, const PRUnichar*, PRUint32); +typedef void (* StringSetDataRangeFunc)(nsAString&, PRUint32, PRUint32, const PRUnichar*, PRUint32); +typedef void (* StringCopyFunc)(nsAString &, const nsAString &); @@ -89,2 +89,2 @@ -typedef nsresult (* CStringContainerInitFunc)(nsCStringContainer&); -typedef nsresult (* CStringContainerInit2Func)(nsCStringContainer&, const char *, PRUint32, PRUint32); +typedef void (* CStringContainerInitFunc)(nsCStringContainer&); +typedef void (* CStringContainerInit2Func)(nsCStringContainer&, const char *, PRUint32, PRUint32); @@ -95,3 +95,3 @@ -typedef nsresult (* CStringSetDataFunc)(nsACString&, const char*, PRUint32); -typedef nsresult (* CStringSetDataRangeFunc)(nsACString&, PRUint32, PRUint32, const char*, PRUint32); -typedef nsresult (* CStringCopyFunc)(nsACString &, const nsACString &); +typedef void (* CStringSetDataFunc)(nsACString&, const char*, PRUint32); +typedef void (* CStringSetDataRangeFunc)(nsACString&, PRUint32, PRUint32, const char*, PRUint32); +typedef void (* CStringCopyFunc)(nsACString &, const nsACString &); @@ -101,2 +101,2 @@ -typedef nsresult (* CStringToUTF16)(const nsACString &, nsCStringEncoding, nsAString &); -typedef nsresult (* UTF16ToCString)(const nsAString &, nsCStringEncoding, nsACString &); +typedef void (* CStringToUTF16)(const nsACString &, nsCStringEncoding, nsAString &); +typedef void (* UTF16ToCString)(const nsAString &, nsCStringEncoding, nsACString &); @@ -118 +118 @@ -typedef nsresult (* GetXPTCallStubFunc)(REFNSIID, nsIXPTCProxy*, nsISomeInterface**); +typedef void (* GetXPTCallStubFunc)(REFNSIID, nsIXPTCProxy*, nsISomeInterface**); @@ -120 +120 @@ -typedef nsresult (* InvokeByIndexFunc)(nsISupports*, PRUint32, PRUint32, nsXPTCVariant*); +typedef void (* InvokeByIndexFunc)(nsISupports*, PRUint32, PRUint32, nsXPTCVariant*); @@ -124 +124 @@ -typedef NS_CALLBACK(XPCOMExitRoutine)(void); +typedef NS_CALLBACK_(void, XPCOMExitRoutine)(void); @@ -126,2 +126,2 @@ -typedef nsresult (* RegisterXPCOMExitRoutineFunc)(XPCOMExitRoutine exitRoutine, PRUint32 priority); -typedef nsresult (* UnregisterXPCOMExitRoutineFunc)(XPCOMExitRoutine exitRoutine); +typedef void (* RegisterXPCOMExitRoutineFunc)(XPCOMExitRoutine exitRoutine, PRUint32 priority); +typedef void (* UnregisterXPCOMExitRoutineFunc)(XPCOMExitRoutine exitRoutine); @@ -199,2 +199,2 @@ -typedef nsresult (PR_CALLBACK *GetFrozenFunctionsFunc)(XPCOMFunctions *entryPoints, const char* libraryPath); -XPCOM_API(nsresult) +typedef void (PR_CALLBACK *GetFrozenFunctionsFunc)(XPCOMFunctions *entryPoints, const char* libraryPath); +XPCOM_API(void) --- xpcom/build/nsXPCOMStrings.cpp +++ xpcom/build/nsXPCOMStrings.cpp @@ -46 +46 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -55 +55 @@ - return NS_OK; + return; @@ -58 +58 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -100 +100 @@ - return NS_OK; + return; @@ -149 +149 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -153 +153 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -156 +156 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -166 +166 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -182 +182 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -185 +185 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -189 +189 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -206 +206 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -215 +215 @@ - return NS_OK; + return; @@ -218 +218 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -260 +260 @@ - return NS_OK; + return; @@ -308 +308 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -312 +312 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -315 +315 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -325 +325 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -341 +341 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -344 +344 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -348 +348 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -365 +365 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -379 +379 @@ - NS_CopyNativeToUnicode(aSrc, aDest); + IGNORE_NSEXCEPTION(NS_CopyNativeToUnicode(aSrc, aDest)); @@ -382 +382 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -385 +385 @@ - return NS_OK; // XXX report errors + return; // XXX report errors @@ -388 +388 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -402 +402 @@ - NS_CopyUnicodeToNative(aSrc, aDest); + IGNORE_NSEXCEPTION(NS_CopyUnicodeToNative(aSrc, aDest)); @@ -405 +405 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -408 +408 @@ - return NS_OK; // XXX report errors + return; // XXX report errors --- xpcom/build/nsXPComInit.cpp +++ xpcom/build/nsXPComInit.cpp @@ -107 +107 @@ -extern NS_METHOD nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **); +extern NS_METHOD_(void) nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **); @@ -148,2 +148,2 @@ -extern nsresult NS_RegistryGetFactory(nsIFactory** aFactory); -extern nsresult NS_CategoryManagerGetFactory( nsIFactory** ); +extern void NS_RegistryGetFactory(nsIFactory** aFactory); +extern void NS_CategoryManagerGetFactory( nsIFactory** ); @@ -233 +233 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -241 +241 @@ - return nsThreadManager::get()->QueryInterface(aIID, aInstancePtr); + return wrap_nsexception(nsThreadManager::get()->QueryInterface(aIID, aInstancePtr)); @@ -251 +251 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -262 +262 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -264 +264 @@ - return iim->QueryInterface(aIID, aInstancePtr); + return /*thower*/ iim->QueryInterface(aIID, aInstancePtr); @@ -268 +268 @@ -PR_STATIC_CALLBACK(nsresult) +PR_STATIC_CALLBACK(void) @@ -274,2 +274,4 @@ - rv = NS_NewGenericFactory(&fact, info); - if (NS_FAILED(rv)) return rv; + try { + NS_NewGenericFactory(&fact, info); + } + catch (nsexception &exc) { throw; } @@ -277,4 +277,6 @@ - rv = registrar->RegisterFactory(info->mCID, - info->mDescription, - info->mContractID, - fact); + try { + registrar->RegisterFactory(info->mCID, + info->mDescription, + info->mContractID, + fact); + } @@ -282 +282 @@ - return rv; + throw nsexception(rv); @@ -294,3 +294,5 @@ - rv = nsDirectoryService::gService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, - NS_GET_IID(nsIFile), - getter_AddRefs(file)); + try { + wrap_nsexception(nsDirectoryService::gService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, + NS_GET_IID(nsIFile), + getter_AddRefs(file))); + } @@ -298,4 +298,4 @@ - if (NS_FAILED(rv)) { - NS_WARNING("Getting NS_XPCOM_CURRENT_PROCESS_DIR failed"); - return PR_FALSE; - } + catch (nsexception &exc) { + NS_WARNING("Getting NS_XPCOM_CURRENT_PROCESS_DIR failed"); + return PR_FALSE; + } @@ -303 +303 @@ - file->AppendNative(nsDependentCString(".autoreg")); + IGNORE_NSEXCEPTION(file->AppendNative(nsDependentCString(".autoreg"))); @@ -306 +306 @@ - file->Exists(&exists); + IGNORE_NSEXCEPTION(file->Exists(&exists)); @@ -311,3 +311,5 @@ - rv = nsDirectoryService::gService->Get(NS_XPCOM_COMPONENT_REGISTRY_FILE, - NS_GET_IID(nsIFile), - getter_AddRefs(compregFile)); + try { + wrap_nsexception(nsDirectoryService::gService->Get(NS_XPCOM_COMPONENT_REGISTRY_FILE, + NS_GET_IID(nsIFile), + getter_AddRefs(compregFile))); + } @@ -316,4 +316,4 @@ - if (NS_FAILED(rv)) { - NS_WARNING("Getting NS_XPCOM_COMPONENT_REGISTRY_FILE failed"); - return PR_FALSE; - } + catch (nsexception &exc) { + NS_WARNING("Getting NS_XPCOM_COMPONENT_REGISTRY_FILE failed"); + return PR_FALSE; + } @@ -325,2 +325,2 @@ - compregFile->GetLastModifiedTime(&compregModTime); - file->GetLastModifiedTime(&autoregModTime); + IGNORE_NSEXCEPTION(compregFile->GetLastModifiedTime(&compregModTime)); + IGNORE_NSEXCEPTION(file->GetLastModifiedTime(&autoregModTime)); @@ -463 +463 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -466 +466 @@ - return nsDebugImpl::Create(nsnull, + return /*thower*/ nsDebugImpl::Create(nsnull, @@ -471 +471 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -474 +474 @@ - return nsTraceRefcntImpl::Create(nsnull, + return /*thower*/ nsTraceRefcntImpl::Create(nsnull, @@ -479 +479 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -483 +483 @@ - return NS_InitXPCOM3(result, binDirectory, nsnull, nsnull, 0); + return /*thower*/ NS_InitXPCOM3(result, binDirectory, nsnull, nsnull, 0); @@ -486 +486 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -491 +491 @@ - return NS_InitXPCOM3(result, binDirectory, appFileLocationProvider, nsnull, 0); + return /*thower*/ NS_InitXPCOM3(result, binDirectory, appFileLocationProvider, nsnull, 0); @@ -494 +494 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -516,2 +516,4 @@ - rv = nsThreadManager::get()->Init(); - if (NS_FAILED(rv)) return rv; + try { + nsThreadManager::get()->Init(); + } + catch (nsexception &exc) { throw; } @@ -520 +520,3 @@ - rv = nsTimerImpl::Startup(); + try { + nsTimerImpl::Startup(); + } @@ -537,3 +537,4 @@ - rv = nsDirectoryService::RealInit(); - if (NS_FAILED(rv)) - return rv; + try { + nsDirectoryService::RealInit(); + } + catch (nsexception &exc) { throw; } @@ -546 +546,3 @@ - rv = binDirectory->IsDirectory(&value); + try { + binDirectory->IsDirectory(&value); + } @@ -550 +550 @@ - binDirectory->Clone(getter_AddRefs(xpcomLib)); + IGNORE_NSEXCEPTION(binDirectory->Clone(getter_AddRefs(xpcomLib))); @@ -560 +560 @@ - xpcomLib->AppendNative(nsDependentCString(XPCOM_DLL)); + IGNORE_NSEXCEPTION(xpcomLib->AppendNative(nsDependentCString(XPCOM_DLL))); @@ -565,2 +565,4 @@ - rv = nsDirectoryService::gService->RegisterProvider(appFileLocationProvider); - if (NS_FAILED(rv)) return rv; + try { + wrap_nsexception(nsDirectoryService::gService->RegisterProvider(appFileLocationProvider)); + } + catch (nsexception &exc) { throw; } @@ -574 +574 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -577,6 +577,7 @@ - rv = compMgr->Init(staticComponents, componentCount); - if (NS_FAILED(rv)) - { - NS_RELEASE(compMgr); - return rv; - } + try { + compMgr->Init(staticComponents, componentCount); + } + catch (nsexception &exc) { + NS_RELEASE(compMgr); + throw nsexception(rv); + } @@ -594,3 +594,5 @@ - NS_GetMemoryManager(getter_AddRefs(memory)); - rv = compMgr->RegisterService(kMemoryCID, memory); - if (NS_FAILED(rv)) return rv; + IGNORE_NSEXCEPTION(NS_GetMemoryManager(getter_AddRefs(memory))); + try { + wrap_nsexception(compMgr->RegisterService(kMemoryCID, memory)); + } + catch (nsexception &exc) { throw; } @@ -598,2 +598,4 @@ - rv = compMgr->RegisterService(kComponentManagerCID, static_cast(compMgr)); - if (NS_FAILED(rv)) return rv; + try { + wrap_nsexception(compMgr->RegisterService(kComponentManagerCID, static_cast(compMgr))); + } + catch (nsexception &exc) { throw; } @@ -606,2 +606,4 @@ - rv = nsCycleCollector_startup(); - if (NS_FAILED(rv)) return rv; + try { + nsCycleCollector_startup(); + } + catch (nsexception &exc) { throw; } @@ -616 +616 @@ - return rv; + throw nsexception(rv); @@ -620,6 +620,8 @@ - rv = compMgr->RegisterFactory(kCategoryManagerCID, - NS_CATEGORYMANAGER_CLASSNAME, - NS_CATEGORYMANAGER_CONTRACTID, - categoryManagerFactory, - PR_TRUE); - if ( NS_FAILED(rv) ) return rv; + try { + wrap_nsexception(compMgr->RegisterFactory(kCategoryManagerCID, + NS_CATEGORYMANAGER_CLASSNAME, + NS_CATEGORYMANAGER_CONTRACTID, + categoryManagerFactory, + PR_TRUE)); + } + catch (nsexception &exc) { throw; } @@ -632 +632 @@ - RegisterGenericFactory(registrar, &components[i]); + IGNORE_NSEXCEPTION(RegisterGenericFactory(registrar, &components[i])); @@ -636,4 +636,4 @@ - registrar->RegisterFactory(kINIParserFactoryCID, - "nsINIParserFactory", - NS_INIPARSERFACTORY_CONTRACTID, - iniParserFactory); + IGNORE_NSEXCEPTION(registrar->RegisterFactory(kINIParserFactoryCID, + "nsINIParserFactory", + NS_INIPARSERFACTORY_CONTRACTID, + iniParserFactory)); @@ -641,5 +641,5 @@ - registrar-> - RegisterFactory(kSimpleUnicharStreamFactoryCID, - "nsSimpleUnicharStreamFactory", - NS_SIMPLE_UNICHAR_STREAM_FACTORY_CONTRACTID, - nsSimpleUnicharStreamFactory::GetInstance()); + IGNORE_NSEXCEPTION(registrar-> + RegisterFactory(kSimpleUnicharStreamFactoryCID, + "nsSimpleUnicharStreamFactory", + NS_SIMPLE_UNICHAR_STREAM_FACTORY_CONTRACTID, + nsSimpleUnicharStreamFactory::GetInstance())); @@ -657 +657 @@ - nsComponentManagerImpl::gComponentManager->AutoRegister(nsnull); + IGNORE_NSEXCEPTION(nsComponentManagerImpl::gComponentManager->AutoRegister(nsnull)); @@ -666 +666 @@ - nsMemoryImpl::InitFlusher(); + IGNORE_NSEXCEPTION(nsMemoryImpl::InitFlusher()); @@ -669,3 +669,3 @@ - NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID, - nsnull, - NS_XPCOM_STARTUP_OBSERVER_ID); + IGNORE_NSEXCEPTION(NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID, + nsnull, + NS_XPCOM_STARTUP_OBSERVER_ID)); @@ -673 +673 @@ - return NS_OK; + return; @@ -698 +698 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -721 +721,3 @@ - rv = NS_GetServiceManager(getter_AddRefs(mgr)); + try { + NS_GetServiceManager(getter_AddRefs(mgr)); + } @@ -730 +730 @@ - NS_ProcessPendingEvents(thread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(thread)); @@ -737 +737 @@ - NS_ProcessPendingEvents(thread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(thread)); @@ -743 +743 @@ - NS_ProcessPendingEvents(thread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(thread)); @@ -750 +750 @@ - NS_ProcessPendingEvents(thread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(thread)); @@ -777 +777 @@ - nsComponentManagerImpl::gComponentManager->FreeServices(); + IGNORE_NSEXCEPTION(nsComponentManagerImpl::gComponentManager->FreeServices()); @@ -792 +792 @@ - moduleLoaders->GetNext(getter_AddRefs(el)); + IGNORE_NSEXCEPTION(moduleLoaders->GetNext(getter_AddRefs(el))); @@ -817 +817,3 @@ - rv = (nsComponentManagerImpl::gComponentManager)->Shutdown(); + try { + (nsComponentManagerImpl::gComponentManager)->Shutdown(); + } @@ -854 +854 @@ - return NS_OK; + return; --- xpcom/components/nsCategoryManager.cpp +++ xpcom/components/nsCategoryManager.cpp @@ -125 +125 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -130 +130 @@ - return NS_OK; + return; @@ -133 +133 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -137 +137 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -141,2 +141 @@ - if (!str) - return NS_ERROR_OUT_OF_MEMORY; + @@ -146 +146 @@ - return NS_OK; + return; @@ -149 +149 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -154 +154 @@ - return NS_OK; + return; @@ -157 +157 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -161 +161 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -164 +164 @@ - return NS_OK; + return; @@ -268 +268 @@ -NS_METHOD +NS_METHOD_(void) @@ -285 +285 @@ - return rv; + throw nsexception(rv); @@ -288 +288 @@ -NS_METHOD +NS_METHOD_(void) @@ -326 +326 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -340 +340 @@ - return rv; + throw nsexception(rv); @@ -343 +343 @@ -NS_METHOD +NS_METHOD_(void) @@ -369 +369 @@ - return NS_OK; + return; @@ -372 +372 @@ -NS_METHOD +NS_METHOD_(void) @@ -381,2 +381 @@ - if (!enumObj) - return NS_ERROR_OUT_OF_MEMORY; + @@ -386 +386 @@ - return NS_OK; + return; @@ -550,5 +550,5 @@ - NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD, - NS_GET_IID(nsIObserverService), - observerService, - NS_PROXY_ASYNC, - getter_AddRefs(obsProxy)); + IGNORE_NSEXCEPTION(NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD, + NS_GET_IID(nsIObserverService), + observerService, + NS_PROXY_ASYNC, + getter_AddRefs(obsProxy))); @@ -564,3 +564,4 @@ - nsresult rv = entry->SetData(nsDependentCString(aEntryName)); - if (NS_FAILED(rv)) - return; + try { + entry->SetData(nsDependentCString(aEntryName)); + } + catch (nsexception &exc) return; @@ -568,2 +568,2 @@ - obsProxy->NotifyObservers(entry, aTopic, - NS_ConvertUTF8toUTF16(aCategoryName).get()); + IGNORE_NSEXCEPTION(obsProxy->NotifyObservers(entry, aTopic, + NS_ConvertUTF8toUTF16(aCategoryName).get())); @@ -571,2 +571,2 @@ - obsProxy->NotifyObservers(this, aTopic, - NS_ConvertUTF8toUTF16(aCategoryName).get()); + IGNORE_NSEXCEPTION(obsProxy->NotifyObservers(this, aTopic, + NS_ConvertUTF8toUTF16(aCategoryName).get())); @@ -576 +576 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -592 +592,3 @@ - status = category->GetLeaf(aEntryName, _retval); + try { + category->GetLeaf(aEntryName, _retval); + } @@ -595 +595 @@ - return status; + throw nsexception(status); @@ -598 +598 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -624,2 +624 @@ - if (!category) - return NS_ERROR_OUT_OF_MEMORY; + @@ -630,6 +630,8 @@ - nsresult rv = category->AddLeaf(aEntryName, - aValue, - aPersist, - aReplace, - &oldEntry, - &mArena); + try { + category->AddLeaf(aEntryName, + aValue, + aPersist, + aReplace, + &oldEntry, + &mArena); + } @@ -651 +651 @@ - return rv; + throw nsexception(rv); @@ -654 +654 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -673 +673 @@ - return NS_OK; + return; @@ -675,2 +675,4 @@ - nsresult rv = category->DeleteLeaf(aEntryName, - aDontPersist); + try { + category->DeleteLeaf(aEntryName, + aDontPersist); + } @@ -683 +683 @@ - return rv; + throw nsexception(rv); @@ -686 +686 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -705 +705 @@ - return NS_OK; + return; @@ -708 +708 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -720 +720 @@ - return NS_NewEmptyEnumerator(_retval); + return /*thower*/ NS_NewEmptyEnumerator(_retval); @@ -723 +723 @@ - return category->Enumerate(_retval); + return /*thower*/ category->Enumerate(_retval); @@ -726 +726 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -735,2 +735 @@ - if (!enumObj) - return NS_ERROR_OUT_OF_MEMORY; + @@ -740 +740 @@ - return NS_OK; + return; @@ -763 +763 @@ -NS_METHOD +NS_METHOD_(void) @@ -776 +776 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -779 +779 @@ - return NS_OK; + return; @@ -782 +782 @@ -NS_METHOD +NS_METHOD_(void) @@ -786 +786 @@ - return NS_OK; + return; @@ -800 +800 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -815 +815,3 @@ - status = new_category_manager->QueryInterface(aIID, aResult); + try { + new_category_manager->QueryInterface(aIID, aResult); + } @@ -820 +820 @@ - return status; + throw nsexception(status); @@ -823 +823 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -827 +827 @@ - return NS_OK; + return; @@ -830,2 +830 @@ -nsresult -NS_CategoryManagerGetFactory( nsIFactory** aFactory ) +void NS_CategoryManagerGetFactory( nsIFactory** aFactory ) @@ -848 +848 @@ - return status; + throw nsexception(status); @@ -862,2 +862 @@ -NS_COM nsresult -NS_CreateServicesFromCategory(const char *category, +NS_COM void NS_CreateServicesFromCategory(const char *category, @@ -872 +872 @@ - if (!categoryManager) return rv; + if (!categoryManager) throw nsexception(rv); @@ -875,3 +875,5 @@ - rv = categoryManager->EnumerateCategory(category, - getter_AddRefs(enumerator)); - if (NS_FAILED(rv)) return rv; + try { + categoryManager->EnumerateCategory(category, + getter_AddRefs(enumerator)); + } + catch (nsexception &exc) { throw; } @@ -883,4 +883,4 @@ - if (NS_FAILED(rv)) { - nFailed++; - continue; - } + catch (nsexception &exc) { + nFailed++; + continue; + } @@ -888,5 +888,7 @@ - rv = catEntry->GetData(entryString); - if (NS_FAILED(rv)) { - nFailed++; - continue; - } + try { + catEntry->GetData(entryString); + } + catch (nsexception &exc) { + nFailed++; + continue; + } @@ -894,5 +894,7 @@ - rv = categoryManager->GetCategoryEntry(category,entryString.get(), getter_Copies(contractID)); - if (NS_FAILED(rv)) { - nFailed++; - continue; - } + try { + categoryManager->GetCategoryEntry(category,entryString.get(), getter_Copies(contractID)); + } + catch (nsexception &exc) { + nFailed++; + continue; + } @@ -901,4 +901,4 @@ - if (NS_FAILED(rv)) { - nFailed++; - continue; - } + catch (nsexception &exc) { + nFailed++; + continue; + } @@ -910 +910 @@ - observer->Observe(origin, observerTopic, EmptyString().get()); + IGNORE_NSEXCEPTION(observer->Observe(origin, observerTopic, EmptyString().get())); @@ -913 +913 @@ - return (nFailed ? NS_ERROR_FAILURE : NS_OK); + return wrap_nsexception(nFailed ? NS_ERROR_FAILURE : NS_OK)); --- xpcom/components/nsCategoryManager.h +++ xpcom/components/nsCategoryManager.h @@ -83 +83 @@ - NS_METHOD GetLeaf(const char* aEntryName, + NS_METHOD_(void) GetLeaf(const char* aEntryName, @@ -86 +86 @@ - NS_METHOD AddLeaf(const char* aEntryName, + NS_METHOD_(void) AddLeaf(const char* aEntryName, @@ -93 +93 @@ - NS_METHOD DeleteLeaf(const char* aEntryName, + NS_METHOD_(void) DeleteLeaf(const char* aEntryName, @@ -109 +109 @@ - NS_METHOD Enumerate(nsISimpleEnumerator** _retval); + NS_METHOD_(void) Enumerate(nsISimpleEnumerator** _retval); @@ -143 +143 @@ - NS_METHOD WriteCategoryManagerToRegistry(PRFileDesc* fd); + NS_METHOD_(void) WriteCategoryManagerToRegistry(PRFileDesc* fd); @@ -150 +150 @@ - NS_METHOD SuppressNotifications(PRBool aSuppress); + NS_METHOD_(void) SuppressNotifications(PRBool aSuppress); --- xpcom/components/nsCategoryManagerUtils.h +++ xpcom/components/nsCategoryManagerUtils.h @@ -44,2 +44 @@ -NS_COM nsresult -NS_CreateServicesFromCategory(const char *category, +NS_COM void NS_CreateServicesFromCategory(const char *category, @@ -75 +75 @@ - nsresult *mErrorPtr; + void *mErrorPtr; --- xpcom/components/nsComponentManager.cpp +++ xpcom/components/nsComponentManager.cpp @@ -181 +181 @@ - if (NS_FAILED(rv)) goto error; + catch (nsexception &exc) goto error; @@ -190,3 +190,5 @@ - rv = catman->GetCategoryEntry(mCategory, mEntry, - getter_Copies(value)); - if (NS_FAILED(rv)) goto error; + try { + catman->GetCategoryEntry(mCategory, mEntry, + getter_Copies(value)); + } + catch (nsexception &exc) goto error; @@ -197 +197 @@ - NS_GetComponentManager(getter_AddRefs(compMgr)); + IGNORE_NSEXCEPTION(NS_GetComponentManager(getter_AddRefs(compMgr))); @@ -202,5 +202,7 @@ - rv = compMgr->CreateInstanceByContractID(value, mOuter, aIID, &result); - if (NS_FAILED(rv)) { - error: - result = NULL; - } + try { + compMgr->CreateInstanceByContractID(value, mOuter, aIID, &result); + } + catch (nsexception &exc) { + error: + result = NULL; + } @@ -233,4 +233,6 @@ - rv = compMgr->nsComponentManagerImpl::GetService(kCategoryManagerCID, - NS_GET_IID(nsICategoryManager), - getter_AddRefs(catman)); - if (NS_FAILED(rv)) goto error; + try { + wrap_nsexception(compMgr->nsComponentManagerImpl::GetService(kCategoryManagerCID, + NS_GET_IID(nsICategoryManager), + getter_AddRefs(catman))); + } + catch (nsexception &exc) goto error; @@ -239,3 +239,5 @@ - rv = catman->GetCategoryEntry(mCategory, mEntry, - getter_Copies(value)); - if (NS_FAILED(rv)) goto error; + try { + catman->GetCategoryEntry(mCategory, mEntry, + getter_Copies(value)); + } + catch (nsexception &exc) goto error; @@ -247,7 +247,9 @@ - rv = compMgr-> - nsComponentManagerImpl::GetServiceByContractID(value, - aIID, &result); - if (NS_FAILED(rv)) { - error: - result = NULL; - } + try { + wrap_nsexception(compMgr-> + nsComponentManagerImpl::GetServiceByContractID(value, + aIID, &result)); + } + catch (nsexception &exc) { + error: + result = NULL; + } @@ -355 +355 @@ -typedef NS_CALLBACK(EnumeratorConverter)(PLDHashTable *table, +typedef NS_CALLBACK_(void, EnumeratorConverter)(PLDHashTable *table, @@ -457 +457 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -466,2 +466 @@ - if (!impl) - return NS_ERROR_OUT_OF_MEMORY; + @@ -474 +474 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -478 +478 @@ - return NS_OK; + return; @@ -481 +481 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -485 +485 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -488 +488 @@ - return NS_OK; + return; @@ -491 +491 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -495 +495 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -497 +497 @@ - return NS_OK; + return; @@ -500 +500 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -504 +504 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -507 +507 @@ - return NS_OK; + return; @@ -510 +510 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -515 +515 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -517 +517 @@ - return NS_OK; + return; @@ -520 +520 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -524 +524 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -530 +530 @@ - return NS_OK; + return; @@ -533 +533 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -537 +537 @@ - return NS_OK; + return; @@ -539 +539 @@ - return NS_ENUMERATOR_FALSE; + throw nsexception(NS_ENUMERATOR_FALSE); @@ -542 +542 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -550 +550 @@ - return NS_OK; + return; @@ -553 +553 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -556,2 +556,4 @@ - nsresult rv = Next(); - if (NS_FAILED(rv)) return rv; + try { + Next(); + } + catch (nsexception &exc) { throw; } @@ -559 +559 @@ - return CurrentItem(_retval); + return /*thower*/ CurrentItem(_retval); @@ -562 +562 @@ -static NS_IMETHODIMP +static NS_IMETHODIMP_(void) @@ -572,2 +572,4 @@ - rv = cm->CreateInstanceByContractID(NS_SUPPORTS_ID_CONTRACTID, nsnull, - NS_GET_IID(nsISupportsID), getter_AddRefs(wrapper)); + try { + wrap_nsexception(cm->CreateInstanceByContractID(NS_SUPPORTS_ID_CONTRACTID, nsnull, + NS_GET_IID(nsISupportsID), getter_AddRefs(wrapper))); + } @@ -582 +582 @@ - wrapper->SetData(&fe->mCid); + IGNORE_NSEXCEPTION(wrapper->SetData(&fe->mCid)); @@ -585 +585 @@ - return NS_OK; + return; @@ -589 +589 @@ - return rv; + throw nsexception(rv); @@ -592 +592 @@ -static NS_IMETHODIMP +static NS_IMETHODIMP_(void) @@ -602,2 +602,4 @@ - rv = cm->CreateInstanceByContractID(NS_SUPPORTS_CSTRING_CONTRACTID, nsnull, - NS_GET_IID(nsISupportsCString), getter_AddRefs(wrapper)); + try { + wrap_nsexception(cm->CreateInstanceByContractID(NS_SUPPORTS_CSTRING_CONTRACTID, nsnull, + NS_GET_IID(nsISupportsCString), getter_AddRefs(wrapper))); + } @@ -610,2 +610,2 @@ - wrapper->SetData(nsDependentCString(entry->mContractID, - entry->mContractIDLen)); + IGNORE_NSEXCEPTION(wrapper->SetData(nsDependentCString(entry->mContractID, + entry->mContractIDLen))); @@ -614 +614 @@ - return NS_OK; + return; @@ -618 +618 @@ -static nsresult GetLocationFromDirectoryService(const char* prop, +static void GetLocationFromDirectoryService(const char* prop, @@ -622,3 +622,3 @@ - nsDirectoryService::Create(nsnull, - NS_GET_IID(nsIProperties), - getter_AddRefs(directoryService)); + IGNORE_NSEXCEPTION(nsDirectoryService::Create(nsnull, + NS_GET_IID(nsIProperties), + getter_AddRefs(directoryService))); @@ -627 +627 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -629 +629 @@ - return directoryService->Get(prop, + return /*thower*/ directoryService->Get(prop, @@ -651 +651 @@ -nsresult nsComponentManagerImpl::Init(nsStaticModuleInfo const *aStaticModules, +void nsComponentManagerImpl::Init(nsStaticModuleInfo const *aStaticModules, @@ -656 +656 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -673 +673 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -688 +688 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -701 +701 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -706 +706 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -709,3 +709,2 @@ - GetLocationFromDirectoryService(NS_XPCOM_COMPONENT_DIR, getter_AddRefs(mComponentsDir)); - if (!mComponentsDir) - return NS_ERROR_OUT_OF_MEMORY; + IGNORE_NSEXCEPTION(GetLocationFromDirectoryService(NS_XPCOM_COMPONENT_DIR, getter_AddRefs(mComponentsDir))); + @@ -714,3 +714,4 @@ - nsresult rv = mComponentsDir->GetNativePath(componentDescriptor); - if (NS_FAILED(rv)) - return rv; + try { + mComponentsDir->GetNativePath(componentDescriptor); + } + catch (nsexception &exc) { throw; } @@ -720 +720 @@ - GetLocationFromDirectoryService(NS_GRE_COMPONENT_DIR, getter_AddRefs(mGREComponentsDir)); + IGNORE_NSEXCEPTION(GetLocationFromDirectoryService(NS_GRE_COMPONENT_DIR, getter_AddRefs(mGREComponentsDir))); @@ -722,5 +722,7 @@ - nsresult rv = mGREComponentsDir->GetNativePath(componentDescriptor); - if (NS_FAILED(rv)) { - NS_WARNING("No GRE component manager"); - return rv; - } + try { + mGREComponentsDir->GetNativePath(componentDescriptor); + } + catch (nsexception &exc) { + NS_WARNING("No GRE component manager"); + throw nsexception(rv); + } @@ -730,2 +730,2 @@ - GetLocationFromDirectoryService(NS_XPCOM_COMPONENT_REGISTRY_FILE, - getter_AddRefs(mRegistryFile)); + IGNORE_NSEXCEPTION(GetLocationFromDirectoryService(NS_XPCOM_COMPONENT_REGISTRY_FILE, + getter_AddRefs(mRegistryFile))); @@ -735 +735 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -741,3 +741,4 @@ - rv = mNativeModuleLoader.Init(); - if (NS_FAILED(rv)) - return rv; + try { + mNativeModuleLoader.Init(); + } + catch (nsexception &exc) { throw; } @@ -745,3 +745,4 @@ - rv = mStaticModuleLoader.Init(aStaticModules, aStaticModuleCount); - if (NS_FAILED(rv)) - return rv; + try { + mStaticModuleLoader.Init(aStaticModules, aStaticModuleCount); + } + catch (nsexception &exc) { throw; } @@ -749 +749 @@ - return NS_OK; + return; @@ -752 +752 @@ -nsresult nsComponentManagerImpl::Shutdown(void) +void nsComponentManagerImpl::Shutdown(void) @@ -756 +756 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -765,7 +765,9 @@ - nsresult rv = WritePersistentRegistry(); - if (NS_FAILED(rv)) { - PR_LOG(nsComponentManagerLog, PR_LOG_ERROR, ("nsComponentManager: Could not write out perisistant registry.")); -#ifdef DEBUG - printf("Could not write out perisistant registry!\n"); -#endif - } + try { + WritePersistentRegistry(); + } + catch (nsexception &exc) { + PR_LOG(nsComponentManagerLog, PR_LOG_ERROR, ("nsComponentManager: Could not write out perisistant registry.")); +#ifdef DEBUG + printf("Could not write out perisistant registry!\n"); +#endif + } @@ -805 +805 @@ - return NS_OK; + return; @@ -813 +813 @@ - Shutdown(); + IGNORE_NSEXCEPTION(Shutdown()); @@ -831,2 +831 @@ -nsresult -nsComponentManagerImpl::GetInterface(const nsIID & uuid, void **result) +void nsComponentManagerImpl::GetInterface(const nsIID & uuid, void **result) @@ -837 +837 @@ - return QueryInterface(uuid, result); + return wrap_nsexception(QueryInterface(uuid, result)); @@ -877,2 +877 @@ -nsresult -nsComponentManagerImpl::ReadPersistentRegistry() +void nsComponentManagerImpl::ReadPersistentRegistry() @@ -887,2 +887 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -897 +897 @@ - return NS_ERROR_FILE_NOT_FOUND; + throw nsexception(NS_ERROR_FILE_NOT_FOUND); @@ -901,3 +901,2 @@ - mRegistryFile->Clone(getter_AddRefs(file)); - if (!file) - return NS_ERROR_OUT_OF_MEMORY; + IGNORE_NSEXCEPTION(mRegistryFile->Clone(getter_AddRefs(file))); + @@ -907,3 +907,4 @@ - rv = localFile->OpenNSPRFileDesc(PR_RDONLY, 0444, &fd); - if (NS_FAILED(rv)) - return rv; + try { + localFile->OpenNSPRFileDesc(PR_RDONLY, 0444, &fd); + } + catch (nsexception &exc) { throw; } @@ -912,6 +912,7 @@ - rv = localFile->GetFileSize(&fileSize); - if (NS_FAILED(rv)) - { - PR_Close(fd); - return rv; - } + try { + localFile->GetFileSize(&fileSize); + } + catch (nsexception &exc) { + PR_Close(fd); + throw nsexception(rv); + } @@ -924 +924 @@ - return NS_OK; // ERROR CONDITION + return; // ERROR CONDITION @@ -981,4 +981,5 @@ - rv = FileForRegistryLocation(nsDependentCString(values[0], lengths[0]), - getter_AddRefs(lf)); - if (NS_FAILED(rv)) - continue; + try { + FileForRegistryLocation(nsDependentCString(values[0], lengths[0]), + getter_AddRefs(lf)); + } + catch (nsexception &exc) continue; @@ -1124 +1124 @@ - AddPendingCID(entry->mCid); + IGNORE_NSEXCEPTION(AddPendingCID(entry->mCid)); @@ -1133 +1133 @@ - mCategoryManager->SuppressNotifications(PR_TRUE); + IGNORE_NSEXCEPTION(mCategoryManager->SuppressNotifications(PR_TRUE)); @@ -1152 +1152 @@ - mCategoryManager->SuppressNotifications(PR_FALSE); + IGNORE_NSEXCEPTION(mCategoryManager->SuppressNotifications(PR_FALSE)); @@ -1162 +1162 @@ - return rv; + throw nsexception(rv); @@ -1221,2 +1221,2 @@ - classInfo->GetContractID(&contractID); - classInfo->GetClassDescription(&className); + IGNORE_NSEXCEPTION(classInfo->GetContractID(&contractID)); + IGNORE_NSEXCEPTION(classInfo->GetClassDescription(&className)); @@ -1266,2 +1266,2 @@ - nsComponentManagerImpl::gComponentManager-> - RegistryLocationForFile(lf, location); + IGNORE_NSEXCEPTION(nsComponentManagerImpl::gComponentManager-> + RegistryLocationForFile(lf, location)); @@ -1274,2 +1274 @@ -nsresult -nsComponentManagerImpl::WritePersistentRegistry() +void nsComponentManagerImpl::WritePersistentRegistry() @@ -1278 +1278 @@ - return NS_ERROR_FAILURE; // this should have been set by Init(). + throw nsexception(NS_ERROR_FAILURE); // this should have been set by Init(). @@ -1281,3 +1281,2 @@ - mRegistryFile->Clone(getter_AddRefs(file)); - if (!file) - return NS_ERROR_OUT_OF_MEMORY; + IGNORE_NSEXCEPTION(mRegistryFile->Clone(getter_AddRefs(file))); + @@ -1288 +1288 @@ - localFile->GetNativeLeafName(originalLeafName); + IGNORE_NSEXCEPTION(localFile->GetNativeLeafName(originalLeafName)); @@ -1293 +1293 @@ - localFile->SetNativeLeafName(leafName); + IGNORE_NSEXCEPTION(localFile->SetNativeLeafName(leafName)); @@ -1297,3 +1297,4 @@ - nsresult rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0664, &fd); - if (NS_FAILED(rv)) - return rv; + try { + localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0664, &fd); + } + catch (nsexception &exc) { throw; } @@ -1347 +1347,3 @@ - rv = mCategoryManager->WriteCategoryManagerToRegistry(fd); + try { + mCategoryManager->WriteCategoryManagerToRegistry(fd); + } @@ -1356 +1356 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -1360 +1360 @@ - return PR_FALSE; + return wrap_nsexception(PR_FALSE); @@ -1363 +1363 @@ - return PR_FALSE; + return wrap_nsexception(PR_FALSE); @@ -1366 +1366 @@ - mRegistryFile->GetParent(getter_AddRefs(parent)); + IGNORE_NSEXCEPTION(mRegistryFile->GetParent(getter_AddRefs(parent))); @@ -1368 +1368,3 @@ - rv = localFile->MoveToNative(parent, originalLeafName); + try { + localFile->MoveToNative(parent, originalLeafName); + } @@ -1371 +1371 @@ - return rv; + throw nsexception(rv); @@ -1378,2 +1378 @@ -nsresult -nsComponentManagerImpl::HashContractID(const char *aContractID, +void nsComponentManagerImpl::HashContractID(const char *aContractID, @@ -1384 +1384 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1392,2 +1392 @@ - if (!contractIDTableEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1399,2 +1399 @@ - if (!contractID) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1408 +1408 @@ - return NS_OK; + return; @@ -1464 +1464 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1473 +1473 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -1475 +1475 @@ - return entry->GetFactory(aFactory); + return /*thower*/ entry->GetFactory(aFactory); @@ -1479,2 +1479 @@ -nsresult -nsComponentManagerImpl::FindFactory(const char *contractID, +void nsComponentManagerImpl::FindFactory(const char *contractID, @@ -1489 +1489 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -1491 +1491 @@ - return entry->GetFactory(aFactory); + return /*thower*/ entry->GetFactory(aFactory); @@ -1500 +1500 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1520,2 +1520,4 @@ - rv = FindFactory(aClass, getter_AddRefs(factory)); - if (NS_FAILED(rv)) return rv; + try { + FindFactory(aClass, getter_AddRefs(factory)); + } + catch (nsexception &exc) { throw; } @@ -1523 +1523,3 @@ - rv = factory->QueryInterface(aIID, aResult); + try { + factory->QueryInterface(aIID, aResult); + } @@ -1528 +1528 @@ - return rv; + throw nsexception(rv); @@ -1532 +1532 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1550,2 +1550,4 @@ - rv = FindFactory(contractID, strlen(contractID), getter_AddRefs(factory)); - if (NS_FAILED(rv)) return rv; + try { + FindFactory(contractID, strlen(contractID), getter_AddRefs(factory)); + } + catch (nsexception &exc) { throw; } @@ -1553 +1553,3 @@ - rv = factory->QueryInterface(aIID, aResult); + try { + factory->QueryInterface(aIID, aResult); + } @@ -1558 +1558 @@ - return rv; + throw nsexception(rv); @@ -1567 +1567 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1572 +1572 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1576 +1576 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1597 +1597 @@ - return rv; + throw nsexception(rv); @@ -1608 +1608 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1627 +1627 @@ - return rv; + throw nsexception(rv); @@ -1633,2 +1633 @@ -nsresult -nsComponentManagerImpl::AddPendingCID(const nsCID &aClass) +void nsComponentManagerImpl::AddPendingCID(const nsCID &aClass) @@ -1650 +1650 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -1654 +1654 @@ - return NS_OK; + return; @@ -1671 +1671 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1689 +1689 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1694 +1694 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1701 +1701 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -1715 +1715,3 @@ - nsresult rv = entry->GetFactory(&factory); + try { + entry->GetFactory(&factory); + } @@ -1719 +1719,3 @@ - rv = factory->CreateInstance(aDelegate, aIID, aResult); + try { + factory->CreateInstance(aDelegate, aIID, aResult); + } @@ -1744 +1744 @@ - return rv; + throw nsexception(rv); @@ -1756 +1756 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1773 +1773 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1778 +1778 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1785 +1785 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -1800 +1800,3 @@ - nsresult rv = entry->GetFactory(&factory); + try { + entry->GetFactory(&factory); + } @@ -1805 +1805,3 @@ - rv = factory->CreateInstance(aDelegate, aIID, aResult); + try { + factory->CreateInstance(aDelegate, aIID, aResult); + } @@ -1822 +1822 @@ - return rv; + throw nsexception(rv); @@ -1860,2 +1860 @@ -nsresult -nsComponentManagerImpl::FreeServices() +void nsComponentManagerImpl::FreeServices() @@ -1866 +1866 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1877 +1877 @@ - return NS_OK; + return; @@ -1880 +1880 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1897 +1897 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1917 +1917 @@ - return supports->QueryInterface(aIID, result); + return /*thower*/ supports->QueryInterface(aIID, result); @@ -1921,3 +1921,4 @@ - rv = AddPendingCID(aClass); - if (NS_FAILED(rv)) - return rv; // NOP_AND_BREAK + try { + AddPendingCID(aClass); + } + catch (nsexception &exc) { throw; } // NOP_AND_BREAK @@ -1931 +1931,3 @@ - rv = CreateInstance(aClass, nsnull, aIID, getter_AddRefs(service)); + try { + CreateInstance(aClass, nsnull, aIID, getter_AddRefs(service)); + } @@ -1939,2 +1939 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1951 +1951 @@ - if (!entry) return NS_ERROR_FAILURE; + if (!entry) throw nsexception(NS_ERROR_FAILURE); @@ -1958 +1958 @@ - return NS_ERROR_SERVICE_NOT_FOUND; + return wrap_nsexception(NS_ERROR_SERVICE_NOT_FOUND); @@ -1961 +1961 @@ - return rv; + throw nsexception(rv); @@ -1964 +1964 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1975,2 +1975 @@ - if (!mem) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1983,2 +1983 @@ - if (!factoryTableEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1990 +1990 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1994 +1994 @@ - return NS_OK; + return; @@ -1997 +1997 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2016 +2016 @@ - return NS_ERROR_SERVICE_NOT_AVAILABLE; + return wrap_nsexception(NS_ERROR_SERVICE_NOT_AVAILABLE); @@ -2019 +2019 @@ - return rv; + throw nsexception(rv); @@ -2022 +2022 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2036,2 +2036 @@ - if (!mem) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2046 +2046 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2051,2 +2051 @@ - if (!contractID) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2062 +2062 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2066 +2066 @@ - return NS_OK; + return; @@ -2070 +2070 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2090 +2090 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -2106 +2106,3 @@ - rv = entry->mServiceObject->QueryInterface(aIID, getter_AddRefs(service)); + try { + entry->mServiceObject->QueryInterface(aIID, getter_AddRefs(service)); + } @@ -2109 +2109 @@ - return rv; + throw nsexception(rv); @@ -2113 +2113 @@ -NS_IMETHODIMP nsComponentManagerImpl::IsServiceInstantiatedByContractID(const char *aContractID, +NS_IMETHODIMP_(void) nsComponentManagerImpl::IsServiceInstantiatedByContractID(const char *aContractID, @@ -2131 +2131 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -2151 +2151,3 @@ - rv = entry->mServiceObject->QueryInterface(aIID, getter_AddRefs(service)); + try { + entry->mServiceObject->QueryInterface(aIID, getter_AddRefs(service)); + } @@ -2154 +2154 @@ - return rv; + throw nsexception(rv); @@ -2158 +2158 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2176 +2176 @@ - return NS_ERROR_SERVICE_NOT_AVAILABLE; + return wrap_nsexception(NS_ERROR_SERVICE_NOT_AVAILABLE); @@ -2179 +2179 @@ - return rv; + throw nsexception(rv); @@ -2182 +2182 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2198 +2198 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -2223 +2223 @@ - return serviceObject->QueryInterface(aIID, result); + return /*thower*/ serviceObject->QueryInterface(aIID, result); @@ -2226,3 +2226,4 @@ - rv = AddPendingCID(entry->mCid); - if (NS_FAILED(rv)) - return rv; // NOP_AND_BREAK + try { + AddPendingCID(entry->mCid); + } + catch (nsexception &exc) { throw; } // NOP_AND_BREAK @@ -2238 +2238,3 @@ - rv = CreateInstanceByContractID(aContractID, nsnull, aIID, getter_AddRefs(service)); + try { + CreateInstanceByContractID(aContractID, nsnull, aIID, getter_AddRefs(service)); + } @@ -2247,2 +2247 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -2260 +2260 @@ - if (!entry) return NS_ERROR_FAILURE; + if (!entry) throw nsexception(NS_ERROR_FAILURE); @@ -2266 +2266 @@ - return rv; + throw nsexception(rv); @@ -2269 +2269 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2274 +2274 @@ - return GetService(aClass, aIID, (void**)result); + return /*thower*/ GetService(aClass, aIID, (void**)result); @@ -2277 +2277 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2282 +2282 @@ - return GetServiceByContractID(aContractID, aIID, (void**)result); + return /*thower*/ GetServiceByContractID(aContractID, aIID, (void**)result); @@ -2286 +2286 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2291 +2291 @@ - return NS_OK; + return; @@ -2294 +2294 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2299 +2299 @@ - return NS_OK; + return; @@ -2302 +2302 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2307 +2307,3 @@ - nsresult rv = RegistryLocationForFile(aSpec, location); + try { + RegistryLocationForFile(aSpec, location); + } @@ -2311 +2311 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2314 +2314 @@ - return rv; + throw nsexception(rv); @@ -2317,2 +2317 @@ -nsresult -nsComponentManagerImpl::RegistryLocationForFile(nsIFile* aFile, +void nsComponentManagerImpl::RegistryLocationForFile(nsIFile* aFile, @@ -2324 +2324 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -2329 +2329 @@ - mComponentsDir->Contains(aFile, PR_TRUE, &containedIn); + IGNORE_NSEXCEPTION(mComponentsDir->Contains(aFile, PR_TRUE, &containedIn)); @@ -2334,3 +2334,4 @@ - rv = aFile->GetNativePath(nativePathString); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(nativePathString); + } + catch (nsexception &exc) { throw; } @@ -2340 +2340 @@ - return NS_OK; + return; @@ -2346 +2346 @@ - mGREComponentsDir->Contains(aFile, PR_TRUE, &containedIn); + IGNORE_NSEXCEPTION(mGREComponentsDir->Contains(aFile, PR_TRUE, &containedIn)); @@ -2349,3 +2349,4 @@ - rv = aFile->GetNativePath(nativePathString); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(nativePathString); + } + catch (nsexception &exc) { throw; } @@ -2355 +2355 @@ - return NS_OK; + return; @@ -2359,3 +2359,4 @@ - rv = aFile->GetNativePath(nativePathString); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(nativePathString); + } + catch (nsexception &exc) { throw; } @@ -2365 +2365 @@ - return NS_OK; + return; @@ -2368 +2368 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2372 +2372 @@ - return FileForRegistryLocation(nsDependentCString(aLocation), + return /*thower*/ FileForRegistryLocation(nsDependentCString(aLocation), @@ -2376,2 +2376 @@ -nsresult -nsComponentManagerImpl::FileForRegistryLocation(const nsCString &aLocation, +void nsComponentManagerImpl::FileForRegistryLocation(const nsCString &aLocation, @@ -2390 +2390 @@ - if (!file) return NS_ERROR_FAILURE; + if (!file) throw nsexception(NS_ERROR_FAILURE); @@ -2392 +2392,3 @@ - rv = file->InitWithNativePath(Substring(aLocation, 4)); + try { + wrap_nsexception(file->InitWithNativePath(Substring(aLocation, 4))); + } @@ -2394 +2394 @@ - return rv; + throw nsexception(rv); @@ -2400 +2400 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -2403 +2403,3 @@ - rv = mComponentsDir->Clone((nsIFile**)&file); + try { + mComponentsDir->Clone((nsIFile**)&file); + } @@ -2405 +2405 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -2407 +2407,3 @@ - rv = file->AppendRelativeNativePath(Substring(aLocation, 4)); + try { + file->AppendRelativeNativePath(Substring(aLocation, 4)); + } @@ -2409 +2409 @@ - return rv; + throw nsexception(rv); @@ -2415 +2415 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -2418 +2418,3 @@ - rv = mGREComponentsDir->Clone((nsIFile**)&file); + try { + mGREComponentsDir->Clone((nsIFile**)&file); + } @@ -2420 +2420 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -2422 +2422,3 @@ - rv = file->AppendRelativeNativePath(Substring(aLocation, 4)); + try { + file->AppendRelativeNativePath(Substring(aLocation, 4)); + } @@ -2424 +2424 @@ - return rv; + throw nsexception(rv); @@ -2428 +2428 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -2447 +2447 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2472,2 +2472 @@ - if (!factoryTableEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2485 +2485 @@ - return NS_ERROR_FACTORY_EXISTS; + throw nsexception(NS_ERROR_FACTORY_EXISTS); @@ -2490,2 +2490 @@ - if (!mem) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2499,7 +2499,9 @@ - nsresult rv = HashContractID(aContractID, strlen(aContractID), entry); - if (NS_FAILED(rv)) { - PR_LOG(nsComponentManagerLog, PR_LOG_WARNING, - ("\t\tFactory register succeeded. " - "Hashing contractid (%s) FAILED.", aContractID)); - return rv; - } + try { + HashContractID(aContractID, strlen(aContractID), entry); + } + catch (nsexception &exc) { + PR_LOG(nsComponentManagerLog, PR_LOG_WARNING, + ("\t\tFactory register succeeded. " + "Hashing contractid (%s) FAILED.", aContractID)); + throw nsexception(rv); + } @@ -2512 +2512 @@ - return NS_OK; + return; @@ -2515 +2515 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2524 +2524 @@ - return RegisterComponentCommon(aClass, aClassName, + return /*thower*/ RegisterComponentCommon(aClass, aClassName, @@ -2533 +2533 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2544 +2544 @@ - return RegisterComponentCommon(aClass, aClassName, + return /*thower*/ RegisterComponentCommon(aClass, aClassName, @@ -2556 +2556 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2565,4 +2565,5 @@ - nsresult rv = RegistryLocationForFile(aLibrarySpec, - registryName); - if (NS_FAILED(rv)) - return rv; + try { + RegistryLocationForFile(aLibrarySpec, + registryName); + } + catch (nsexception &exc) { throw; } @@ -2570,7 +2570,9 @@ - rv = RegisterComponentWithType(aClass, aClassName, - aContractID, - aLibrarySpec, - registryName.get(), - aReplace, aPersist, - nativeComponentType); - return rv; + try { + RegisterComponentWithType(aClass, aClassName, + aContractID, + aLibrarySpec, + registryName.get(), + aReplace, aPersist, + nativeComponentType); + } + throw nsexception(rv); @@ -2579 +2579 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2588 +2588 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -2599,2 +2599 @@ -nsresult -nsComponentManagerImpl::RegisterComponentCommon(const nsCID &aClass, +void nsComponentManagerImpl::RegisterComponentCommon(const nsCID &aClass, @@ -2635 +2635 @@ - return NS_ERROR_FACTORY_EXISTS; + throw nsexception(NS_ERROR_FACTORY_EXISTS); @@ -2640 +2640 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2650,2 +2650 @@ - if (!mem) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2657,2 +2657 @@ - if (!entry->mLocationKey) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2665,2 +2665 @@ - if (!factoryTableEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2673,6 +2673,8 @@ - rv = HashContractID(contractID, aContractIDLen, entry); - if (NS_FAILED(rv)) { - PR_LOG(nsComponentManagerLog, PR_LOG_ERROR, - ("\t\tHashContractID(%s) FAILED\n", contractID)); - return rv; - } + try { + HashContractID(contractID, aContractIDLen, entry); + } + catch (nsexception &exc) { + PR_LOG(nsComponentManagerLog, PR_LOG_ERROR, + ("\t\tHashContractID(%s) FAILED\n", contractID)); + throw nsexception(rv); + } @@ -2680 +2680 @@ - return NS_OK; + return; @@ -2816,2 +2816 @@ -nsresult -nsComponentManagerImpl::UnregisterFactory(const nsCID &aClass, +void nsComponentManagerImpl::UnregisterFactory(const nsCID &aClass, @@ -2849 +2849 @@ - return rv; + throw nsexception(rv); @@ -2852 +2852 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2857 +2857 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -2860 +2860 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2865 +2865 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -2868 +2868 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2871 +2871 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -2890 +2890 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2893 +2893 @@ - return AutoRegister(inDirSpec); + return /*thower*/ AutoRegister(inDirSpec); @@ -2896,2 +2896 @@ -nsresult -nsComponentManagerImpl::AutoRegisterImpl(nsIFile *inDirSpec, +void nsComponentManagerImpl::AutoRegisterImpl(nsIFile *inDirSpec, @@ -2906,3 +2906,4 @@ - rv = inDirSpec->IsDirectory(&isDir); - if (NS_FAILED(rv)) - return rv; + try { + inDirSpec->IsDirectory(&isDir); + } + catch (nsexception &exc) { throw; } @@ -2911 +2911 @@ - return AutoRegisterDirectory(inDirSpec, aLeftovers, aDeferred); + return /*thower*/ AutoRegisterDirectory(inDirSpec, aLeftovers, aDeferred); @@ -2915 +2915 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -2917,4 +2917,5 @@ - rv = AutoRegisterComponent(lf, aDeferred); - if (NS_FAILED(rv)) - aLeftovers.AppendObject(lf); - return rv; + try { + AutoRegisterComponent(lf, aDeferred); + } + catch (nsexception &exc) aLeftovers.AppendObject(lf); + throw nsexception(rv); @@ -2923,2 +2923 @@ -nsresult -nsComponentManagerImpl::AutoRegisterDirectory(nsIFile *inDirSpec, +void nsComponentManagerImpl::AutoRegisterDirectory(nsIFile *inDirSpec, @@ -2929,3 +2929,4 @@ - nsresult rv = inDirSpec->GetDirectoryEntries(getter_AddRefs(entries)); - if (NS_FAILED(rv)) - return rv; + try { + inDirSpec->GetDirectoryEntries(getter_AddRefs(entries)); + } + catch (nsexception &exc) { throw; } @@ -2937 +2937 @@ - entries->GetNext(getter_AddRefs(elem)); + IGNORE_NSEXCEPTION(entries->GetNext(getter_AddRefs(elem))); @@ -2945,3 +2945,4 @@ - rv = lf->IsDirectory(&isDir); - if (NS_FAILED(rv)) - continue; + try { + lf->IsDirectory(&isDir); + } + catch (nsexception &exc) continue; @@ -2950 +2950 @@ - AutoRegisterDirectory(lf, aLeftovers, aDeferred); + IGNORE_NSEXCEPTION(AutoRegisterDirectory(lf, aLeftovers, aDeferred)); @@ -2952,3 +2952,4 @@ - rv = AutoRegisterComponent(lf, aDeferred); - if (NS_FAILED(rv)) - aLeftovers.AppendObject(lf); + try { + AutoRegisterComponent(lf, aDeferred); + } + catch (nsexception &exc) aLeftovers.AppendObject(lf); @@ -2958 +2958 @@ - return NS_OK; + return; @@ -2961,2 +2961 @@ -nsresult -nsComponentManagerImpl::AutoRegisterComponent(PRInt32 unused, +void nsComponentManagerImpl::AutoRegisterComponent(PRInt32 unused, @@ -2967 +2967 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -2973 +2973,3 @@ - nsresult rv = AutoRegisterComponent(lf, deferred); + try { + AutoRegisterComponent(lf, deferred); + } @@ -2975 +2975 @@ - return NS_ERROR_FACTORY_REGISTER_AGAIN; + throw nsexception(NS_ERROR_FACTORY_REGISTER_AGAIN); @@ -2977 +2977 @@ - return rv; + throw nsexception(rv); @@ -2980,2 +2980 @@ -nsresult -nsComponentManagerImpl::AutoRegisterComponent(nsILocalFile* aComponentFile, +void nsComponentManagerImpl::AutoRegisterComponent(nsILocalFile* aComponentFile, @@ -2990,3 +2990,4 @@ - rv = RegistryLocationForFile(aComponentFile, registryLocation); - if (NS_FAILED(rv)) - return rv; + try { + RegistryLocationForFile(aComponentFile, registryLocation); + } + catch (nsexception &exc) { throw; } @@ -2997 +2997 @@ - return NS_OK; + return; @@ -3002 +3002 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -3010 +3010 @@ - return NS_OK; + return; @@ -3018,2 +3018,4 @@ - rv = mNativeModuleLoader.LoadModule(aComponentFile, - getter_AddRefs(module)); + try { + wrap_nsexception(mNativeModuleLoader.LoadModule(aComponentFile, + getter_AddRefs(module))); + } @@ -3023 +3023 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3037 +3037,3 @@ - rv = loader->LoadModule(aComponentFile, getter_AddRefs(module)); + try { + loader->LoadModule(aComponentFile, getter_AddRefs(module)); + } @@ -3041 +3041 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3048 +3048 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3052,2 +3052,4 @@ - rv = module->RegisterSelf(this, aComponentFile, registryLocation.get(), - registryType); + try { + module->RegisterSelf(this, aComponentFile, registryLocation.get(), + registryType); + } @@ -3056,2 +3056 @@ - if (!d) - return NS_ERROR_OUT_OF_MEMORY; + @@ -3064 +3064 @@ - return NS_OK; + return; @@ -3070 +3070 @@ - return rv; + throw nsexception(rv); @@ -3091,2 +3091,4 @@ - nsresult rv = AutoRegisterComponent(aLeftovers[i], aDeferred, - minLoader); + try { + AutoRegisterComponent(aLeftovers[i], aDeferred, + minLoader); + } @@ -3116,4 +3116,6 @@ - nsresult rv = d.module->RegisterSelf(this, - d.file, - d.location.get(), - d.type); + try { + d.module->RegisterSelf(this, + d.file, + d.location.get(), + d.type); + } @@ -3133 +3133 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3142,3 +3142,4 @@ - rv = RegistryLocationForFile(component, location); - if (NS_FAILED(rv)) - return rv; + try { + RegistryLocationForFile(component, location); + } + catch (nsexception &exc) { throw; } @@ -3148 +3148 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -3151,13 +3151,15 @@ - rv = mNativeModuleLoader.LoadModule(lf, getter_AddRefs(module)); - if (NS_FAILED(rv)) { - for (LoaderType i = 0; i < mLoaderData.Length(); ++i) { - nsIModuleLoader* loader = LoaderForType(i); - if (!loader) - continue; - - if (NS_SUCCEEDED(loader->LoadModule(lf, getter_AddRefs(module))) && - module) { - break; - } - } - } + try { + wrap_nsexception(mNativeModuleLoader.LoadModule(lf, getter_AddRefs(module))); + } + catch (nsexception &exc) { + for (LoaderType i = 0; i < mLoaderData.Length(); ++i) { + nsIModuleLoader* loader = LoaderForType(i); + if (!loader) + continue; + + if (NS_SUCCEEDED(loader->LoadModule(lf, getter_AddRefs(module))) && + module) { + break; + } + } + } @@ -3166 +3166 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3168 +3168,3 @@ - rv = module->UnregisterSelf(this, lf, location.get()); + try { + module->UnregisterSelf(this, lf, location.get()); + } @@ -3173 +3173 @@ - return rv; + throw nsexception(rv); @@ -3176 +3176 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3183 +3183 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -3186 +3186 @@ - return NS_OK; + return; @@ -3189 +3189 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3195 +3195 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -3202,6 +3202,7 @@ - rv = PL_NewDHashTableEnumerator(&mFactories, - ConvertFactoryEntryToCID, - (void*)this, - &aEnum); - if (NS_FAILED(rv)) - return rv; + try { + PL_NewDHashTableEnumerator(&mFactories, + ConvertFactoryEntryToCID, + (void*)this, + &aEnum); + } + catch (nsexception &exc) { throw; } @@ -3210 +3210 @@ - return NS_OK; + return; @@ -3213 +3213 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3219 +3219 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -3226,6 +3226,7 @@ - rv = PL_NewDHashTableEnumerator(&mContractIDs, - ConvertContractIDKeyToString, - (void*)this, - &aEnum); - if (NS_FAILED(rv)) - return rv; + try { + PL_NewDHashTableEnumerator(&mContractIDs, + ConvertContractIDKeyToString, + (void*)this, + &aEnum); + } + catch (nsexception &exc) { throw; } @@ -3234 +3234 @@ - return NS_OK; + return; @@ -3243,3 +3243,5 @@ - nsresult rv = module-> - RegisterSelf(nsComponentManagerImpl::gComponentManager, - nsnull, key, staticComponentType); + try { + module-> + RegisterSelf(nsComponentManagerImpl::gComponentManager, + nsnull, key, staticComponentType); + } @@ -3260 +3260 @@ - aFile->GetPath(message); + IGNORE_NSEXCEPTION(aFile->GetPath(message)); @@ -3263 +3263 @@ - aCS->LogStringMessage(message.get()); + IGNORE_NSEXCEPTION(aCS->LogStringMessage(message.get())); @@ -3266 +3266 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3273,2 +3273 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -3280,2 +3280,2 @@ - NS_CreateServicesFromCategory(NS_XPCOM_AUTOREGISTRATION_OBSERVER_ID, - aSpec, "start"); + IGNORE_NSEXCEPTION(NS_CreateServicesFromCategory(NS_XPCOM_AUTOREGISTRATION_OBSERVER_ID, + aSpec, "start")); @@ -3293 +3293,3 @@ - rv = AutoRegisterImpl(aSpec, leftovers, deferred); + try { + AutoRegisterImpl(aSpec, leftovers, deferred); + } @@ -3304,4 +3304,6 @@ - rv = AutoRegisterImpl(mGREComponentsDir, leftovers, deferred); - if (NS_FAILED(rv)) { - NS_WARNING("Couldn't register mGREComponentsDir"); - } + try { + AutoRegisterImpl(mGREComponentsDir, leftovers, deferred); + } + catch (nsexception &exc) { + NS_WARNING("Couldn't register mGREComponentsDir"); + } @@ -3310,4 +3310,6 @@ - rv = AutoRegisterImpl(mComponentsDir, leftovers, deferred); - if (NS_FAILED(rv)) { - NS_WARNING("Couldn't register mComponentsDir"); - } + try { + AutoRegisterImpl(mComponentsDir, leftovers, deferred); + } + catch (nsexception &exc) { + NS_WARNING("Couldn't register mComponentsDir"); + } @@ -3316,3 +3316,5 @@ - rv = nsDirectoryService::gService->Get(NS_XPCOM_COMPONENT_DIR_LIST, - NS_GET_IID(nsISimpleEnumerator), - getter_AddRefs(dirList)); + try { + wrap_nsexception(nsDirectoryService::gService->Get(NS_XPCOM_COMPONENT_DIR_LIST, + NS_GET_IID(nsISimpleEnumerator), + getter_AddRefs(dirList))); + } @@ -3325 +3325 @@ - dirList->GetNext(getter_AddRefs(elem)); + IGNORE_NSEXCEPTION(dirList->GetNext(getter_AddRefs(elem))); @@ -3328 +3328 @@ - AutoRegisterImpl(dir, leftovers, deferred); + IGNORE_NSEXCEPTION(AutoRegisterImpl(dir, leftovers, deferred)); @@ -3357,3 +3357,3 @@ - NS_CreateServicesFromCategory(NS_XPCOM_AUTOREGISTRATION_OBSERVER_ID, - aSpec, - "end"); + IGNORE_NSEXCEPTION(NS_CreateServicesFromCategory(NS_XPCOM_AUTOREGISTRATION_OBSERVER_ID, + aSpec, + "end")); @@ -3362 +3362 @@ - WritePersistentRegistry(); + IGNORE_NSEXCEPTION(WritePersistentRegistry()); @@ -3364 +3364 @@ - return rv; + throw nsexception(rv); @@ -3367 +3367 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3372 +3372 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -3375 +3375 @@ - aSpec->IsDirectory(&directory); + IGNORE_NSEXCEPTION(aSpec->IsDirectory(&directory)); @@ -3378 +3378 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -3380 +3380 @@ - return AutoUnregisterComponent(0, aSpec); + return /*thower*/ AutoUnregisterComponent(0, aSpec); @@ -3383 +3383 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3389 +3389 @@ - return RegisterFactory(aClass, + return /*thower*/ RegisterFactory(aClass, @@ -3396 +3396 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3408,3 +3408,4 @@ - nsresult rv = RegistryLocationForFile(aFile, registryName); - if (NS_FAILED(rv)) - return rv; + try { + RegistryLocationForFile(aFile, registryName); + } + catch (nsexception &exc) { throw; } @@ -3414,9 +3414,11 @@ - rv = RegisterComponentWithType(aClass, - aClassName, - aContractID, - aFile, - (loaderStr ? loaderStr : registryName.get()), - PR_TRUE, - PR_TRUE, - (aType ? aType : nativeComponentType)); - return rv; + try { + RegisterComponentWithType(aClass, + aClassName, + aContractID, + aFile, + (loaderStr ? loaderStr : registryName.get()), + PR_TRUE, + PR_TRUE, + (aType ? aType : nativeComponentType)); + } + throw nsexception(rv); @@ -3425 +3425 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3429 +3429 @@ - return UnregisterComponentSpec(aClass, aFile); + return /*thower*/ UnregisterComponentSpec(aClass, aFile); @@ -3432 +3432 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3436 +3436 @@ - return IsRegistered(aClass, _retval); + return /*thower*/ IsRegistered(aClass, _retval); @@ -3439 +3439 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3449 +3449 @@ - return NS_OK; + return; @@ -3452 +3452 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3458 +3458 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -3464,6 +3464,7 @@ - rv = PL_NewDHashTableEnumerator(&mFactories, - ConvertFactoryEntryToCID, - (void*)this, - &aEnum); - if (NS_FAILED(rv)) - return rv; + try { + PL_NewDHashTableEnumerator(&mFactories, + ConvertFactoryEntryToCID, + (void*)this, + &aEnum); + } + catch (nsexception &exc) { throw; } @@ -3472 +3472 @@ - return NS_OK; + return; @@ -3475 +3475 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3480 +3480 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -3486,6 +3486,7 @@ - rv = PL_NewDHashTableEnumerator(&mContractIDs, - ConvertContractIDKeyToString, - (void*)this, - &aEnum); - if (NS_FAILED(rv)) - return rv; + try { + PL_NewDHashTableEnumerator(&mContractIDs, + ConvertContractIDKeyToString, + (void*)this, + &aEnum); + } + catch (nsexception &exc) { throw; } @@ -3494 +3494 @@ - return NS_OK; + return; @@ -3497 +3497 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3501 +3501 @@ - return CLSIDToContractID(aClass, + return /*thower*/ CLSIDToContractID(aClass, @@ -3506 +3506 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -3512 +3512 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -3514,6 +3514,8 @@ - nsresult rv = ContractIDToClassID(aContractID, *_retval); - if (NS_FAILED(rv)) { - nsMemory::Free(*_retval); - *_retval = nsnull; - } - return rv; + try { + ContractIDToClassID(aContractID, *_retval); + } + catch (nsexception &exc) { + nsMemory::Free(*_retval); + *_retval = nsnull; + } + throw nsexception(rv); @@ -3552,2 +3552 @@ -nsresult -nsFactoryEntry::GetFactory(nsIFactory **aFactory) +void nsFactoryEntry::GetFactory(nsIFactory **aFactory) @@ -3559 +3559 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3564,4 +3564,6 @@ - rv = nsComponentManagerImpl::gComponentManager-> - mStaticModuleLoader. - GetModuleFor(mLocationKey, - getter_AddRefs(module)); + try { + nsComponentManagerImpl::gComponentManager-> + mStaticModuleLoader. + GetModuleFor(mLocationKey, + getter_AddRefs(module)); + } @@ -3571,3 +3571,5 @@ - rv = nsComponentManagerImpl::gComponentManager-> - FileForRegistryLocation(nsDependentCString(mLocationKey), - getter_AddRefs(moduleFile)); + try { + nsComponentManagerImpl::gComponentManager-> + FileForRegistryLocation(nsDependentCString(mLocationKey), + getter_AddRefs(moduleFile)); + } @@ -3580 +3580 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3582,2 +3582,4 @@ - rv = loader->LoadModule(moduleFile, - getter_AddRefs(module)); + try { + loader->LoadModule(moduleFile, + getter_AddRefs(module)); + } @@ -3586,2 +3586 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -3591 +3591 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -3594,7 +3594,8 @@ - rv = module-> - GetClassObject(nsComponentManagerImpl::gComponentManager, - mCid, - NS_GET_IID(nsIFactory), - getter_AddRefs(mFactory)); - if (NS_FAILED(rv)) - return rv; + try { + module-> + GetClassObject(nsComponentManagerImpl::gComponentManager, + mCid, + NS_GET_IID(nsIFactory), + getter_AddRefs(mFactory)); + } + catch (nsexception &exc) { throw; } @@ -3605 +3605 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -3609 +3609 @@ - return NS_OK; + return; @@ -3625,2 +3625 @@ -NS_COM nsresult -NS_GetComponentManager(nsIComponentManager* *result) +NS_COM void NS_GetComponentManager(nsIComponentManager* *result) @@ -3631,3 +3631,4 @@ - nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull); - if (NS_FAILED(rv)) - return rv; + try { + NS_InitXPCOM2(nsnull, nsnull, nsnull); + } + catch (nsexception &exc) { throw; } @@ -3639 +3639 @@ - return NS_OK; + return; @@ -3642,2 +3642 @@ -NS_COM nsresult -NS_GetServiceManager(nsIServiceManager* *result) +NS_COM void NS_GetServiceManager(nsIServiceManager* *result) @@ -3650 +3650,3 @@ - rv = NS_InitXPCOM2(nsnull, nsnull, nsnull); + try { + NS_InitXPCOM2(nsnull, nsnull, nsnull); + } @@ -3653,2 +3653 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -3659 +3659 @@ - return NS_OK; + return; @@ -3663,2 +3663 @@ -NS_COM nsresult -NS_GetComponentRegistrar(nsIComponentRegistrar* *result) +NS_COM void NS_GetComponentRegistrar(nsIComponentRegistrar* *result) @@ -3671 +3671,3 @@ - rv = NS_InitXPCOM2(nsnull, nsnull, nsnull); + try { + NS_InitXPCOM2(nsnull, nsnull, nsnull); + } @@ -3674,2 +3674 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -3680 +3680 @@ - return NS_OK; + return; --- xpcom/components/nsComponentManager.h +++ xpcom/components/nsComponentManager.h @@ -137 +137 @@ - NS_IMETHOD GetClassObjectByContractID(const char *aContractID, + NS_IMETHOD_(void) GetClassObjectByContractID(const char *aContractID, @@ -147,3 +147,3 @@ - NS_IMETHOD AutoRegister(nsIFile *aSpec); - NS_IMETHOD AutoUnregister(nsIFile *aSpec); - NS_IMETHOD RegisterFactory(const nsCID & aClass, const char *aClassName, const char *aContractID, nsIFactory *aFactory); + NS_IMETHOD_(void) AutoRegister(nsIFile *aSpec); + NS_IMETHOD_(void) AutoUnregister(nsIFile *aSpec); + NS_IMETHOD_(void) RegisterFactory(const nsCID & aClass, const char *aClassName, const char *aContractID, nsIFactory *aFactory); @@ -151,8 +151,8 @@ - NS_IMETHOD RegisterFactoryLocation(const nsCID & aClass, const char *aClassName, const char *aContractID, nsIFile *aFile, const char *loaderStr, const char *aType); - NS_IMETHOD UnregisterFactoryLocation(const nsCID & aClass, nsIFile *aFile); - NS_IMETHOD IsCIDRegistered(const nsCID & aClass, PRBool *_retval); - NS_IMETHOD IsContractIDRegistered(const char *aClass, PRBool *_retval); - NS_IMETHOD EnumerateCIDs(nsISimpleEnumerator **_retval); - NS_IMETHOD EnumerateContractIDs(nsISimpleEnumerator **_retval); - NS_IMETHOD CIDToContractID(const nsCID & aClass, char **_retval); - NS_IMETHOD ContractIDToCID(const char *aContractID, nsCID * *_retval); + NS_IMETHOD_(void) RegisterFactoryLocation(const nsCID & aClass, const char *aClassName, const char *aContractID, nsIFile *aFile, const char *loaderStr, const char *aType); + NS_IMETHOD_(void) UnregisterFactoryLocation(const nsCID & aClass, nsIFile *aFile); + NS_IMETHOD_(void) IsCIDRegistered(const nsCID & aClass, PRBool *_retval); + NS_IMETHOD_(void) IsContractIDRegistered(const char *aClass, PRBool *_retval); + NS_IMETHOD_(void) EnumerateCIDs(nsISimpleEnumerator **_retval); + NS_IMETHOD_(void) EnumerateContractIDs(nsISimpleEnumerator **_retval); + NS_IMETHOD_(void) CIDToContractID(const nsCID & aClass, char **_retval); + NS_IMETHOD_(void) ContractIDToCID(const char *aContractID, nsCID * *_retval); @@ -160 +160 @@ - nsresult RegistryLocationForFile(nsIFile* aFile, + void RegistryLocationForFile(nsIFile* aFile, @@ -162 +162 @@ - nsresult FileForRegistryLocation(const nsCString &aLocation, + void FileForRegistryLocation(const nsCString &aLocation, @@ -172 +172 @@ - nsresult Init(nsStaticModuleInfo const *aStaticModules, + void Init(nsStaticModuleInfo const *aStaticModules, @@ -177,2 +177,2 @@ - nsresult WritePersistentRegistry(); - nsresult ReadPersistentRegistry(); + void WritePersistentRegistry(); + void ReadPersistentRegistry(); @@ -180 +180 @@ - nsresult Shutdown(void); + void Shutdown(void); @@ -182 +182 @@ - nsresult FreeServices(); + void FreeServices(); @@ -184,2 +184 @@ - nsresult - NS_GetService(const char *aContractID, const nsIID& aIID, PRBool aDontCreate, nsISupports** result); + void NS_GetService(const char *aContractID, const nsIID& aIID, PRBool aDontCreate, nsISupports** result); @@ -187 +187 @@ - nsresult RegisterComponentCommon(const nsCID &aClass, + void RegisterComponentCommon(const nsCID &aClass, @@ -207,2 +207,2 @@ - nsresult FindFactory(const char *contractID, PRUint32 aContractIDLen, nsIFactory **aFactory) ; - nsresult LoadFactory(nsFactoryEntry *aEntry, nsIFactory **aFactory); + void FindFactory(const char *contractID, PRUint32 aContractIDLen, nsIFactory **aFactory) ; + void LoadFactory(nsFactoryEntry *aEntry, nsIFactory **aFactory); @@ -214,2 +214,2 @@ - nsresult SyncComponentsInDir(PRInt32 when, nsIFile *dirSpec); - nsresult HashContractID(const char *acontractID, PRUint32 aContractIDLen, + void SyncComponentsInDir(PRInt32 when, nsIFile *dirSpec); + void HashContractID(const char *acontractID, PRUint32 aContractIDLen, @@ -219 +219 @@ - nsresult AutoRegisterImpl(nsIFile* inDirSpec, + void AutoRegisterImpl(nsIFile* inDirSpec, @@ -222 +222 @@ - nsresult AutoRegisterDirectory(nsIFile* aComponentFile, + void AutoRegisterDirectory(nsIFile* aComponentFile, @@ -225 +225 @@ - nsresult AutoRegisterComponent(nsILocalFile* aComponentFile, + void AutoRegisterComponent(nsILocalFile* aComponentFile, @@ -264 +264 @@ - nsresult AddPendingCID(const nsCID &aClass); + void AddPendingCID(const nsCID &aClass); @@ -315 +315 @@ - nsresult GetFactory(nsIFactory **aFactory); + void GetFactory(nsIFactory **aFactory); --- xpcom/components/nsIServiceManagerObsolete.h +++ xpcom/components/nsIServiceManagerObsolete.h @@ -88 +88 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -101 +101 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -104 +104 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -110 +110 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -117 +117 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -120 +120 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -123 +123 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -129 +129 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -142,2 +142 @@ - static nsresult - RegisterService(const nsCID& aClass, nsISupports* aService); + static void RegisterService(const nsCID& aClass, nsISupports* aService); @@ -145,2 +145 @@ - static nsresult - UnregisterService(const nsCID& aClass); + static void UnregisterService(const nsCID& aClass); @@ -148,2 +148 @@ - static nsresult - GetService(const nsCID& aClass, const nsIID& aIID, + static void GetService(const nsCID& aClass, const nsIID& aIID, @@ -154,2 +154 @@ - static nsresult - ReleaseService(const nsCID& aClass, nsISupports* service, + static void ReleaseService(const nsCID& aClass, nsISupports* service, @@ -161,2 +161 @@ - static nsresult - RegisterService(const char* aContractID, nsISupports* aService); + static void RegisterService(const char* aContractID, nsISupports* aService); @@ -164,2 +164 @@ - static nsresult - UnregisterService(const char* aContractID); + static void UnregisterService(const char* aContractID); @@ -167,2 +167 @@ - static nsresult - GetService(const char* aContractID, const nsIID& aIID, + static void GetService(const char* aContractID, const nsIID& aIID, @@ -173,2 +173 @@ - static nsresult - ReleaseService(const char* aContractID, nsISupports* service, + static void ReleaseService(const char* aContractID, nsISupports* service, @@ -181,2 +181,2 @@ - static nsresult GetGlobalServiceManager(nsIServiceManager* *result); - static nsresult ShutdownGlobalServiceManager(nsIServiceManager* *result); + static void GetGlobalServiceManager(nsIServiceManager* *result); + static void ShutdownGlobalServiceManager(nsIServiceManager* *result); --- xpcom/components/nsModule.h +++ xpcom/components/nsModule.h @@ -49,2 +49 @@ -extern "C" NS_EXPORT nsresult PR_CALLBACK -NSGetModule(nsIComponentManager *aCompMgr, +extern "C" NS_EXPORT void NSGetModule(nsIComponentManager *aCompMgr, --- xpcom/components/nsNativeComponentLoader.cpp +++ xpcom/components/nsNativeComponentLoader.cpp @@ -98,2 +98 @@ -nsresult -nsNativeModuleLoader::Init() +void nsNativeModuleLoader::Init() @@ -103 +103 @@ - return mLibraries.Init() ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(mLibraries.Init() ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -106 +106 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -113 +113 @@ - aFile->GetNativePath(filePath); + IGNORE_NSEXCEPTION(aFile->GetNativePath(filePath)); @@ -116 +116 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -121 +121 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -133 +133 @@ - return NS_OK; + return; @@ -138 +138,3 @@ - rv = aFile->Load(&data.library); + try { + aFile->Load(&data.library); + } @@ -140,20 +140,20 @@ - if (NS_FAILED(rv)) { - char errorMsg[1024] = ""; - - if (PR_GetErrorTextLength() < (int) sizeof(errorMsg)) - PR_GetErrorText(errorMsg); - - LOG(PR_LOG_ERROR, - ("nsNativeModuleLoader::LoadModule(\"%s\") - load FAILED, " - "rv: %lx, error:\n\t%s\n", - filePath.get(), rv, errorMsg)); - -#ifdef DEBUG - fprintf(stderr, - "nsNativeModuleLoader::LoadModule(\"%s\") - load FAILED, " - "rv: %lx, error:\n\t%s\n", - filePath.get(), rv, errorMsg); -#endif - - return rv; - } + catch (nsexception &exc) { + char errorMsg[1024] = ""; + + if (PR_GetErrorTextLength() < (int) sizeof(errorMsg)) + PR_GetErrorText(errorMsg); + + LOG(PR_LOG_ERROR, + ("nsNativeModuleLoader::LoadModule(\"%s\") - load FAILED, " + "rv: %lx, error:\n\t%s\n", + filePath.get(), rv, errorMsg)); + +#ifdef DEBUG + fprintf(stderr, + "nsNativeModuleLoader::LoadModule(\"%s\") - load FAILED, " + "rv: %lx, error:\n\t%s\n", + filePath.get(), rv, errorMsg); +#endif + + throw nsexception(rv); + } @@ -163 +163 @@ - aFile->GetNativeLeafName(leafName); + IGNORE_NSEXCEPTION(aFile->GetNativeLeafName(leafName)); @@ -183,3 +183,5 @@ - rv = proc(nsComponentManagerImpl::gComponentManager, - aFile, - getter_AddRefs(data.module)); + try { + proc(nsComponentManagerImpl::gComponentManager, + aFile, + getter_AddRefs(data.module)); + } @@ -193 +193 @@ - return NS_OK; + return; @@ -212 +212 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -231 +231 @@ - file->GetNativePath(filePath); + IGNORE_NSEXCEPTION(file->GetNativePath(filePath)); --- xpcom/components/nsNativeComponentLoader.h +++ xpcom/components/nsNativeComponentLoader.h @@ -58 +58 @@ - nsresult Init(); + void Init(); --- xpcom/components/nsServiceManagerObsolete.cpp +++ xpcom/components/nsServiceManagerObsolete.cpp @@ -47,2 +47 @@ -nsresult -nsServiceManager::GetGlobalServiceManager(nsIServiceManager* *result) +void nsServiceManager::GetGlobalServiceManager(nsIServiceManager* *result) @@ -51 +51 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -54 +54 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -59 +59 @@ - return NS_OK; + return; @@ -62,2 +62 @@ -nsresult -nsServiceManager::ShutdownGlobalServiceManager(nsIServiceManager* *result) +void nsServiceManager::ShutdownGlobalServiceManager(nsIServiceManager* *result) @@ -66 +66 @@ - return NS_OK; + return; @@ -69,2 +69 @@ -nsresult -nsServiceManager::GetService(const nsCID& aClass, const nsIID& aIID, +void nsServiceManager::GetService(const nsCID& aClass, const nsIID& aIID, @@ -77 +77 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -79 +79 @@ - return nsComponentManagerImpl::gComponentManager->GetService(aClass, aIID, (void**)result); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->GetService(aClass, aIID, (void**)result)); @@ -82,2 +82 @@ -nsresult -nsServiceManager::ReleaseService(const nsCID& aClass, nsISupports* service, +void nsServiceManager::ReleaseService(const nsCID& aClass, nsISupports* service, @@ -89 +89 @@ - return NS_OK; + return; @@ -92,2 +92 @@ -nsresult -nsServiceManager::RegisterService(const nsCID& aClass, nsISupports* aService) +void nsServiceManager::RegisterService(const nsCID& aClass, nsISupports* aService) @@ -98 +98 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -100 +100 @@ - return nsComponentManagerImpl::gComponentManager->RegisterService(aClass, aService); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->RegisterService(aClass, aService)); @@ -103,2 +103 @@ -nsresult -nsServiceManager::UnregisterService(const nsCID& aClass) +void nsServiceManager::UnregisterService(const nsCID& aClass) @@ -109 +109 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -111 +111 @@ - return nsComponentManagerImpl::gComponentManager->UnregisterService(aClass); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->UnregisterService(aClass)); @@ -117,2 +117 @@ -nsresult -nsServiceManager::GetService(const char* aContractID, const nsIID& aIID, +void nsServiceManager::GetService(const char* aContractID, const nsIID& aIID, @@ -125 +125 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -127 +127 @@ - return nsComponentManagerImpl::gComponentManager->GetServiceByContractID(aContractID, aIID, (void**)result); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->GetServiceByContractID(aContractID, aIID, (void**)result)); @@ -130,2 +130 @@ -nsresult -nsServiceManager::ReleaseService(const char* aContractID, nsISupports* service, +void nsServiceManager::ReleaseService(const char* aContractID, nsISupports* service, @@ -137 +137 @@ - return NS_OK; + return; @@ -140,2 +140 @@ -nsresult -nsServiceManager::RegisterService(const char* aContractID, nsISupports* aService) +void nsServiceManager::RegisterService(const char* aContractID, nsISupports* aService) @@ -146 +146 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -148 +148 @@ - return nsComponentManagerImpl::gComponentManager->RegisterService(aContractID, aService); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->RegisterService(aContractID, aService)); @@ -151,2 +151 @@ -nsresult -nsServiceManager::UnregisterService(const char* aContractID) +void nsServiceManager::UnregisterService(const char* aContractID) @@ -160 +160 @@ - return NS_OK; + return; @@ -163 +163 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -165 +165 @@ - return nsComponentManagerImpl::gComponentManager->UnregisterService(aContractID); + return wrap_nsexception(nsComponentManagerImpl::gComponentManager->UnregisterService(aContractID)); --- xpcom/components/nsStaticComponentLoader.cpp +++ xpcom/components/nsStaticComponentLoader.cpp @@ -93,2 +93 @@ -nsresult -nsStaticModuleLoader::Init(nsStaticModuleInfo const *aStaticModules, +void nsStaticModuleLoader::Init(nsStaticModuleInfo const *aStaticModules, @@ -100 +100 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -104 +104 @@ - return NS_OK; + return; @@ -113,2 +113 @@ - if (!info) - return NS_ERROR_OUT_OF_MEMORY; + @@ -125 +125 @@ - return NS_OK; + return; @@ -134,3 +134,5 @@ - nsresult rv = c->info. - getModule(nsComponentManagerImpl::gComponentManager, nsnull, - getter_AddRefs(c->module)); + try { + c->info. + getModule(nsComponentManagerImpl::gComponentManager, nsnull, + getter_AddRefs(c->module)); + } @@ -138,2 +138 @@ - if (NS_FAILED(rv)) - continue; + catch (nsexception &exc) continue; @@ -145,2 +145 @@ -nsresult -nsStaticModuleLoader::GetModuleFor(const char *aLocation, +void nsStaticModuleLoader::GetModuleFor(const char *aLocation, @@ -156 +156 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -159,3 +159,5 @@ - rv = info->info. - getModule(nsComponentManagerImpl::gComponentManager, nsnull, - getter_AddRefs(info->module)); + try { + info->info. + getModule(nsComponentManagerImpl::gComponentManager, nsnull, + getter_AddRefs(info->module)); + } @@ -163,2 +163 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -168 +168 @@ - return NS_OK; + return; --- xpcom/components/nsStaticComponentLoader.h +++ xpcom/components/nsStaticComponentLoader.h @@ -65 +65 @@ - nsresult Init(nsStaticModuleInfo const *aStaticModules, + void Init(nsStaticModuleInfo const *aStaticModules, @@ -75 +75 @@ - nsresult GetModuleFor(const char *key, nsIModule* *aResult); + void GetModuleFor(const char *key, nsIModule* *aResult); --- xpcom/ds/nsArray.cpp +++ xpcom/ds/nsArray.cpp @@ -61 +61 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -65 +65 @@ - return NS_OK; + return; @@ -68 +68 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -74 +74 @@ - if (!obj) return NS_ERROR_ILLEGAL_VALUE; + if (!obj) throw nsexception(NS_ERROR_ILLEGAL_VALUE); @@ -78 +78 @@ - return obj->QueryInterface(aIID, aResult); + return /*thower*/ obj->QueryInterface(aIID, aResult); @@ -81 +81 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -89,2 +89,2 @@ - return NS_ERROR_FAILURE; - return NS_OK; + throw nsexception(NS_ERROR_FAILURE); + return; @@ -96 +96 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -99 +99 @@ - return NS_OK; + return; @@ -102 +102 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -105 +105 @@ - return NS_NewArrayEnumerator(aResult, static_cast(this)); + return /*thower*/ NS_NewArrayEnumerator(aResult, static_cast(this)); @@ -110 +110 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -120 +120 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -128 +128 @@ - return result ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(result ? NS_OK : NS_ERROR_FAILURE); @@ -131 +131 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -135 +135 @@ - return result ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(result ? NS_OK : NS_ERROR_FAILURE); @@ -138 +138 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -148 +148 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -153 +153 @@ - return result ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(result ? NS_OK : NS_ERROR_FAILURE); @@ -156 +156 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -166 +166 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -171 +171 @@ - return result ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(result ? NS_OK : NS_ERROR_FAILURE); @@ -174 +174 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -178 +178 @@ - return NS_OK; + return; --- xpcom/ds/nsAtomService.cpp +++ xpcom/ds/nsAtomService.cpp @@ -48,2 +48 @@ -nsresult -nsAtomService::GetAtom(const PRUnichar *aString, nsIAtom ** aResult) +void nsAtomService::GetAtom(const PRUnichar *aString, nsIAtom ** aResult) @@ -54 +54 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -56 +56 @@ - return NS_OK; + return; @@ -59,2 +59 @@ -nsresult -nsAtomService::GetPermanentAtom(const PRUnichar *aString, nsIAtom ** aResult) +void nsAtomService::GetPermanentAtom(const PRUnichar *aString, nsIAtom ** aResult) @@ -65 +65 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -67 +67 @@ - return NS_OK; + return; @@ -70 +70 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -76 +76 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -78 +78 @@ - return NS_OK; + return; @@ -81 +81 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -87 +87 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -89 +89 @@ - return NS_OK; + return; --- xpcom/ds/nsAtomTable.cpp +++ xpcom/ds/nsAtomTable.cpp @@ -84 +84 @@ - NS_IMETHOD QueryInterface(REFNSIID aIID, + NS_IMETHOD_(void) QueryInterface(REFNSIID aIID, @@ -514 +514 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -518 +518 @@ - return NS_OK; + return; @@ -521 +521 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -525 +525 @@ - return NS_OK; + return; @@ -528 +528 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -533 +533 @@ - return NS_OK; + return; @@ -536 +536 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -540 +540 @@ - return NS_OK; + return; @@ -543 +543 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -548 +548 @@ - return NS_OK; + return; @@ -571 +571 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -575 +575 @@ - return NS_OK; + return; @@ -578 +578 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -586 +586 @@ - return NS_OK; + return; @@ -589 +589 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -593 +593 @@ - return NS_OK; + return; @@ -596 +596 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -600 +600 @@ - return NS_OK; + return; @@ -603 +603 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -609 +609 @@ - return NS_OK; + return; @@ -665,2 +665 @@ -NS_COM nsresult -NS_RegisterStaticAtoms(const nsStaticAtom* aAtoms, PRUint32 aAtomCount) +NS_COM void NS_RegisterStaticAtoms(const nsStaticAtom* aAtoms, PRUint32 aAtomCount) @@ -706 +706 @@ - return NS_OK; + return; --- xpcom/ds/nsByteBuffer.cpp +++ xpcom/ds/nsByteBuffer.cpp @@ -50 +50 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -59 +59 @@ - return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -73 +73 @@ -NS_METHOD +NS_METHOD_(void) @@ -77 +77 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -81 +81 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -84 +84,3 @@ - nsresult rv = it->QueryInterface(aIID, (void**)aResult); + try { + wrap_nsexception(it->QueryInterface(aIID, (void**)aResult)); + } @@ -86 +86 @@ - return rv; + throw nsexception(rv); @@ -154 +154 @@ -NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult, +NS_COM void NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult, @@ -160,2 +160,4 @@ - rv = ByteBufferImpl::Create(aOuter, NS_GET_IID(nsIByteBuffer), (void**)&buf); - if (NS_FAILED(rv)) return rv; + try { + ByteBufferImpl::Create(aOuter, NS_GET_IID(nsIByteBuffer), (void**)&buf); + } + catch (nsexception &exc) { throw; } @@ -163,5 +163,7 @@ - rv = buf->Init(aBufferSize); - if (NS_FAILED(rv)) { - NS_RELEASE(buf); - return rv; - } + try { + buf->Init(aBufferSize); + } + catch (nsexception &exc) { + NS_RELEASE(buf); + throw nsexception(rv); + } @@ -169 +169 @@ - return rv; + throw nsexception(rv); --- xpcom/ds/nsByteBuffer.h +++ xpcom/ds/nsByteBuffer.h @@ -49 +49 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -52 +52 @@ - NS_IMETHOD Init(PRUint32 aBufferSize); + NS_IMETHOD_(void) Init(PRUint32 aBufferSize); --- xpcom/ds/nsCheapSets.cpp +++ xpcom/ds/nsCheapSets.cpp @@ -53,2 +53 @@ -nsresult -nsCheapStringSet::Put(const nsAString& aVal) +void nsCheapStringSet::Put(const nsAString& aVal) @@ -59 +59 @@ - return set->Put(aVal); + return wrap_nsexception(set->Put(aVal)); @@ -65 +65,3 @@ - nsresult rv = InitHash(&set); + try { + InitHash(&set); + } @@ -68 +68,3 @@ - rv = set->Put(*oldStr); + try { + wrap_nsexception(set->Put(*oldStr)); + } @@ -72 +72 @@ - return set->Put(aVal); + return wrap_nsexception(set->Put(aVal)); @@ -76 +76 @@ - return SetStr(aVal); + return /*thower*/ SetStr(aVal); @@ -97,2 +97 @@ -nsresult -nsCheapStringSet::InitHash(nsStringHashSet** aSet) +void nsCheapStringSet::InitHash(nsStringHashSet** aSet) @@ -101,3 +101 @@ - if (!newSet) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -105 +105,3 @@ - nsresult rv = newSet->Init(10); + try { + wrap_nsexception(newSet->Init(10)); + } @@ -110 +110 @@ - return NS_OK; + return; @@ -119,2 +119 @@ -nsresult -nsCheapInt32Set::Put(PRInt32 aVal) +void nsCheapInt32Set::Put(PRInt32 aVal) @@ -125 +125 @@ - return set->Put(aVal); + return wrap_nsexception(set->Put(aVal)); @@ -132 +132,3 @@ - nsresult rv = InitHash(&set); + try { + InitHash(&set); + } @@ -135 +135,3 @@ - rv = set->Put(oldInt); + try { + wrap_nsexception(set->Put(oldInt)); + } @@ -138 +138 @@ - return set->Put(aVal); + return wrap_nsexception(set->Put(aVal)); @@ -144 +144,3 @@ - nsresult rv = InitHash(&set); + try { + InitHash(&set); + } @@ -147 +147 @@ - return set->Put(aVal); + return wrap_nsexception(set->Put(aVal)); @@ -152 +152 @@ - return NS_OK; + return; @@ -166,2 +166 @@ -nsresult -nsCheapInt32Set::InitHash(nsInt32HashSet** aSet) +void nsCheapInt32Set::InitHash(nsInt32HashSet** aSet) @@ -170,3 +170 @@ - if (!newSet) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -174 +174,3 @@ - nsresult rv = newSet->Init(10); + try { + wrap_nsexception(newSet->Init(10)); + } @@ -179 +179 @@ - return NS_OK; + return; --- xpcom/ds/nsCheapSets.h +++ xpcom/ds/nsCheapSets.h @@ -58 +58 @@ - nsresult Put(const nsAString& aVal); + void Put(const nsAString& aVal); @@ -100 +100 @@ - nsresult SetStr(const nsAString& aVal) + void SetStr(const nsAString& aVal) @@ -103,3 +103 @@ - if (!str) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -107 +107 @@ - return NS_OK; + return; @@ -110 +110 @@ - nsresult InitHash(nsStringHashSet** aSet); + void InitHash(nsStringHashSet** aSet); @@ -132 +132 @@ - nsresult Put(PRInt32 aVal); + void Put(PRInt32 aVal); @@ -181 +181 @@ - nsresult InitHash(nsInt32HashSet** aSet); + void InitHash(nsInt32HashSet** aSet); --- xpcom/ds/nsFixedSizeAllocator.cpp +++ xpcom/ds/nsFixedSizeAllocator.cpp @@ -65,2 +65 @@ -nsresult -nsFixedSizeAllocator::Init(const char* aName, +void nsFixedSizeAllocator::Init(const char* aName, @@ -74 +74 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -87 +87 @@ - return NS_OK; + return; --- xpcom/ds/nsFixedSizeAllocator.h +++ xpcom/ds/nsFixedSizeAllocator.h @@ -181,2 +181 @@ - nsresult - Init(const char* aName, + void Init(const char* aName, --- xpcom/ds/nsHashPropertyBag.cpp +++ xpcom/ds/nsHashPropertyBag.cpp @@ -48,2 +48 @@ -nsresult -NS_NewHashPropertyBag(nsIWritablePropertyBag* *_retval) +void NS_NewHashPropertyBag(nsIWritablePropertyBag* *_retval) @@ -52,2 +52 @@ - if (!hpb) - return NS_ERROR_OUT_OF_MEMORY; + @@ -57,5 +57,7 @@ - nsresult rv = hpb->Init(); - if (NS_FAILED(rv)) { - NS_RELEASE(hpb); - return rv; - } + try { + hpb->Init(); + } + catch (nsexception &exc) { + NS_RELEASE(hpb); + throw nsexception(rv); + } @@ -64 +64 @@ - return NS_OK; + return; @@ -81,2 +81 @@ -nsresult -nsHashPropertyBag::Init() +void nsHashPropertyBag::Init() @@ -86,2 +86,2 @@ - return NS_ERROR_OUT_OF_MEMORY; - return NS_OK; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); + return; @@ -90 +90 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -95 +95 @@ - return NS_OK; + return; @@ -98 +98 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -103 +103 @@ - return NS_OK; + return; @@ -106 +106 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -111 +111 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -113 +113 @@ - return NS_OK; + return; @@ -116 +116 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -123 +123 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -125 +125 @@ - return NS_OK; + return; @@ -128 +128 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -136 +136 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -141 +141 @@ - return NS_OK; + return; @@ -165 +165 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -169 +169 @@ - return NS_OK; + return; @@ -172 +172 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -176 +176 @@ - return NS_OK; + return; @@ -189 +189 @@ - propertyArray->AppendElement(sprop, PR_FALSE); + IGNORE_NSEXCEPTION(propertyArray->AppendElement(sprop, PR_FALSE)); @@ -194 +194 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -198,2 +198 @@ - if (!propertyArray) - return NS_ERROR_OUT_OF_MEMORY; + @@ -203 +203 @@ - return NS_NewArrayEnumerator(_retval, propertyArray); + return /*thower*/ NS_NewArrayEnumerator(_retval, propertyArray); @@ -234 +234 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -239,2 +239,2 @@ - return NS_ERROR_NOT_AVAILABLE; - return v->GetAsAString(_retval); + throw nsexception(NS_ERROR_NOT_AVAILABLE); + return /*thower*/ v->GetAsAString(_retval); @@ -243 +243 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -248,2 +248,2 @@ - return NS_ERROR_NOT_AVAILABLE; - return v->GetAsACString(_retval); + throw nsexception(NS_ERROR_NOT_AVAILABLE); + return /*thower*/ v->GetAsACString(_retval); @@ -252 +252 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -257,2 +257,2 @@ - return NS_ERROR_NOT_AVAILABLE; - return v->GetAsAUTF8String(_retval); + throw nsexception(NS_ERROR_NOT_AVAILABLE); + return /*thower*/ v->GetAsAUTF8String(_retval); @@ -261 +261 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -268 +268 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -270,3 +270,4 @@ - nsresult rv = v->GetAsISupports(getter_AddRefs(val)); - if (NS_FAILED(rv)) - return rv; + try { + v->GetAsISupports(getter_AddRefs(val)); + } + catch (nsexception &exc) { throw; } @@ -276 +276 @@ - return NS_OK; + return; @@ -278 +278 @@ - return val->QueryInterface(aIID, _retval); + return /*thower*/ val->QueryInterface(aIID, _retval); @@ -281 +281 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -285,4 +285,3 @@ - if (!var) - return NS_ERROR_OUT_OF_MEMORY; - var->SetAsAString(value); - return SetProperty(prop, var); + + IGNORE_NSEXCEPTION(var->SetAsAString(value)); + return /*thower*/ SetProperty(prop, var); @@ -291 +291 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -295,4 +295,3 @@ - if (!var) - return NS_ERROR_OUT_OF_MEMORY; - var->SetAsACString(value); - return SetProperty(prop, var); + + IGNORE_NSEXCEPTION(var->SetAsACString(value)); + return /*thower*/ SetProperty(prop, var); @@ -301 +301 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -305,4 +305,3 @@ - if (!var) - return NS_ERROR_OUT_OF_MEMORY; - var->SetAsAUTF8String(value); - return SetProperty(prop, var); + + IGNORE_NSEXCEPTION(var->SetAsAUTF8String(value)); + return /*thower*/ SetProperty(prop, var); @@ -311 +311 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -315,4 +315,3 @@ - if (!var) - return NS_ERROR_OUT_OF_MEMORY; - var->SetAsISupports(value); - return SetProperty(prop, var); + + IGNORE_NSEXCEPTION(var->SetAsISupports(value)); + return /*thower*/ SetProperty(prop, var); --- xpcom/ds/nsHashPropertyBag.h +++ xpcom/ds/nsHashPropertyBag.h @@ -64 +64 @@ - nsresult Init(); + void Init(); @@ -86,2 +86 @@ -extern "C" NS_COM nsresult -NS_NewHashPropertyBag(nsIWritablePropertyBag* *_retval); +extern "C" NS_COM void NS_NewHashPropertyBag(nsIWritablePropertyBag* *_retval); --- xpcom/ds/nsHashtable.cpp +++ xpcom/ds/nsHashtable.cpp @@ -148,2 +148 @@ -nsresult -nsHashKey::Write(nsIObjectOutputStream* aStream) const +void nsHashKey::Write(nsIObjectOutputStream* aStream) const @@ -152 +152 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -364 +364,3 @@ - nsresult rv = aStream->ReadBoolean(&threadSafe); + try { + aStream->ReadBoolean(&threadSafe); + } @@ -374 +374,3 @@ - rv = aStream->Read32(&count); + try { + aStream->Read32(&count); + } @@ -388 +388,3 @@ - rv = aReadEntryFunc(aStream, &key, &data); + try { + aReadEntryFunc(aStream, &key, &data); + } @@ -397,2 +397 @@ - if (NS_FAILED(rv)) - break; + catch (nsexception &exc) break; @@ -411 +411 @@ - nsresult mRetVal; + void mRetVal; @@ -420 +420,3 @@ - nsresult rv = aKey->Write(stream); + try { + aKey->Write(stream); + } @@ -422 +422,3 @@ - rv = args->mWriteDataFunc(stream, aData); + try { + args->mWriteDataFunc(stream, aData); + } @@ -428,2 +428 @@ -nsresult -nsHashtable::Write(nsIObjectOutputStream* aStream, +void nsHashtable::Write(nsIObjectOutputStream* aStream, @@ -432,2 +432 @@ - if (!mHashtable.ops) - return NS_ERROR_OUT_OF_MEMORY; + @@ -435,2 +435,4 @@ - nsresult rv = aStream->WriteBoolean(threadSafe); - if (NS_FAILED(rv)) return rv; + try { + aStream->WriteBoolean(threadSafe); + } + catch (nsexception &exc) { throw; } @@ -440,2 +440,4 @@ - rv = aStream->Write32(count); - if (NS_FAILED(rv)) return rv; + try { + aStream->Write32(count); + } + catch (nsexception &exc) { throw; } @@ -446 +446 @@ - return args.mRetVal; + return wrap_nsexception(args.mRetVal); @@ -455 +455,3 @@ - nsresult rv = aStream->ReadBoolean(&nonnull); + try { + aStream->ReadBoolean(&nonnull); + } @@ -457 +457,3 @@ - rv = aStream->ReadObject(PR_TRUE, &mKey); + try { + aStream->ReadObject(PR_TRUE, &mKey); + } @@ -461,2 +461 @@ -nsresult -nsISupportsKey::Write(nsIObjectOutputStream* aStream) const +void nsISupportsKey::Write(nsIObjectOutputStream* aStream) const @@ -465 +465,3 @@ - nsresult rv = aStream->WriteBoolean(nonnull); + try { + aStream->WriteBoolean(nonnull); + } @@ -467,2 +467,4 @@ - rv = aStream->WriteObject(mKey, PR_TRUE); - return rv; + try { + aStream->WriteObject(mKey, PR_TRUE); + } + throw nsexception(rv); @@ -476 +476 @@ -nsresult nsIDKey::Write(nsIObjectOutputStream* aStream) const +void nsIDKey::Write(nsIObjectOutputStream* aStream) const @@ -478 +478 @@ - return aStream->WriteID(mID); + return /*thower*/ aStream->WriteID(mID); @@ -594 +594,3 @@ - nsresult rv = aStream->ReadCString(str); + try { + aStream->ReadCString(str); + } @@ -602,2 +602 @@ -nsresult -nsCStringKey::Write(nsIObjectOutputStream* aStream) const +void nsCStringKey::Write(nsIObjectOutputStream* aStream) const @@ -605 +605 @@ - return aStream->WriteStringZ(mStr); + return /*thower*/ aStream->WriteStringZ(mStr); @@ -716 +716,3 @@ - nsresult rv = aStream->ReadString(str); + try { + aStream->ReadString(str); + } @@ -724,2 +724 @@ -nsresult -nsStringKey::Write(nsIObjectOutputStream* aStream) const +void nsStringKey::Write(nsIObjectOutputStream* aStream) const @@ -727 +727 @@ - return aStream->WriteWStringZ(mStr); + return /*thower*/ aStream->WriteWStringZ(mStr); --- xpcom/ds/nsHashtable.h +++ xpcom/ds/nsHashtable.h @@ -87 +87 @@ - virtual nsresult Write(nsIObjectOutputStream* aStream) const; + virtual void Write(nsIObjectOutputStream* aStream) const; @@ -119,2 +119 @@ -typedef nsresult -(*PR_CALLBACK nsHashtableReadEntryFunc)(nsIObjectInputStream *aStream, +typedef void (*PR_CALLBACK nsHashtableReadEntryFunc)(nsIObjectInputStream *aStream, @@ -130,2 +130 @@ -typedef nsresult -(*PR_CALLBACK nsHashtableWriteDataFunc)(nsIObjectOutputStream *aStream, +typedef void (*PR_CALLBACK nsHashtableWriteDataFunc)(nsIObjectOutputStream *aStream, @@ -159 +159 @@ - nsresult Write(nsIObjectOutputStream* aStream, + void Write(nsIObjectOutputStream* aStream, @@ -275 +275 @@ - nsresult Write(nsIObjectOutputStream* aStream) const; + void Write(nsIObjectOutputStream* aStream) const; @@ -377 +377 @@ - nsresult Write(nsIObjectOutputStream* aStream) const; + void Write(nsIObjectOutputStream* aStream) const; @@ -405 +405 @@ - nsresult Write(nsIObjectOutputStream* aStream) const; + void Write(nsIObjectOutputStream* aStream) const; @@ -439 +439 @@ - nsresult Write(nsIObjectOutputStream* aStream) const; + void Write(nsIObjectOutputStream* aStream) const; --- xpcom/ds/nsIByteBuffer.h +++ xpcom/ds/nsIByteBuffer.h @@ -60 +60 @@ - NS_IMETHOD Init(PRUint32 aBufferSize) = 0; + NS_IMETHOD_(void) Init(PRUint32 aBufferSize) = 0; @@ -91,2 +91 @@ -extern NS_COM nsresult -NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult, +extern NS_COM void NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult, --- xpcom/ds/nsINIParserImpl.cpp +++ xpcom/ds/nsINIParserImpl.cpp @@ -53,2 +53,2 @@ - nsresult Init(nsILocalFile* aINIFile) { - return mParser.Init(aINIFile); + void Init(nsILocalFile* aINIFile) { + return /*thower*/ mParser.Init(aINIFile); @@ -65 +65 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -72,2 +72 @@ - if (!p) - return NS_ERROR_OUT_OF_MEMORY; + @@ -75 +75,3 @@ - nsresult rv = p->Init(aINIFile); + try { + p->Init(aINIFile); + } @@ -80 +80 @@ - return rv; + throw nsexception(rv); @@ -83 +83 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -91 +91 @@ - return QueryInterface(aIID, aResult); + return wrap_nsexception(QueryInterface(aIID, aResult)); @@ -94 +94 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -97 +97 @@ - return NS_OK; + return; @@ -112 +112 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -116,2 +116 @@ - if (!strings) - return NS_ERROR_OUT_OF_MEMORY; + @@ -119 +119,3 @@ - nsresult rv = mParser.GetSections(SectionCB, strings); + try { + mParser.GetSections(SectionCB, strings); + } @@ -121 +121,3 @@ - rv = NS_NewUTF8StringEnumerator(aResult, strings); + try { + NS_NewUTF8StringEnumerator(aResult, strings); + } @@ -123,2 +123 @@ - if (NS_FAILED(rv)) - delete strings; + catch (nsexception &exc) delete strings; @@ -126 +126 @@ - return rv; + throw nsexception(rv); @@ -138 +138 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -143,2 +143 @@ - if (!strings) - return NS_ERROR_OUT_OF_MEMORY; + @@ -146,2 +146,4 @@ - nsresult rv = mParser.GetStrings(PromiseFlatCString(aSection).get(), - KeyCB, strings); + try { + mParser.GetStrings(PromiseFlatCString(aSection).get(), + KeyCB, strings); + } @@ -149 +149,3 @@ - rv = NS_NewUTF8StringEnumerator(aResult, strings); + try { + NS_NewUTF8StringEnumerator(aResult, strings); + } @@ -151,2 +151 @@ - if (NS_FAILED(rv)) - delete strings; + catch (nsexception &exc) delete strings; @@ -154 +154 @@ - return rv; + throw nsexception(rv); @@ -158 +158 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -163 +163 @@ - return mParser.GetString(PromiseFlatCString(aSection).get(), + return /*thower*/ mParser.GetString(PromiseFlatCString(aSection).get(), --- xpcom/ds/nsIUnicharBuffer.h +++ xpcom/ds/nsIUnicharBuffer.h @@ -52 +52 @@ - NS_IMETHOD Init(PRUint32 aBufferSize) = 0; + NS_IMETHOD_(void) Init(PRUint32 aBufferSize) = 0; @@ -62,2 +62 @@ -extern NS_COM nsresult -NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult, +extern NS_COM void NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult, --- xpcom/ds/nsObserverList.cpp +++ xpcom/ds/nsObserverList.cpp @@ -44,2 +44 @@ -nsresult -nsObserverList::AddObserver(nsIObserver* anObserver, PRBool ownsWeak) +void nsObserverList::AddObserver(nsIObserver* anObserver, PRBool ownsWeak) @@ -51,2 +51 @@ - if (!o) - return NS_ERROR_OUT_OF_MEMORY; + @@ -54 +54 @@ - return NS_OK; + return; @@ -59 +59 @@ - return NS_NOINTERFACE; + throw nsexception(NS_NOINTERFACE); @@ -62,2 +62 @@ - if (!o) - return NS_ERROR_OUT_OF_MEMORY; + @@ -65 +65 @@ - return NS_OK; + return; @@ -68,2 +68 @@ -nsresult -nsObserverList::RemoveObserver(nsIObserver* anObserver) +void nsObserverList::RemoveObserver(nsIObserver* anObserver) @@ -74 +74 @@ - return NS_OK; + return; @@ -78 +78 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -81 +81 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -83 +83 @@ - return NS_OK; + return; @@ -86,2 +86 @@ -nsresult -nsObserverList::GetObserverList(nsISimpleEnumerator** anEnumerator) +void nsObserverList::GetObserverList(nsISimpleEnumerator** anEnumerator) @@ -90,2 +90 @@ - if (!e) - return NS_ERROR_OUT_OF_MEMORY; + @@ -94 +94 @@ - return NS_OK; + return; @@ -128 +128 @@ - observers[i]->Observe(aSubject, aTopic, someData); + IGNORE_NSEXCEPTION(observers[i]->Observe(aSubject, aTopic, someData)); @@ -140 +140 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -144 +144 @@ - return NS_OK; + return; @@ -147 +147 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -152 +152 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -157 +157 @@ - return NS_OK; + return; --- xpcom/ds/nsObserverList.h +++ xpcom/ds/nsObserverList.h @@ -82,2 +82,2 @@ - nsresult AddObserver(nsIObserver* anObserver, PRBool ownsWeak); - nsresult RemoveObserver(nsIObserver* anObserver); + void AddObserver(nsIObserver* anObserver, PRBool ownsWeak); + void RemoveObserver(nsIObserver* anObserver); @@ -88 +88 @@ - nsresult GetObserverList(nsISimpleEnumerator** anEnumerator); + void GetObserverList(nsISimpleEnumerator** anEnumerator); --- xpcom/ds/nsObserverService.cpp +++ xpcom/ds/nsObserverService.cpp @@ -98 +98 @@ -NS_METHOD +NS_METHOD_(void) @@ -108 +108 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -110 +110 @@ - return os->QueryInterface(aIID, aInstancePtr); + return wrap_nsexception(os->QueryInterface(aIID, aInstancePtr)); @@ -123 +123 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -134,2 +134 @@ - if (!observerList) - return NS_ERROR_OUT_OF_MEMORY; + @@ -137 +137 @@ - return observerList->AddObserver(anObserver, ownsWeak); + return /*thower*/ observerList->AddObserver(anObserver, ownsWeak); @@ -140 +140 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -150 +150 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -152 +152 @@ - return observerList->RemoveObserver(anObserver); + return /*thower*/ observerList->RemoveObserver(anObserver); @@ -155 +155 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -164 +164 @@ - return NS_NewEmptyEnumerator(anEnumerator); + return /*thower*/ NS_NewEmptyEnumerator(anEnumerator); @@ -166 +166 @@ - return observerList->GetObserverList(anEnumerator); + return /*thower*/ observerList->GetObserverList(anEnumerator); @@ -170 +170 @@ -NS_IMETHODIMP nsObserverService::NotifyObservers(nsISupports *aSubject, +NS_IMETHODIMP_(void) nsObserverService::NotifyObservers(nsISupports *aSubject, @@ -189 +189 @@ - return NS_OK; + return; --- xpcom/ds/nsObserverService.h +++ xpcom/ds/nsObserverService.h @@ -62 +62 @@ - static NS_METHOD + static NS_METHOD_(void) --- xpcom/ds/nsPersistentProperties.cpp +++ xpcom/ds/nsPersistentProperties.cpp @@ -115,2 +115 @@ -nsresult -nsPersistentProperties::Init() +void nsPersistentProperties::Init() @@ -121 +121 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -123 +123 @@ - return NS_OK; + return; @@ -126 +126 @@ -NS_METHOD +NS_METHOD_(void) @@ -130 +130 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -133 +133 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -136 +136,3 @@ - nsresult rv = props->Init(); + try { + props->Init(); + } @@ -138 +138,3 @@ - rv = props->QueryInterface(aIID, aResult); + try { + wrap_nsexception(props->QueryInterface(aIID, aResult)); + } @@ -141 +141 @@ - return rv; + throw nsexception(rv); @@ -146 +146 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -150,2 +150,4 @@ - nsresult ret = nsSimpleUnicharStreamFactory::GetInstance()-> - CreateInstanceFromUTF8Stream(aIn, &mIn); + try { + wrap_nsexception(nsSimpleUnicharStreamFactory::GetInstance()-> + CreateInstanceFromUTF8Stream(aIn, &mIn)); + } @@ -155 +155 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -273 +273 @@ - mSubclass->SetStringProperty(NS_ConvertUTF16toUTF8(key), value, oldValue); + IGNORE_NSEXCEPTION(mSubclass->SetStringProperty(NS_ConvertUTF16toUTF8(key), value, oldValue)); @@ -276 +276 @@ - mIn->Close(); + IGNORE_NSEXCEPTION(mIn->Close()); @@ -279 +279 @@ - return NS_OK; + return; @@ -282 +282 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -307 +307 @@ - return NS_OK; + return; @@ -310 +310 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -313 +313 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -316 +316 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -323 +323 @@ - return NS_OK; + return; @@ -326 +326 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -337 +337 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -340 +340 @@ - return NS_OK; + return; @@ -363 +363 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -367,3 +367,4 @@ - nsresult rv = NS_NewISupportsArray(getter_AddRefs(propArray)); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewISupportsArray(getter_AddRefs(propArray)); + } + catch (nsexception &exc) { throw; } @@ -373 +373 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -379 +379 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -381 +381 @@ - return NS_NewArrayEnumerator(aResult, propArray); + return /*thower*/ NS_NewArrayEnumerator(aResult, propArray); @@ -392 +392,3 @@ - ret = mIn->Read(&c, 1, &nRead); + try { + mIn->Read(&c, 1, &nRead); + } @@ -433 +433 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -436 +436 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -439 +439 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -442 +442 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -444 +444 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -447 +447 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -450 +450 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -453 +453 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -456 +456 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -459 +459 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -467 +467 @@ -NS_METHOD +NS_METHOD_(void) @@ -471 +471 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -474 +474 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -476 +476,3 @@ - nsresult rv = propElem->QueryInterface(aIID, aResult); + try { + wrap_nsexception(propElem->QueryInterface(aIID, aResult)); + } @@ -478 +478 @@ - return rv; + throw nsexception(rv); @@ -483 +483 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -487 +487 @@ - return NS_OK; + return; @@ -490 +490 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -494 +494 @@ - return NS_OK; + return; @@ -497 +497 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -501 +501 @@ - return NS_OK; + return; @@ -504 +504 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -508 +508 @@ - return NS_OK; + return; --- xpcom/ds/nsPersistentProperties.h +++ xpcom/ds/nsPersistentProperties.h @@ -53 +53 @@ - nsresult Init(); + void Init(); @@ -65 +65 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -95 +95 @@ - static NS_METHOD + static NS_METHOD_(void) --- xpcom/ds/nsProperties.cpp +++ xpcom/ds/nsProperties.cpp @@ -49 +49 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -56 +56 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -58 +58 @@ - return (value) ? value->QueryInterface(uuid, result) : NS_ERROR_NO_INTERFACE; + return wrap_nsexception((value) ? value->QueryInterface(uuid, result) : NS_ERROR_NO_INTERFACE); @@ -61 +61 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -66 +66 @@ - return Put(prop, value) ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(Put(prop, value) ? NS_OK : NS_ERROR_FAILURE); @@ -69 +69 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -76 +76 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -79 +79 @@ - return NS_OK; + return; @@ -82 +82 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -90 +90 @@ - return NS_OK; + return; @@ -97 +97 @@ - nsresult res; + void res; @@ -116 +116 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -138 +138 @@ - return gked.res; + return wrap_nsexception(gked.res); @@ -143 +143 @@ - return NS_OK; + return; --- xpcom/ds/nsRecyclingAllocator.cpp +++ xpcom/ds/nsRecyclingAllocator.cpp @@ -85,2 +85 @@ -nsresult -nsRecyclingAllocator::Init(PRUint32 nbucket, PRUint32 recycleAfter, const char *id) +void nsRecyclingAllocator::Init(PRUint32 nbucket, PRUint32 recycleAfter, const char *id) @@ -99 +99 @@ - return NS_OK; + return; @@ -264 +264 @@ - mRecycleTimer->Cancel(); + IGNORE_NSEXCEPTION(mRecycleTimer->Cancel()); @@ -317 +317 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -320 +320 @@ - return nsRecyclingAllocator::Init((PRUint32) nbuckets, (PRUint32) recycleAfter, id); + return /*thower*/ nsRecyclingAllocator::Init((PRUint32) nbuckets, (PRUint32) recycleAfter, id); @@ -323 +323 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -327 +327 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -330 +330 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -334 +334 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); --- xpcom/ds/nsRecyclingAllocator.h +++ xpcom/ds/nsRecyclingAllocator.h @@ -130 +130 @@ - nsresult Init(PRUint32 nbucket, PRUint32 recycleAfter, const char *id); + void Init(PRUint32 nbucket, PRUint32 recycleAfter, const char *id); --- xpcom/ds/nsStaticAtom.h +++ xpcom/ds/nsStaticAtom.h @@ -62,2 +62 @@ -NS_COM nsresult -NS_RegisterStaticAtoms(const nsStaticAtom*, PRUint32 aAtomCount); +NS_COM void NS_RegisterStaticAtoms(const nsStaticAtom*, PRUint32 aAtomCount); --- xpcom/ds/nsStringEnumerator.cpp +++ xpcom/ds/nsStringEnumerator.cpp @@ -78 +78 @@ - NS_IMETHOD GetNext(nsAString& aResult); + NS_IMETHOD_(void) GetNext(nsAString& aResult); @@ -119 +119 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -124 +124 @@ - return NS_OK; + return; @@ -127 +127 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -130 +130 @@ - return HasMore(aResult); + return /*thower*/ HasMore(aResult); @@ -133 +133 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -138 +138 @@ - if (!stringImpl) return NS_ERROR_OUT_OF_MEMORY; + @@ -145 +145 @@ - if (!cstringImpl) return NS_ERROR_OUT_OF_MEMORY; + @@ -151 +151 @@ - return NS_OK; + return; @@ -154 +154 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -164 +164 @@ - return NS_OK; + return; @@ -167 +167 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -177 +177 @@ - return NS_OK; + return; @@ -194,2 +194 @@ -NS_COM nsresult -NS_NewStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewStringEnumerator(nsIStringEnumerator** aResult, @@ -202 +202 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); @@ -206,2 +206 @@ -NS_COM nsresult -NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, @@ -214 +214 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); @@ -217,2 +217 @@ -NS_COM nsresult -NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult, @@ -225 +225 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); @@ -228,2 +228 @@ -NS_COM nsresult -NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, @@ -236 +236 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); @@ -240,2 +240 @@ -NS_COM nsresult -NS_NewStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewStringEnumerator(nsIStringEnumerator** aResult, @@ -248 +248 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); @@ -251,2 +251 @@ -NS_COM nsresult -NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, @@ -259 +259 @@ - return StringEnumeratorTail(aResult); + return wrap_nsexception(StringEnumeratorTail(aResult)); --- xpcom/ds/nsStringEnumerator.h +++ xpcom/ds/nsStringEnumerator.h @@ -77,2 +77 @@ -NS_COM nsresult -NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, @@ -81,2 +81 @@ -NS_COM nsresult -NS_NewStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewStringEnumerator(nsIStringEnumerator** aResult, @@ -94,2 +94 @@ -NS_COM nsresult -NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult, @@ -98,2 +98 @@ -NS_COM nsresult -NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, @@ -115,2 +115 @@ -NS_COM nsresult -NS_NewStringEnumerator(nsIStringEnumerator** aResult, +NS_COM void NS_NewStringEnumerator(nsIStringEnumerator** aResult, @@ -119,2 +119 @@ -NS_COM nsresult -NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, +NS_COM void NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult, --- xpcom/ds/nsSupportsArray.cpp +++ xpcom/ds/nsSupportsArray.cpp @@ -207 +207 @@ -NS_METHOD +NS_METHOD_(void) @@ -211 +211 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -214,2 +214 @@ - if (!it) - return NS_ERROR_OUT_OF_MEMORY; + @@ -217 +217 @@ - return it->QueryInterface(aIID, aResult); + return /*thower*/ it->QueryInterface(aIID, aResult); @@ -222 +222 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -228 +228,3 @@ - rv = aStream->Read32(&newArraySize); + try { + aStream->Read32(&newArraySize); + } @@ -244,2 +244 @@ - if (!array) - return NS_ERROR_OUT_OF_MEMORY; + @@ -253,2 +253,4 @@ - rv = aStream->Read32(&mCount); - if (NS_FAILED(rv)) return rv; + try { + aStream->Read32(&mCount); + } + catch (nsexception &exc) { throw; } @@ -261,2 +261,4 @@ - rv = aStream->ReadObject(PR_TRUE, &mArray[i]); - if (NS_FAILED(rv)) return rv; + try { + aStream->ReadObject(PR_TRUE, &mArray[i]); + } + catch (nsexception &exc) { throw; } @@ -265 +265 @@ - return NS_OK; + return; @@ -268 +268 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -273,2 +273,4 @@ - rv = aStream->Write32(mArraySize); - if (NS_FAILED(rv)) return rv; + try { + aStream->Write32(mArraySize); + } + catch (nsexception &exc) { throw; } @@ -276,2 +276,4 @@ - rv = aStream->Write32(mCount); - if (NS_FAILED(rv)) return rv; + try { + aStream->Write32(mCount); + } + catch (nsexception &exc) { throw; } @@ -280,2 +280,4 @@ - rv = aStream->WriteObject(mArray[i], PR_TRUE); - if (NS_FAILED(rv)) return rv; + try { + aStream->WriteObject(mArray[i], PR_TRUE); + } + catch (nsexception &exc) { throw; } @@ -284 +284 @@ - return NS_OK; + return; @@ -289 +289 @@ - Clear(); + IGNORE_NSEXCEPTION(Clear()); @@ -304,3 +304,4 @@ - nsresult rv = other->Count(&countOther); - if (NS_FAILED( rv )) - return PR_FALSE; + try { + other->Count(&countOther); + } + catch (nsexception &exc) return PR_FALSE; @@ -536 +536 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -545 +545 @@ - return NS_OK; + return; @@ -548 +548 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -564 +564 @@ - return NS_OK; + return; @@ -578 +578 @@ - return NS_OK; + return; @@ -645 +645 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -649,2 +649 @@ - if (!e) - return NS_ERROR_OUT_OF_MEMORY; + @@ -653 +653 @@ - return NS_OK; + return; @@ -661 +661,3 @@ - rv = newArray->AppendElement(aElement); + try { + newArray->AppendElement(aElement); + } @@ -665 +665 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -670 +670,3 @@ - rv = NS_NewISupportsArray(&newArray); + try { + NS_NewISupportsArray(&newArray); + } @@ -672 +672 @@ - if (!ok) return NS_ERROR_OUT_OF_MEMORY; + @@ -674 +674 @@ - return NS_OK; + return; @@ -677,2 +677 @@ -NS_COM nsresult -NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult) +NS_COM void NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult) @@ -681,3 +681,5 @@ - rv = nsSupportsArray::Create(NULL, NS_GET_IID(nsISupportsArray), - (void**)aInstancePtrResult); - return rv; + try { + nsSupportsArray::Create(NULL, NS_GET_IID(nsISupportsArray), + (void**)aInstancePtrResult); + } + throw nsexception(rv); @@ -693,2 +693,2 @@ - NS_IMETHOD HasMoreElements(PRBool* aResult); - NS_IMETHOD GetNext(nsISupports** aResult); + NS_IMETHOD_(void) HasMoreElements(PRBool* aResult); + NS_IMETHOD_(void) GetNext(nsISupports** aResult); @@ -721 +721 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -726 +726 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -730 +730 @@ - return NS_OK; + return; @@ -734,2 +734,4 @@ - nsresult rv = mValueArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mValueArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -737 +737 @@ - return NS_OK; + return; @@ -740 +740 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -745 +745 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -749 +749 @@ - return NS_OK; + return; @@ -753,2 +753,4 @@ - nsresult rv = mValueArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mValueArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -756 +756 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -759 +759 @@ - return NS_OK; + return; @@ -762,2 +762 @@ -nsresult -NS_NewArrayEnumerator(nsISimpleEnumerator* *result, +void NS_NewArrayEnumerator(nsISimpleEnumerator* *result, @@ -768 +768 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -771 +771 @@ - return NS_OK; + return; --- xpcom/ds/nsSupportsArray.h +++ xpcom/ds/nsSupportsArray.h @@ -57 +57 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -65,2 +65,2 @@ - NS_IMETHOD Count(PRUint32 *result) { *result = mCount; return NS_OK; } - NS_IMETHOD GetElementAt(PRUint32 aIndex, nsISupports* *result) { + NS_IMETHOD_(void) Count(PRUint32 *result) { *result = mCount; return; } + NS_IMETHOD_(void) GetElementAt(PRUint32 aIndex, nsISupports* *result) { @@ -68 +68 @@ - return NS_OK; + return; @@ -70 +70 @@ - NS_IMETHOD QueryElementAt(PRUint32 aIndex, const nsIID & aIID, void * *aResult) { + NS_IMETHOD_(void) QueryElementAt(PRUint32 aIndex, const nsIID & aIID, void * *aResult) { @@ -74 +74 @@ - return element->QueryInterface(aIID, aResult); + return /*thower*/ element->QueryInterface(aIID, aResult); @@ -76 +76 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -78,2 +78,2 @@ - NS_IMETHOD SetElementAt(PRUint32 aIndex, nsISupports* value) { - return ReplaceElementAt(value, aIndex) ? NS_OK : NS_ERROR_FAILURE; + NS_IMETHOD_(void) SetElementAt(PRUint32 aIndex, nsISupports* value) { + return wrap_nsexception(ReplaceElementAt(value, aIndex) ? NS_OK : NS_ERROR_FAILURE); @@ -81,2 +81,2 @@ - NS_IMETHOD AppendElement(nsISupports *aElement) { - return InsertElementAt(aElement, mCount)/* ? NS_OK : NS_ERROR_FAILURE*/; + NS_IMETHOD_(void) AppendElement(nsISupports *aElement) { + return wrap_nsexception(InsertElementAt(aElement, mCount))/* ? NS_OK : NS_ERROR_FAILURE*/; @@ -85,2 +85,2 @@ - NS_IMETHOD RemoveElement(nsISupports *aElement) { - return RemoveElement(aElement, 0)/* ? NS_OK : NS_ERROR_FAILURE*/; + NS_IMETHOD_(void) RemoveElement(nsISupports *aElement) { + return wrap_nsexception(RemoveElement(aElement, 0))/* ? NS_OK : NS_ERROR_FAILURE*/; @@ -89,2 +89,2 @@ - NS_IMETHOD Enumerate(nsIEnumerator* *result); - NS_IMETHOD Clear(void); + NS_IMETHOD_(void) Enumerate(nsIEnumerator* *result); + NS_IMETHOD_(void) Clear(void); @@ -102 +102 @@ - NS_IMETHOD GetIndexOf(nsISupports *aPossibleElement, PRInt32 *_retval) { + NS_IMETHOD_(void) GetIndexOf(nsISupports *aPossibleElement, PRInt32 *_retval) { @@ -104 +104 @@ - return NS_OK; + return; @@ -107 +107 @@ - NS_IMETHOD GetIndexOfStartingAt(nsISupports *aPossibleElement, + NS_IMETHOD_(void) GetIndexOfStartingAt(nsISupports *aPossibleElement, @@ -110 +110 @@ - return NS_OK; + return; @@ -113 +113 @@ - NS_IMETHOD GetLastIndexOf(nsISupports *aPossibleElement, PRInt32 *_retval) { + NS_IMETHOD_(void) GetLastIndexOf(nsISupports *aPossibleElement, PRInt32 *_retval) { @@ -115 +115 @@ - return NS_OK; + return; @@ -128,2 +128,2 @@ - NS_IMETHOD DeleteLastElement(nsISupports *aElement) { - return (RemoveLastElement(aElement) ? NS_OK : NS_ERROR_FAILURE); + NS_IMETHOD_(void) DeleteLastElement(nsISupports *aElement) { + return wrap_nsexception(RemoveLastElement(aElement) ? NS_OK : NS_ERROR_FAILURE)); @@ -132,2 +132,2 @@ - NS_IMETHOD DeleteElementAt(PRUint32 aIndex) { - return (RemoveElementAt(aIndex) ? NS_OK : NS_ERROR_FAILURE); + NS_IMETHOD_(void) DeleteElementAt(PRUint32 aIndex) { + return wrap_nsexception(RemoveElementAt(aIndex) ? NS_OK : NS_ERROR_FAILURE)); @@ -140 +140 @@ - NS_IMETHOD Compact(void); + NS_IMETHOD_(void) Compact(void); @@ -145 +145 @@ - NS_IMETHOD Clone(nsISupportsArray **_retval); + NS_IMETHOD_(void) Clone(nsISupportsArray **_retval); --- xpcom/ds/nsSupportsArrayEnumerator.cpp +++ xpcom/ds/nsSupportsArrayEnumerator.cpp @@ -55 +55 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -60,2 +60,4 @@ - nsresult rv = mArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -64 +64 @@ - return NS_OK; + return; @@ -66 +66 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -69 +69 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -73,2 +73,4 @@ - nsresult rv = mArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -79 +79 @@ - return NS_OK; + return; @@ -81 +81 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -84 +84 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -89,2 +89,4 @@ - nsresult rv = mArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -93 +93 @@ - return NS_OK; + return; @@ -95 +95 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -98 +98 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -102,4 +102,6 @@ - nsresult rv = mArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; - return (mCursor >= 0 && mCursor < (PRInt32)cnt) - ? NS_ENUMERATOR_FALSE : NS_OK; + try { + mArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } + return wrap_nsexception((mCursor >= 0 && mCursor < (PRInt32)cnt) + ? NS_ENUMERATOR_FALSE : NS_OK); @@ -110 +110 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -114,2 +114,4 @@ - nsresult rv = mArray->Count(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mArray->Count(&cnt); + } + catch (nsexception &exc) { throw; } @@ -117 +117 @@ - return NS_OK; + return; @@ -120 +120 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -126 +126 @@ - return NS_OK; + return; @@ -128 +128 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -133,2 +133 @@ -NS_COM nsresult -NS_NewISupportsArrayEnumerator(nsISupportsArray* array, +NS_COM void NS_NewISupportsArrayEnumerator(nsISupportsArray* array, @@ -138 +138 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -141 +141 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -144 +144 @@ - return NS_OK; + return; --- xpcom/ds/nsSupportsPrimitives.cpp +++ xpcom/ds/nsSupportsPrimitives.cpp @@ -57 +57 @@ -NS_IMETHODIMP nsSupportsIDImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsIDImpl::GetType(PRUint16 *aType) @@ -62 +62 @@ - return NS_OK; + return; @@ -65 +65 @@ -NS_IMETHODIMP nsSupportsIDImpl::GetData(nsID **aData) +NS_IMETHODIMP_(void) nsSupportsIDImpl::GetData(nsID **aData) @@ -71 +71 @@ - return *aData ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*aData ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -74 +74 @@ - return NS_OK; + return; @@ -77 +77 @@ -NS_IMETHODIMP nsSupportsIDImpl::SetData(const nsID *aData) +NS_IMETHODIMP_(void) nsSupportsIDImpl::SetData(const nsID *aData) @@ -85 +85 @@ - return NS_OK; + return; @@ -88 +88 @@ -NS_IMETHODIMP nsSupportsIDImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsIDImpl::ToString(char **_retval) @@ -103 +103 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -113 +113 @@ -NS_IMETHODIMP nsSupportsCStringImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsCStringImpl::GetType(PRUint16 *aType) @@ -118 +118 @@ - return NS_OK; + return; @@ -121 +121 @@ -NS_IMETHODIMP nsSupportsCStringImpl::GetData(nsACString& aData) +NS_IMETHODIMP_(void) nsSupportsCStringImpl::GetData(nsACString& aData) @@ -124 +124 @@ - return NS_OK; + return; @@ -127 +127 @@ -NS_IMETHODIMP nsSupportsCStringImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsCStringImpl::ToString(char **_retval) @@ -132 +132 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -134 +134 @@ - return NS_OK; + return; @@ -137 +137 @@ -NS_IMETHODIMP nsSupportsCStringImpl::SetData(const nsACString& aData) +NS_IMETHODIMP_(void) nsSupportsCStringImpl::SetData(const nsACString& aData) @@ -140 +140 @@ - return NS_OK; + return; @@ -150 +150 @@ -NS_IMETHODIMP nsSupportsStringImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsStringImpl::GetType(PRUint16 *aType) @@ -155 +155 @@ - return NS_OK; + return; @@ -158 +158 @@ -NS_IMETHODIMP nsSupportsStringImpl::GetData(nsAString& aData) +NS_IMETHODIMP_(void) nsSupportsStringImpl::GetData(nsAString& aData) @@ -161 +161 @@ - return NS_OK; + return; @@ -164 +164 @@ -NS_IMETHODIMP nsSupportsStringImpl::ToString(PRUnichar **_retval) +NS_IMETHODIMP_(void) nsSupportsStringImpl::ToString(PRUnichar **_retval) @@ -169 +169 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -171 +171 @@ - return NS_OK; + return; @@ -174 +174 @@ -NS_IMETHODIMP nsSupportsStringImpl::SetData(const nsAString& aData) +NS_IMETHODIMP_(void) nsSupportsStringImpl::SetData(const nsAString& aData) @@ -177 +177 @@ - return NS_OK; + return; @@ -190 +190 @@ -NS_IMETHODIMP nsSupportsPRBoolImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRBoolImpl::GetType(PRUint16 *aType) @@ -195 +195 @@ - return NS_OK; + return; @@ -198 +198 @@ -NS_IMETHODIMP nsSupportsPRBoolImpl::GetData(PRBool *aData) +NS_IMETHODIMP_(void) nsSupportsPRBoolImpl::GetData(PRBool *aData) @@ -202 +202 @@ - return NS_OK; + return; @@ -205 +205 @@ -NS_IMETHODIMP nsSupportsPRBoolImpl::SetData(PRBool aData) +NS_IMETHODIMP_(void) nsSupportsPRBoolImpl::SetData(PRBool aData) @@ -208 +208 @@ - return NS_OK; + return; @@ -211 +211 @@ -NS_IMETHODIMP nsSupportsPRBoolImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRBoolImpl::ToString(char **_retval) @@ -218 +218 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -231 +231 @@ -NS_IMETHODIMP nsSupportsPRUint8Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRUint8Impl::GetType(PRUint16 *aType) @@ -236 +236 @@ - return NS_OK; + return; @@ -239 +239 @@ -NS_IMETHODIMP nsSupportsPRUint8Impl::GetData(PRUint8 *aData) +NS_IMETHODIMP_(void) nsSupportsPRUint8Impl::GetData(PRUint8 *aData) @@ -243 +243 @@ - return NS_OK; + return; @@ -246 +246 @@ -NS_IMETHODIMP nsSupportsPRUint8Impl::SetData(PRUint8 aData) +NS_IMETHODIMP_(void) nsSupportsPRUint8Impl::SetData(PRUint8 aData) @@ -249 +249 @@ - return NS_OK; + return; @@ -252 +252 @@ -NS_IMETHODIMP nsSupportsPRUint8Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRUint8Impl::ToString(char **_retval) @@ -263 +263 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -276 +276 @@ -NS_IMETHODIMP nsSupportsPRUint16Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRUint16Impl::GetType(PRUint16 *aType) @@ -281 +281 @@ - return NS_OK; + return; @@ -284 +284 @@ -NS_IMETHODIMP nsSupportsPRUint16Impl::GetData(PRUint16 *aData) +NS_IMETHODIMP_(void) nsSupportsPRUint16Impl::GetData(PRUint16 *aData) @@ -288 +288 @@ - return NS_OK; + return; @@ -291 +291 @@ -NS_IMETHODIMP nsSupportsPRUint16Impl::SetData(PRUint16 aData) +NS_IMETHODIMP_(void) nsSupportsPRUint16Impl::SetData(PRUint16 aData) @@ -294 +294 @@ - return NS_OK; + return; @@ -297 +297 @@ -NS_IMETHODIMP nsSupportsPRUint16Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRUint16Impl::ToString(char **_retval) @@ -308 +308 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -321 +321 @@ -NS_IMETHODIMP nsSupportsPRUint32Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRUint32Impl::GetType(PRUint16 *aType) @@ -326 +326 @@ - return NS_OK; + return; @@ -329 +329 @@ -NS_IMETHODIMP nsSupportsPRUint32Impl::GetData(PRUint32 *aData) +NS_IMETHODIMP_(void) nsSupportsPRUint32Impl::GetData(PRUint32 *aData) @@ -333 +333 @@ - return NS_OK; + return; @@ -336 +336 @@ -NS_IMETHODIMP nsSupportsPRUint32Impl::SetData(PRUint32 aData) +NS_IMETHODIMP_(void) nsSupportsPRUint32Impl::SetData(PRUint32 aData) @@ -339 +339 @@ - return NS_OK; + return; @@ -342 +342 @@ -NS_IMETHODIMP nsSupportsPRUint32Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRUint32Impl::ToString(char **_retval) @@ -353 +353 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -366 +366 @@ -NS_IMETHODIMP nsSupportsPRUint64Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRUint64Impl::GetType(PRUint16 *aType) @@ -371 +371 @@ - return NS_OK; + return; @@ -374 +374 @@ -NS_IMETHODIMP nsSupportsPRUint64Impl::GetData(PRUint64 *aData) +NS_IMETHODIMP_(void) nsSupportsPRUint64Impl::GetData(PRUint64 *aData) @@ -378 +378 @@ - return NS_OK; + return; @@ -381 +381 @@ -NS_IMETHODIMP nsSupportsPRUint64Impl::SetData(PRUint64 aData) +NS_IMETHODIMP_(void) nsSupportsPRUint64Impl::SetData(PRUint64 aData) @@ -384 +384 @@ - return NS_OK; + return; @@ -387 +387 @@ -NS_IMETHODIMP nsSupportsPRUint64Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRUint64Impl::ToString(char **_retval) @@ -398 +398 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -411 +411 @@ -NS_IMETHODIMP nsSupportsPRTimeImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRTimeImpl::GetType(PRUint16 *aType) @@ -416 +416 @@ - return NS_OK; + return; @@ -419 +419 @@ -NS_IMETHODIMP nsSupportsPRTimeImpl::GetData(PRTime *aData) +NS_IMETHODIMP_(void) nsSupportsPRTimeImpl::GetData(PRTime *aData) @@ -423 +423 @@ - return NS_OK; + return; @@ -426 +426 @@ -NS_IMETHODIMP nsSupportsPRTimeImpl::SetData(PRTime aData) +NS_IMETHODIMP_(void) nsSupportsPRTimeImpl::SetData(PRTime aData) @@ -429 +429 @@ - return NS_OK; + return; @@ -432 +432 @@ -NS_IMETHODIMP nsSupportsPRTimeImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRTimeImpl::ToString(char **_retval) @@ -443 +443 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -456 +456 @@ -NS_IMETHODIMP nsSupportsCharImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsCharImpl::GetType(PRUint16 *aType) @@ -461 +461 @@ - return NS_OK; + return; @@ -464 +464 @@ -NS_IMETHODIMP nsSupportsCharImpl::GetData(char *aData) +NS_IMETHODIMP_(void) nsSupportsCharImpl::GetData(char *aData) @@ -468 +468 @@ - return NS_OK; + return; @@ -471 +471 @@ -NS_IMETHODIMP nsSupportsCharImpl::SetData(char aData) +NS_IMETHODIMP_(void) nsSupportsCharImpl::SetData(char aData) @@ -474 +474 @@ - return NS_OK; + return; @@ -477 +477 @@ -NS_IMETHODIMP nsSupportsCharImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsCharImpl::ToString(char **_retval) @@ -488 +488 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -501 +501 @@ -NS_IMETHODIMP nsSupportsPRInt16Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRInt16Impl::GetType(PRUint16 *aType) @@ -506 +506 @@ - return NS_OK; + return; @@ -509 +509 @@ -NS_IMETHODIMP nsSupportsPRInt16Impl::GetData(PRInt16 *aData) +NS_IMETHODIMP_(void) nsSupportsPRInt16Impl::GetData(PRInt16 *aData) @@ -513 +513 @@ - return NS_OK; + return; @@ -516 +516 @@ -NS_IMETHODIMP nsSupportsPRInt16Impl::SetData(PRInt16 aData) +NS_IMETHODIMP_(void) nsSupportsPRInt16Impl::SetData(PRInt16 aData) @@ -519 +519 @@ - return NS_OK; + return; @@ -522 +522 @@ -NS_IMETHODIMP nsSupportsPRInt16Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRInt16Impl::ToString(char **_retval) @@ -533 +533 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -546 +546 @@ -NS_IMETHODIMP nsSupportsPRInt32Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRInt32Impl::GetType(PRUint16 *aType) @@ -551 +551 @@ - return NS_OK; + return; @@ -554 +554 @@ -NS_IMETHODIMP nsSupportsPRInt32Impl::GetData(PRInt32 *aData) +NS_IMETHODIMP_(void) nsSupportsPRInt32Impl::GetData(PRInt32 *aData) @@ -558 +558 @@ - return NS_OK; + return; @@ -561 +561 @@ -NS_IMETHODIMP nsSupportsPRInt32Impl::SetData(PRInt32 aData) +NS_IMETHODIMP_(void) nsSupportsPRInt32Impl::SetData(PRInt32 aData) @@ -564 +564 @@ - return NS_OK; + return; @@ -567 +567 @@ -NS_IMETHODIMP nsSupportsPRInt32Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRInt32Impl::ToString(char **_retval) @@ -578 +578 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -591 +591 @@ -NS_IMETHODIMP nsSupportsPRInt64Impl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsPRInt64Impl::GetType(PRUint16 *aType) @@ -596 +596 @@ - return NS_OK; + return; @@ -599 +599 @@ -NS_IMETHODIMP nsSupportsPRInt64Impl::GetData(PRInt64 *aData) +NS_IMETHODIMP_(void) nsSupportsPRInt64Impl::GetData(PRInt64 *aData) @@ -603 +603 @@ - return NS_OK; + return; @@ -606 +606 @@ -NS_IMETHODIMP nsSupportsPRInt64Impl::SetData(PRInt64 aData) +NS_IMETHODIMP_(void) nsSupportsPRInt64Impl::SetData(PRInt64 aData) @@ -609 +609 @@ - return NS_OK; + return; @@ -612 +612 @@ -NS_IMETHODIMP nsSupportsPRInt64Impl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsPRInt64Impl::ToString(char **_retval) @@ -623 +623 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -636 +636 @@ -NS_IMETHODIMP nsSupportsFloatImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsFloatImpl::GetType(PRUint16 *aType) @@ -641 +641 @@ - return NS_OK; + return; @@ -644 +644 @@ -NS_IMETHODIMP nsSupportsFloatImpl::GetData(float *aData) +NS_IMETHODIMP_(void) nsSupportsFloatImpl::GetData(float *aData) @@ -648 +648 @@ - return NS_OK; + return; @@ -651 +651 @@ -NS_IMETHODIMP nsSupportsFloatImpl::SetData(float aData) +NS_IMETHODIMP_(void) nsSupportsFloatImpl::SetData(float aData) @@ -654 +654 @@ - return NS_OK; + return; @@ -657 +657 @@ -NS_IMETHODIMP nsSupportsFloatImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsFloatImpl::ToString(char **_retval) @@ -668 +668 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -681 +681 @@ -NS_IMETHODIMP nsSupportsDoubleImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsDoubleImpl::GetType(PRUint16 *aType) @@ -686 +686 @@ - return NS_OK; + return; @@ -689 +689 @@ -NS_IMETHODIMP nsSupportsDoubleImpl::GetData(double *aData) +NS_IMETHODIMP_(void) nsSupportsDoubleImpl::GetData(double *aData) @@ -693 +693 @@ - return NS_OK; + return; @@ -696 +696 @@ -NS_IMETHODIMP nsSupportsDoubleImpl::SetData(double aData) +NS_IMETHODIMP_(void) nsSupportsDoubleImpl::SetData(double aData) @@ -699 +699 @@ - return NS_OK; + return; @@ -702 +702 @@ -NS_IMETHODIMP nsSupportsDoubleImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsDoubleImpl::ToString(char **_retval) @@ -713 +713 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -727 +727 @@ -NS_IMETHODIMP nsSupportsVoidImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsVoidImpl::GetType(PRUint16 *aType) @@ -732 +732 @@ - return NS_OK; + return; @@ -735 +735 @@ -NS_IMETHODIMP nsSupportsVoidImpl::GetData(void * *aData) +NS_IMETHODIMP_(void) nsSupportsVoidImpl::GetData(void * *aData) @@ -739 +739 @@ - return NS_OK; + return; @@ -742 +742 @@ -NS_IMETHODIMP nsSupportsVoidImpl::SetData(void * aData) +NS_IMETHODIMP_(void) nsSupportsVoidImpl::SetData(void * aData) @@ -745 +745 @@ - return NS_OK; + return; @@ -748 +748 @@ -NS_IMETHODIMP nsSupportsVoidImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsVoidImpl::ToString(char **_retval) @@ -755 +755 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -777 +777 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::GetType(PRUint16 *aType) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::GetType(PRUint16 *aType) @@ -782 +782 @@ - return NS_OK; + return; @@ -785 +785 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::GetData(nsISupports **aData) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::GetData(nsISupports **aData) @@ -792 +792 @@ - return NS_OK; + return; @@ -795 +795 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::SetData(nsISupports * aData) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::SetData(nsISupports * aData) @@ -799 +799 @@ - return NS_OK; + return; @@ -802 +802 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::GetDataIID(nsID **aIID) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::GetDataIID(nsID **aIID) @@ -809 +809 @@ - return *aIID ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*aIID ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -812 +812 @@ - return NS_OK; + return; @@ -815 +815 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::SetDataIID(const nsID *aIID) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::SetDataIID(const nsID *aIID) @@ -824 +824 @@ - return NS_OK; + return; @@ -827 +827 @@ -NS_IMETHODIMP nsSupportsInterfacePointerImpl::ToString(char **_retval) +NS_IMETHODIMP_(void) nsSupportsInterfacePointerImpl::ToString(char **_retval) @@ -837 +837 @@ - return result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(result ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -848 +848 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -854 +854 @@ - return NS_OK; + return; @@ -857 +857 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -861 +861 @@ - return NS_OK; + return; @@ -864 +864 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -871 +871 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -873 +873 @@ - return NS_OK; + return; @@ -876 +876 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -879 +879 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); --- xpcom/ds/nsUnicharBuffer.cpp +++ xpcom/ds/nsUnicharBuffer.cpp @@ -49 +49 @@ -NS_METHOD +NS_METHOD_(void) @@ -53 +53 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -57 +57 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -60 +60,3 @@ - nsresult rv = it->QueryInterface(aIID, aResult); + try { + wrap_nsexception(it->QueryInterface(aIID, aResult)); + } @@ -62 +62 @@ - return rv; + throw nsexception(rv); @@ -65 +65 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -74 +74 @@ - return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -124,2 +124 @@ -NS_COM nsresult -NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult, +NS_COM void NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult, @@ -131,8 +131,12 @@ - rv = UnicharBufferImpl::Create(aOuter, NS_GET_IID(nsIUnicharBuffer), - (void**)&buf); - if (NS_FAILED(rv)) return rv; - rv = buf->Init(aBufferSize); - if (NS_FAILED(rv)) { - NS_RELEASE(buf); - return rv; - } + try { + UnicharBufferImpl::Create(aOuter, NS_GET_IID(nsIUnicharBuffer), + (void**)&buf); + } + catch (nsexception &exc) { throw; } + try { + buf->Init(aBufferSize); + } + catch (nsexception &exc) { + NS_RELEASE(buf); + throw nsexception(rv); + } @@ -140 +140 @@ - return rv; + throw nsexception(rv); --- xpcom/ds/nsUnicharBuffer.h +++ xpcom/ds/nsUnicharBuffer.h @@ -47 +47 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -51 +51 @@ - NS_IMETHOD Init(PRUint32 aBufferSize); + NS_IMETHOD_(void) Init(PRUint32 aBufferSize); --- xpcom/ds/nsVariant.cpp +++ xpcom/ds/nsVariant.cpp @@ -53 +53 @@ -static nsresult String2Double(const char* aString, double* retval) +static void String2Double(const char* aString, double* retval) @@ -58 +58 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -60 +60 @@ - return NS_OK; + return; @@ -63 +63 @@ -static nsresult AString2Double(const nsAString& aString, double* retval) +static void AString2Double(const nsAString& aString, double* retval) @@ -66,3 +66,4 @@ - if(!pChars) - return NS_ERROR_OUT_OF_MEMORY; - nsresult rv = String2Double(pChars, retval); + + try { + String2Double(pChars, retval); + } @@ -70 +70 @@ - return rv; + throw nsexception(rv); @@ -73 +73 @@ -static nsresult AUTF8String2Double(const nsAUTF8String& aString, double* retval) +static void AUTF8String2Double(const nsAUTF8String& aString, double* retval) @@ -75 +75 @@ - return String2Double(PromiseFlatUTF8String(aString).get(), retval); + return /*thower*/ String2Double(PromiseFlatUTF8String(aString).get(), retval); @@ -78 +78 @@ -static nsresult ACString2Double(const nsACString& aString, double* retval) +static void ACString2Double(const nsACString& aString, double* retval) @@ -80 +80 @@ - return String2Double(PromiseFlatCString(aString).get(), retval); + return /*thower*/ String2Double(PromiseFlatCString(aString).get(), retval); @@ -85 +85 @@ -static nsresult ToManageableNumber(const nsDiscriminatedUnion& inData, +static void ToManageableNumber(const nsDiscriminatedUnion& inData, @@ -116 +116 @@ - return NS_OK; + return; @@ -126 +126 @@ - return NS_OK; + return; @@ -130 +130 @@ - return NS_OK; + return; @@ -134 +134 @@ - return NS_OK; + return; @@ -137,3 +137,4 @@ - rv = String2Double(inData.u.str.mStringValue, &outData->u.mDoubleValue); - if(NS_FAILED(rv)) - return rv; + try { + String2Double(inData.u.str.mStringValue, &outData->u.mDoubleValue); + } + catch (nsexception &exc) { throw; } @@ -141 +141 @@ - return NS_OK; + return; @@ -144,3 +144,4 @@ - rv = AString2Double(*inData.u.mAStringValue, &outData->u.mDoubleValue); - if(NS_FAILED(rv)) - return rv; + try { + AString2Double(*inData.u.mAStringValue, &outData->u.mDoubleValue); + } + catch (nsexception &exc) { throw; } @@ -148 +148 @@ - return NS_OK; + return; @@ -150,4 +150,5 @@ - rv = AUTF8String2Double(*inData.u.mUTF8StringValue, - &outData->u.mDoubleValue); - if(NS_FAILED(rv)) - return rv; + try { + AUTF8String2Double(*inData.u.mUTF8StringValue, + &outData->u.mDoubleValue); + } + catch (nsexception &exc) { throw; } @@ -155 +155 @@ - return NS_OK; + return; @@ -157,4 +157,5 @@ - rv = ACString2Double(*inData.u.mCStringValue, - &outData->u.mDoubleValue); - if(NS_FAILED(rv)) - return rv; + try { + ACString2Double(*inData.u.mCStringValue, + &outData->u.mDoubleValue); + } + catch (nsexception &exc) { throw; } @@ -162 +162 @@ - return NS_OK; + return; @@ -165,4 +165,5 @@ - rv = AString2Double(nsDependentString(inData.u.wstr.mWStringValue), - &outData->u.mDoubleValue); - if(NS_FAILED(rv)) - return rv; + try { + AString2Double(nsDependentString(inData.u.wstr.mWStringValue), + &outData->u.mDoubleValue); + } + catch (nsexception &exc) { throw; } @@ -170 +170 @@ - return NS_OK; + return; @@ -182 +182 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -262 +262 @@ -static nsresult CloneArray(PRUint16 inType, const nsIID* inIID, +static void CloneArray(PRUint16 inType, const nsIID* inIID, @@ -346 +346 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -355 +355 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -467 +467 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -472 +472 @@ - return NS_OK; + return; @@ -484 +484 @@ - return rv; + throw nsexception(rv); @@ -652,2 +652 @@ -/* static */ nsresult -nsVariant::ConvertToBool(const nsDiscriminatedUnion& data, PRBool *_retval) +/* static */ void nsVariant::ConvertToBool(const nsDiscriminatedUnion& data, PRBool *_retval) @@ -658,3 +658,4 @@ - nsresult rv = nsVariant::ConvertToDouble(data, &val); - if(NS_FAILED(rv)) - return rv; + try { + nsVariant::ConvertToDouble(data, &val); + } + catch (nsexception &exc) { throw; } @@ -662 +662 @@ - return rv; + throw nsexception(rv); @@ -667,2 +667 @@ -/* static */ nsresult -nsVariant::ConvertToInt64(const nsDiscriminatedUnion& data, PRInt64 *_retval) +/* static */ void nsVariant::ConvertToInt64(const nsDiscriminatedUnion& data, PRInt64 *_retval) @@ -674,4 +674,5 @@ - nsVariant::Initialize(&tempData); - nsresult rv = ToManageableNumber(data, &tempData); - if(NS_FAILED(rv)) - return rv; + IGNORE_NSEXCEPTION(nsVariant::Initialize(&tempData)); + try { + ToManageableNumber(data, &tempData); + } + catch (nsexception &exc) { throw; } @@ -682 +682 @@ - return rv; + throw nsexception(rv); @@ -685 +685 @@ - return rv; + throw nsexception(rv); @@ -689 +689 @@ - return rv; + throw nsexception(rv); @@ -692 +692 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -696,2 +696 @@ -/* static */ nsresult -nsVariant::ConvertToUint64(const nsDiscriminatedUnion& data, PRUint64 *_retval) +/* static */ void nsVariant::ConvertToUint64(const nsDiscriminatedUnion& data, PRUint64 *_retval) @@ -699 +699 @@ - return nsVariant::ConvertToInt64(data, (PRInt64 *)_retval); + return /*thower*/ nsVariant::ConvertToInt64(data, (PRInt64 *)_retval); @@ -740,2 +740 @@ -/* static */ nsresult -nsVariant::ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval) +/* static */ void nsVariant::ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval) @@ -749 +749 @@ - return NS_OK; + return; @@ -752 +752 @@ - return NS_OK; + return; @@ -755 +755 @@ - return NS_OK; + return; @@ -765 +765 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -767 +767 @@ - return NS_OK; + return; @@ -769 +769 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -775 +775 @@ -static nsresult ToString(const nsDiscriminatedUnion& data, +static void ToString(const nsDiscriminatedUnion& data, @@ -801 +801 @@ - return NS_OK; + return; @@ -808 +808 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -814,2 +814 @@ - if(!ptr) - return NS_ERROR_OUT_OF_MEMORY; + @@ -818 +818 @@ - return NS_OK; + return; @@ -860,2 +860 @@ - if(!ptr) - return NS_ERROR_OUT_OF_MEMORY; + @@ -864 +864 @@ - return NS_OK; + return; @@ -867,2 +867 @@ -/* static */ nsresult -nsVariant::ConvertToAString(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToAString(const nsDiscriminatedUnion& data, @@ -876 +876 @@ - return NS_OK; + return; @@ -879 +879 @@ - return NS_OK; + return; @@ -882 +882 @@ - return NS_OK; + return; @@ -885 +885 @@ - return NS_OK; + return; @@ -888 +888 @@ - return NS_OK; + return; @@ -893 +893 @@ - return NS_OK; + return; @@ -896 +896 @@ - return NS_OK; + return; @@ -899 +899 @@ - return NS_OK; + return; @@ -903,3 +903,4 @@ - nsresult rv = ToString(data, tempCString); - if(NS_FAILED(rv)) - return rv; + try { + ToString(data, tempCString); + } + catch (nsexception &exc) { throw; } @@ -907 +907 @@ - return NS_OK; + return; @@ -912,2 +912 @@ -/* static */ nsresult -nsVariant::ConvertToACString(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToACString(const nsDiscriminatedUnion& data, @@ -921 +921 @@ - return NS_OK; + return; @@ -924 +924 @@ - return NS_OK; + return; @@ -931 +931 @@ - return NS_OK; + return; @@ -934 +934 @@ - return NS_OK; + return; @@ -938 +938 @@ - return NS_OK; + return; @@ -941 +941 @@ - return NS_OK; + return; @@ -945 +945 @@ - return NS_OK; + return; @@ -950 +950 @@ - return NS_OK; + return; @@ -953 +953 @@ - return ToString(data, _retval); + return /*thower*/ ToString(data, _retval); @@ -957,2 +957 @@ -/* static */ nsresult -nsVariant::ConvertToAUTF8String(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToAUTF8String(const nsDiscriminatedUnion& data, @@ -966 +966 @@ - return NS_OK; + return; @@ -972 +972 @@ - return NS_OK; + return; @@ -975 +975 @@ - return NS_OK; + return; @@ -981 +981 @@ - return NS_OK; + return; @@ -984 +984 @@ - return NS_OK; + return; @@ -991 +991 @@ - return NS_OK; + return; @@ -996 +996 @@ - return NS_OK; + return; @@ -1001 +1001 @@ - return NS_OK; + return; @@ -1006,3 +1006,4 @@ - nsresult rv = ToString(data, tempCString); - if(NS_FAILED(rv)) - return rv; + try { + ToString(data, tempCString); + } + catch (nsexception &exc) { throw; } @@ -1012 +1012 @@ - return NS_OK; + return; @@ -1017,2 +1017 @@ -/* static */ nsresult -nsVariant::ConvertToString(const nsDiscriminatedUnion& data, char **_retval) +/* static */ void nsVariant::ConvertToString(const nsDiscriminatedUnion& data, char **_retval) @@ -1021 +1021 @@ - return nsVariant::ConvertToStringWithSize(data, &ignored, _retval); + return /*thower*/ nsVariant::ConvertToStringWithSize(data, &ignored, _retval); @@ -1024,2 +1024 @@ -/* static */ nsresult -nsVariant::ConvertToWString(const nsDiscriminatedUnion& data, PRUnichar **_retval) +/* static */ void nsVariant::ConvertToWString(const nsDiscriminatedUnion& data, PRUnichar **_retval) @@ -1028 +1028 @@ - return nsVariant::ConvertToWStringWithSize(data, &ignored, _retval); + return /*thower*/ nsVariant::ConvertToWStringWithSize(data, &ignored, _retval); @@ -1031,2 +1031 @@ -/* static */ nsresult -nsVariant::ConvertToStringWithSize(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToStringWithSize(const nsDiscriminatedUnion& data, @@ -1099,3 +1099,4 @@ - rv = ToString(data, tempCString); - if(NS_FAILED(rv)) - return rv; + try { + ToString(data, tempCString); + } + catch (nsexception &exc) { throw; } @@ -1107 +1107 @@ - return *str ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*str ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -1109,2 +1109 @@ -/* static */ nsresult -nsVariant::ConvertToWStringWithSize(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToWStringWithSize(const nsDiscriminatedUnion& data, @@ -1169,3 +1169,4 @@ - rv = ToString(data, tempCString); - if(NS_FAILED(rv)) - return rv; + try { + ToString(data, tempCString); + } + catch (nsexception &exc) { throw; } @@ -1177 +1177 @@ - return *str ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*str ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -1180,2 +1180 @@ -/* static */ nsresult -nsVariant::ConvertToISupports(const nsDiscriminatedUnion& data, +/* static */ void nsVariant::ConvertToISupports(const nsDiscriminatedUnion& data, @@ -1189 +1189 @@ - return data.u.iface.mInterfaceValue-> + return /*thower*/ data.u.iface.mInterfaceValue-> @@ -1193 +1193 @@ - return NS_OK; + return; @@ -1196 +1196 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -1200,2 +1200 @@ -/* static */ nsresult -nsVariant::ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid, +/* static */ void nsVariant::ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid, @@ -1215 +1215 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -1220 +1220 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1223 +1223 @@ - return data.u.iface.mInterfaceValue->QueryInterface(*piid, iface); + return /*thower*/ data.u.iface.mInterfaceValue->QueryInterface(*piid, iface); @@ -1227 +1227 @@ - return NS_OK; + return; @@ -1230,2 +1230 @@ -/* static */ nsresult -nsVariant::ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type, +/* static */ void nsVariant::ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type, @@ -1239 +1239 @@ - return CloneArray(data.u.array.mArrayType, &data.u.array.mArrayInterfaceID, + return /*thower*/ CloneArray(data.u.array.mArrayType, &data.u.array.mArrayInterfaceID, @@ -1242 +1242 @@ - return NS_ERROR_CANNOT_CONVERT_DATA; + throw nsexception(NS_ERROR_CANNOT_CONVERT_DATA); @@ -1298,2 +1298 @@ -/* static */ nsresult -nsVariant::SetFromVariant(nsDiscriminatedUnion* data, nsIVariant* aValue) +/* static */ void nsVariant::SetFromVariant(nsDiscriminatedUnion* data, nsIVariant* aValue) @@ -1304 +1304 @@ - nsVariant::Cleanup(data); + IGNORE_NSEXCEPTION(nsVariant::Cleanup(data)); @@ -1306,3 +1306,4 @@ - rv = aValue->GetDataType(&type); - if(NS_FAILED(rv)) - return rv; + try { + aValue->GetDataType(&type); + } + catch (nsexception &exc) { throw; } @@ -1332,5 +1332,5 @@ - if(!data->u.mAStringValue) - return NS_ERROR_OUT_OF_MEMORY; - rv = aValue->GetAsAString(*data->u.mAStringValue); - if(NS_FAILED(rv)) - delete data->u.mAStringValue; + + try { + aValue->GetAsAString(*data->u.mAStringValue); + } + catch (nsexception &exc) delete data->u.mAStringValue; @@ -1342,5 +1342,5 @@ - if(!data->u.mCStringValue) - return NS_ERROR_OUT_OF_MEMORY; - rv = aValue->GetAsACString(*data->u.mCStringValue); - if(NS_FAILED(rv)) - delete data->u.mCStringValue; + + try { + aValue->GetAsACString(*data->u.mCStringValue); + } + catch (nsexception &exc) delete data->u.mCStringValue; @@ -1352,5 +1352,5 @@ - if(!data->u.mUTF8StringValue) - return NS_ERROR_OUT_OF_MEMORY; - rv = aValue->GetAsAUTF8String(*data->u.mUTF8StringValue); - if(NS_FAILED(rv)) - delete data->u.mUTF8StringValue; + + try { + aValue->GetAsAUTF8String(*data->u.mUTF8StringValue); + } + catch (nsexception &exc) delete data->u.mUTF8StringValue; @@ -1362,2 +1362,4 @@ - rv = aValue->GetAsStringWithSize(&data->u.str.mStringLength, - &data->u.str.mStringValue); + try { + aValue->GetAsStringWithSize(&data->u.str.mStringLength, + &data->u.str.mStringValue); + } @@ -1371 +1371,3 @@ - rv = aValue->GetAsInterface(&iid, (void**)&data->u.iface.mInterfaceValue); + try { + aValue->GetAsInterface(&iid, (void**)&data->u.iface.mInterfaceValue); + } @@ -1381,4 +1381,6 @@ - rv = aValue->GetAsArray(&data->u.array.mArrayType, - &data->u.array.mArrayInterfaceID, - &data->u.array.mArrayCount, - &data->u.array.mArrayValue); + try { + aValue->GetAsArray(&data->u.array.mArrayType, + &data->u.array.mArrayInterfaceID, + &data->u.array.mArrayCount, + &data->u.array.mArrayValue); + } @@ -1388 +1388,3 @@ - rv = nsVariant::SetToVoid(data); + try { + nsVariant::SetToVoid(data); + } @@ -1391 +1391,3 @@ - rv = nsVariant::SetToEmptyArray(data); + try { + nsVariant::SetToEmptyArray(data); + } @@ -1394 +1394,3 @@ - rv = nsVariant::SetToEmpty(data); + try { + nsVariant::SetToEmpty(data); + } @@ -1401 +1401 @@ - return rv; + throw nsexception(rv); @@ -1404,2 +1404 @@ -/* static */ nsresult -nsVariant::SetFromInt8(nsDiscriminatedUnion* data, PRUint8 aValue) +/* static */ void nsVariant::SetFromInt8(nsDiscriminatedUnion* data, PRUint8 aValue) @@ -1409,2 +1409 @@ -/* static */ nsresult -nsVariant::SetFromInt16(nsDiscriminatedUnion* data, PRInt16 aValue) +/* static */ void nsVariant::SetFromInt16(nsDiscriminatedUnion* data, PRInt16 aValue) @@ -1414,2 +1414 @@ -/* static */ nsresult -nsVariant::SetFromInt32(nsDiscriminatedUnion* data, PRInt32 aValue) +/* static */ void nsVariant::SetFromInt32(nsDiscriminatedUnion* data, PRInt32 aValue) @@ -1419,2 +1419 @@ -/* static */ nsresult -nsVariant::SetFromInt64(nsDiscriminatedUnion* data, PRInt64 aValue) +/* static */ void nsVariant::SetFromInt64(nsDiscriminatedUnion* data, PRInt64 aValue) @@ -1424,2 +1424 @@ -/* static */ nsresult -nsVariant::SetFromUint8(nsDiscriminatedUnion* data, PRUint8 aValue) +/* static */ void nsVariant::SetFromUint8(nsDiscriminatedUnion* data, PRUint8 aValue) @@ -1429,2 +1429 @@ -/* static */ nsresult -nsVariant::SetFromUint16(nsDiscriminatedUnion* data, PRUint16 aValue) +/* static */ void nsVariant::SetFromUint16(nsDiscriminatedUnion* data, PRUint16 aValue) @@ -1434,2 +1434 @@ -/* static */ nsresult -nsVariant::SetFromUint32(nsDiscriminatedUnion* data, PRUint32 aValue) +/* static */ void nsVariant::SetFromUint32(nsDiscriminatedUnion* data, PRUint32 aValue) @@ -1439,2 +1439 @@ -/* static */ nsresult -nsVariant::SetFromUint64(nsDiscriminatedUnion* data, PRUint64 aValue) +/* static */ void nsVariant::SetFromUint64(nsDiscriminatedUnion* data, PRUint64 aValue) @@ -1444,2 +1444 @@ -/* static */ nsresult -nsVariant::SetFromFloat(nsDiscriminatedUnion* data, float aValue) +/* static */ void nsVariant::SetFromFloat(nsDiscriminatedUnion* data, float aValue) @@ -1449,2 +1449 @@ -/* static */ nsresult -nsVariant::SetFromDouble(nsDiscriminatedUnion* data, double aValue) +/* static */ void nsVariant::SetFromDouble(nsDiscriminatedUnion* data, double aValue) @@ -1454,2 +1454 @@ -/* static */ nsresult -nsVariant::SetFromBool(nsDiscriminatedUnion* data, PRBool aValue) +/* static */ void nsVariant::SetFromBool(nsDiscriminatedUnion* data, PRBool aValue) @@ -1459,2 +1459 @@ -/* static */ nsresult -nsVariant::SetFromChar(nsDiscriminatedUnion* data, char aValue) +/* static */ void nsVariant::SetFromChar(nsDiscriminatedUnion* data, char aValue) @@ -1464,2 +1464 @@ -/* static */ nsresult -nsVariant::SetFromWChar(nsDiscriminatedUnion* data, PRUnichar aValue) +/* static */ void nsVariant::SetFromWChar(nsDiscriminatedUnion* data, PRUnichar aValue) @@ -1469,2 +1469 @@ -/* static */ nsresult -nsVariant::SetFromID(nsDiscriminatedUnion* data, const nsID & aValue) +/* static */ void nsVariant::SetFromID(nsDiscriminatedUnion* data, const nsID & aValue) @@ -1474,2 +1474 @@ -/* static */ nsresult -nsVariant::SetFromAString(nsDiscriminatedUnion* data, const nsAString & aValue) +/* static */ void nsVariant::SetFromAString(nsDiscriminatedUnion* data, const nsAString & aValue) @@ -1479 +1479 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1483,2 +1483 @@ -/* static */ nsresult -nsVariant::SetFromACString(nsDiscriminatedUnion* data, +/* static */ void nsVariant::SetFromACString(nsDiscriminatedUnion* data, @@ -1489 +1489 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1493,2 +1493 @@ -/* static */ nsresult -nsVariant::SetFromAUTF8String(nsDiscriminatedUnion* data, +/* static */ void nsVariant::SetFromAUTF8String(nsDiscriminatedUnion* data, @@ -1499 +1499 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1503,2 +1503 @@ -/* static */ nsresult -nsVariant::SetFromString(nsDiscriminatedUnion* data, const char *aValue) +/* static */ void nsVariant::SetFromString(nsDiscriminatedUnion* data, const char *aValue) @@ -1508,2 +1508,2 @@ - return NS_ERROR_NULL_POINTER; - return SetFromStringWithSize(data, strlen(aValue), aValue); + throw nsexception(NS_ERROR_NULL_POINTER); + return /*thower*/ SetFromStringWithSize(data, strlen(aValue), aValue); @@ -1511,2 +1511 @@ -/* static */ nsresult -nsVariant::SetFromWString(nsDiscriminatedUnion* data, const PRUnichar *aValue) +/* static */ void nsVariant::SetFromWString(nsDiscriminatedUnion* data, const PRUnichar *aValue) @@ -1516,2 +1516,2 @@ - return NS_ERROR_NULL_POINTER; - return SetFromWStringWithSize(data, nsCRT::strlen(aValue), aValue); + throw nsexception(NS_ERROR_NULL_POINTER); + return /*thower*/ SetFromWStringWithSize(data, nsCRT::strlen(aValue), aValue); @@ -1519,2 +1519 @@ -/* static */ nsresult -nsVariant::SetFromISupports(nsDiscriminatedUnion* data, nsISupports *aValue) +/* static */ void nsVariant::SetFromISupports(nsDiscriminatedUnion* data, nsISupports *aValue) @@ -1522 +1522 @@ - return SetFromInterface(data, NS_GET_IID(nsISupports), aValue); + return /*thower*/ SetFromInterface(data, NS_GET_IID(nsISupports), aValue); @@ -1524,2 +1524 @@ -/* static */ nsresult -nsVariant::SetFromInterface(nsDiscriminatedUnion* data, const nsIID& iid, +/* static */ void nsVariant::SetFromInterface(nsDiscriminatedUnion* data, const nsIID& iid, @@ -1534,2 +1534 @@ -/* static */ nsresult -nsVariant::SetFromArray(nsDiscriminatedUnion* data, PRUint16 type, +/* static */ void nsVariant::SetFromArray(nsDiscriminatedUnion* data, PRUint16 type, @@ -1540 +1540 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1542,7 +1542,8 @@ - nsresult rv = CloneArray(type, iid, count, aValue, - &data->u.array.mArrayType, - &data->u.array.mArrayInterfaceID, - &data->u.array.mArrayCount, - &data->u.array.mArrayValue); - if(NS_FAILED(rv)) - return rv; + try { + CloneArray(type, iid, count, aValue, + &data->u.array.mArrayType, + &data->u.array.mArrayInterfaceID, + &data->u.array.mArrayCount, + &data->u.array.mArrayValue); + } + catch (nsexception &exc) { throw; } @@ -1551,2 +1551 @@ -/* static */ nsresult -nsVariant::SetFromStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const char *aValue) +/* static */ void nsVariant::SetFromStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const char *aValue) @@ -1556 +1556 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1559 +1559 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1563,2 +1563 @@ -/* static */ nsresult -nsVariant::SetFromWStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const PRUnichar *aValue) +/* static */ void nsVariant::SetFromWStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const PRUnichar *aValue) @@ -1568 +1568 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -1571 +1571 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1575,2 +1575 @@ -/* static */ nsresult -nsVariant::SetToVoid(nsDiscriminatedUnion* data) +/* static */ void nsVariant::SetToVoid(nsDiscriminatedUnion* data) @@ -1581,2 +1581 @@ -/* static */ nsresult -nsVariant::SetToEmpty(nsDiscriminatedUnion* data) +/* static */ void nsVariant::SetToEmpty(nsDiscriminatedUnion* data) @@ -1587,2 +1587 @@ -/* static */ nsresult -nsVariant::SetToEmptyArray(nsDiscriminatedUnion* data) +/* static */ void nsVariant::SetToEmptyArray(nsDiscriminatedUnion* data) @@ -1596,2 +1596 @@ -/* static */ nsresult -nsVariant::Initialize(nsDiscriminatedUnion* data) +/* static */ void nsVariant::Initialize(nsDiscriminatedUnion* data) @@ -1600 +1600 @@ - return NS_OK; + return; @@ -1603,2 +1603 @@ -/* static */ nsresult -nsVariant::Cleanup(nsDiscriminatedUnion* data) +/* static */ void nsVariant::Cleanup(nsDiscriminatedUnion* data) @@ -1658 +1658 @@ - return NS_OK; + return; @@ -1697 +1697 @@ - nsVariant::Initialize(&mData); + IGNORE_NSEXCEPTION(nsVariant::Initialize(&mData)); @@ -1746 +1746 @@ - nsVariant::Cleanup(&mData); + IGNORE_NSEXCEPTION(nsVariant::Cleanup(&mData)); @@ -1753 +1753 @@ -NS_IMETHODIMP nsVariant::GetDataType(PRUint16 *aDataType) +NS_IMETHODIMP_(void) nsVariant::GetDataType(PRUint16 *aDataType) @@ -1756 +1756 @@ - return NS_OK; + return; @@ -1760 +1760 @@ -NS_IMETHODIMP nsVariant::GetAsInt8(PRUint8 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsInt8(PRUint8 *_retval) @@ -1762 +1762 @@ - return nsVariant::ConvertToInt8(mData, _retval); + return /*thower*/ nsVariant::ConvertToInt8(mData, _retval); @@ -1766 +1766 @@ -NS_IMETHODIMP nsVariant::GetAsInt16(PRInt16 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsInt16(PRInt16 *_retval) @@ -1768 +1768 @@ - return nsVariant::ConvertToInt16(mData, _retval); + return /*thower*/ nsVariant::ConvertToInt16(mData, _retval); @@ -1772 +1772 @@ -NS_IMETHODIMP nsVariant::GetAsInt32(PRInt32 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsInt32(PRInt32 *_retval) @@ -1774 +1774 @@ - return nsVariant::ConvertToInt32(mData, _retval); + return /*thower*/ nsVariant::ConvertToInt32(mData, _retval); @@ -1778 +1778 @@ -NS_IMETHODIMP nsVariant::GetAsInt64(PRInt64 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsInt64(PRInt64 *_retval) @@ -1780 +1780 @@ - return nsVariant::ConvertToInt64(mData, _retval); + return /*thower*/ nsVariant::ConvertToInt64(mData, _retval); @@ -1784 +1784 @@ -NS_IMETHODIMP nsVariant::GetAsUint8(PRUint8 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsUint8(PRUint8 *_retval) @@ -1786 +1786 @@ - return nsVariant::ConvertToUint8(mData, _retval); + return /*thower*/ nsVariant::ConvertToUint8(mData, _retval); @@ -1790 +1790 @@ -NS_IMETHODIMP nsVariant::GetAsUint16(PRUint16 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsUint16(PRUint16 *_retval) @@ -1792 +1792 @@ - return nsVariant::ConvertToUint16(mData, _retval); + return /*thower*/ nsVariant::ConvertToUint16(mData, _retval); @@ -1796 +1796 @@ -NS_IMETHODIMP nsVariant::GetAsUint32(PRUint32 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsUint32(PRUint32 *_retval) @@ -1798 +1798 @@ - return nsVariant::ConvertToUint32(mData, _retval); + return /*thower*/ nsVariant::ConvertToUint32(mData, _retval); @@ -1802 +1802 @@ -NS_IMETHODIMP nsVariant::GetAsUint64(PRUint64 *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsUint64(PRUint64 *_retval) @@ -1804 +1804 @@ - return nsVariant::ConvertToUint64(mData, _retval); + return /*thower*/ nsVariant::ConvertToUint64(mData, _retval); @@ -1808 +1808 @@ -NS_IMETHODIMP nsVariant::GetAsFloat(float *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsFloat(float *_retval) @@ -1810 +1810 @@ - return nsVariant::ConvertToFloat(mData, _retval); + return /*thower*/ nsVariant::ConvertToFloat(mData, _retval); @@ -1814 +1814 @@ -NS_IMETHODIMP nsVariant::GetAsDouble(double *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsDouble(double *_retval) @@ -1816 +1816 @@ - return nsVariant::ConvertToDouble(mData, _retval); + return /*thower*/ nsVariant::ConvertToDouble(mData, _retval); @@ -1820 +1820 @@ -NS_IMETHODIMP nsVariant::GetAsBool(PRBool *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsBool(PRBool *_retval) @@ -1822 +1822 @@ - return nsVariant::ConvertToBool(mData, _retval); + return /*thower*/ nsVariant::ConvertToBool(mData, _retval); @@ -1826 +1826 @@ -NS_IMETHODIMP nsVariant::GetAsChar(char *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsChar(char *_retval) @@ -1828 +1828 @@ - return nsVariant::ConvertToChar(mData, _retval); + return /*thower*/ nsVariant::ConvertToChar(mData, _retval); @@ -1832 +1832 @@ -NS_IMETHODIMP nsVariant::GetAsWChar(PRUnichar *_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsWChar(PRUnichar *_retval) @@ -1834 +1834 @@ - return nsVariant::ConvertToWChar(mData, _retval); + return /*thower*/ nsVariant::ConvertToWChar(mData, _retval); @@ -1838 +1838 @@ -NS_IMETHODIMP_(nsresult) nsVariant::GetAsID(nsID *retval) +NS_IMETHODIMP_(void) nsVariant::GetAsID(nsID *retval) @@ -1840 +1840 @@ - return nsVariant::ConvertToID(mData, retval); + return /*thower*/ nsVariant::ConvertToID(mData, retval); @@ -1844 +1844 @@ -NS_IMETHODIMP nsVariant::GetAsAString(nsAString & _retval) +NS_IMETHODIMP_(void) nsVariant::GetAsAString(nsAString & _retval) @@ -1846 +1846 @@ - return nsVariant::ConvertToAString(mData, _retval); + return /*thower*/ nsVariant::ConvertToAString(mData, _retval); @@ -1850 +1850 @@ -NS_IMETHODIMP nsVariant::GetAsDOMString(nsAString & _retval) +NS_IMETHODIMP_(void) nsVariant::GetAsDOMString(nsAString & _retval) @@ -1854 +1854 @@ - return nsVariant::ConvertToAString(mData, _retval); + return /*thower*/ nsVariant::ConvertToAString(mData, _retval); @@ -1858 +1858 @@ -NS_IMETHODIMP nsVariant::GetAsACString(nsACString & _retval) +NS_IMETHODIMP_(void) nsVariant::GetAsACString(nsACString & _retval) @@ -1860 +1860 @@ - return nsVariant::ConvertToACString(mData, _retval); + return /*thower*/ nsVariant::ConvertToACString(mData, _retval); @@ -1864 +1864 @@ -NS_IMETHODIMP nsVariant::GetAsAUTF8String(nsAUTF8String & _retval) +NS_IMETHODIMP_(void) nsVariant::GetAsAUTF8String(nsAUTF8String & _retval) @@ -1866 +1866 @@ - return nsVariant::ConvertToAUTF8String(mData, _retval); + return /*thower*/ nsVariant::ConvertToAUTF8String(mData, _retval); @@ -1870 +1870 @@ -NS_IMETHODIMP nsVariant::GetAsString(char **_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsString(char **_retval) @@ -1872 +1872 @@ - return nsVariant::ConvertToString(mData, _retval); + return /*thower*/ nsVariant::ConvertToString(mData, _retval); @@ -1876 +1876 @@ -NS_IMETHODIMP nsVariant::GetAsWString(PRUnichar **_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsWString(PRUnichar **_retval) @@ -1878 +1878 @@ - return nsVariant::ConvertToWString(mData, _retval); + return /*thower*/ nsVariant::ConvertToWString(mData, _retval); @@ -1882 +1882 @@ -NS_IMETHODIMP nsVariant::GetAsISupports(nsISupports **_retval) +NS_IMETHODIMP_(void) nsVariant::GetAsISupports(nsISupports **_retval) @@ -1884 +1884 @@ - return nsVariant::ConvertToISupports(mData, _retval); + return /*thower*/ nsVariant::ConvertToISupports(mData, _retval); @@ -1888 +1888 @@ -NS_IMETHODIMP nsVariant::GetAsInterface(nsIID * *iid, void * *iface) +NS_IMETHODIMP_(void) nsVariant::GetAsInterface(nsIID * *iid, void * *iface) @@ -1890 +1890 @@ - return nsVariant::ConvertToInterface(mData, iid, iface); + return /*thower*/ nsVariant::ConvertToInterface(mData, iid, iface); @@ -1894 +1894 @@ -NS_IMETHODIMP_(nsresult) nsVariant::GetAsArray(PRUint16 *type, nsIID *iid, PRUint32 *count, void * *ptr) +NS_IMETHODIMP_(void) nsVariant::GetAsArray(PRUint16 *type, nsIID *iid, PRUint32 *count, void * *ptr) @@ -1896 +1896 @@ - return nsVariant::ConvertToArray(mData, type, iid, count, ptr); + return /*thower*/ nsVariant::ConvertToArray(mData, type, iid, count, ptr); @@ -1900 +1900 @@ -NS_IMETHODIMP nsVariant::GetAsStringWithSize(PRUint32 *size, char **str) +NS_IMETHODIMP_(void) nsVariant::GetAsStringWithSize(PRUint32 *size, char **str) @@ -1902 +1902 @@ - return nsVariant::ConvertToStringWithSize(mData, size, str); + return /*thower*/ nsVariant::ConvertToStringWithSize(mData, size, str); @@ -1906 +1906 @@ -NS_IMETHODIMP nsVariant::GetAsWStringWithSize(PRUint32 *size, PRUnichar **str) +NS_IMETHODIMP_(void) nsVariant::GetAsWStringWithSize(PRUint32 *size, PRUnichar **str) @@ -1908 +1908 @@ - return nsVariant::ConvertToWStringWithSize(mData, size, str); + return /*thower*/ nsVariant::ConvertToWStringWithSize(mData, size, str); @@ -1914 +1914 @@ -NS_IMETHODIMP nsVariant::GetWritable(PRBool *aWritable) +NS_IMETHODIMP_(void) nsVariant::GetWritable(PRBool *aWritable) @@ -1917 +1917 @@ - return NS_OK; + return; @@ -1919 +1919 @@ -NS_IMETHODIMP nsVariant::SetWritable(PRBool aWritable) +NS_IMETHODIMP_(void) nsVariant::SetWritable(PRBool aWritable) @@ -1922 +1922 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1924 +1924 @@ - return NS_OK; + return; @@ -1933 +1933 @@ -NS_IMETHODIMP nsVariant::SetAsInt8(PRUint8 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsInt8(PRUint8 aValue) @@ -1935,2 +1935,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromInt8(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromInt8(&mData, aValue); @@ -1940 +1940 @@ -NS_IMETHODIMP nsVariant::SetAsInt16(PRInt16 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsInt16(PRInt16 aValue) @@ -1942,2 +1942,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromInt16(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromInt16(&mData, aValue); @@ -1947 +1947 @@ -NS_IMETHODIMP nsVariant::SetAsInt32(PRInt32 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsInt32(PRInt32 aValue) @@ -1949,2 +1949,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromInt32(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromInt32(&mData, aValue); @@ -1954 +1954 @@ -NS_IMETHODIMP nsVariant::SetAsInt64(PRInt64 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsInt64(PRInt64 aValue) @@ -1956,2 +1956,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromInt64(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromInt64(&mData, aValue); @@ -1961 +1961 @@ -NS_IMETHODIMP nsVariant::SetAsUint8(PRUint8 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsUint8(PRUint8 aValue) @@ -1963,2 +1963,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromUint8(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromUint8(&mData, aValue); @@ -1968 +1968 @@ -NS_IMETHODIMP nsVariant::SetAsUint16(PRUint16 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsUint16(PRUint16 aValue) @@ -1970,2 +1970,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromUint16(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromUint16(&mData, aValue); @@ -1975 +1975 @@ -NS_IMETHODIMP nsVariant::SetAsUint32(PRUint32 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsUint32(PRUint32 aValue) @@ -1977,2 +1977,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromUint32(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromUint32(&mData, aValue); @@ -1982 +1982 @@ -NS_IMETHODIMP nsVariant::SetAsUint64(PRUint64 aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsUint64(PRUint64 aValue) @@ -1984,2 +1984,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromUint64(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromUint64(&mData, aValue); @@ -1989 +1989 @@ -NS_IMETHODIMP nsVariant::SetAsFloat(float aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsFloat(float aValue) @@ -1991,2 +1991,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromFloat(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromFloat(&mData, aValue); @@ -1996 +1996 @@ -NS_IMETHODIMP nsVariant::SetAsDouble(double aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsDouble(double aValue) @@ -1998,2 +1998,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromDouble(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromDouble(&mData, aValue); @@ -2003 +2003 @@ -NS_IMETHODIMP nsVariant::SetAsBool(PRBool aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsBool(PRBool aValue) @@ -2005,2 +2005,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromBool(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromBool(&mData, aValue); @@ -2010 +2010 @@ -NS_IMETHODIMP nsVariant::SetAsChar(char aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsChar(char aValue) @@ -2012,2 +2012,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromChar(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromChar(&mData, aValue); @@ -2017 +2017 @@ -NS_IMETHODIMP nsVariant::SetAsWChar(PRUnichar aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsWChar(PRUnichar aValue) @@ -2019,2 +2019,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromWChar(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromWChar(&mData, aValue); @@ -2024 +2024 @@ -NS_IMETHODIMP nsVariant::SetAsID(const nsID & aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsID(const nsID & aValue) @@ -2026,2 +2026,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromID(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromID(&mData, aValue); @@ -2031 +2031 @@ -NS_IMETHODIMP nsVariant::SetAsAString(const nsAString & aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsAString(const nsAString & aValue) @@ -2033,2 +2033,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromAString(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromAString(&mData, aValue); @@ -2038 +2038 @@ -NS_IMETHODIMP nsVariant::SetAsDOMString(const nsAString & aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsDOMString(const nsAString & aValue) @@ -2040 +2040 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); @@ -2044 +2044 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2049 +2049 @@ -NS_IMETHODIMP nsVariant::SetAsACString(const nsACString & aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsACString(const nsACString & aValue) @@ -2051,2 +2051,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromACString(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromACString(&mData, aValue); @@ -2056 +2056 @@ -NS_IMETHODIMP nsVariant::SetAsAUTF8String(const nsAUTF8String & aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsAUTF8String(const nsAUTF8String & aValue) @@ -2058,2 +2058,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromAUTF8String(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromAUTF8String(&mData, aValue); @@ -2063 +2063 @@ -NS_IMETHODIMP nsVariant::SetAsString(const char *aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsString(const char *aValue) @@ -2065,2 +2065,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromString(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromString(&mData, aValue); @@ -2070 +2070 @@ -NS_IMETHODIMP nsVariant::SetAsWString(const PRUnichar *aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsWString(const PRUnichar *aValue) @@ -2072,2 +2072,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromWString(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromWString(&mData, aValue); @@ -2077 +2077 @@ -NS_IMETHODIMP nsVariant::SetAsISupports(nsISupports *aValue) +NS_IMETHODIMP_(void) nsVariant::SetAsISupports(nsISupports *aValue) @@ -2079,2 +2079,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromISupports(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromISupports(&mData, aValue); @@ -2084 +2084 @@ -NS_IMETHODIMP nsVariant::SetAsInterface(const nsIID & iid, void * iface) +NS_IMETHODIMP_(void) nsVariant::SetAsInterface(const nsIID & iid, void * iface) @@ -2086,2 +2086,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromInterface(&mData, iid, (nsISupports*)iface); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromInterface(&mData, iid, (nsISupports*)iface); @@ -2091 +2091 @@ -NS_IMETHODIMP nsVariant::SetAsArray(PRUint16 type, const nsIID * iid, PRUint32 count, void * ptr) +NS_IMETHODIMP_(void) nsVariant::SetAsArray(PRUint16 type, const nsIID * iid, PRUint32 count, void * ptr) @@ -2093,2 +2093,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromArray(&mData, type, iid, count, ptr); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromArray(&mData, type, iid, count, ptr); @@ -2098 +2098 @@ -NS_IMETHODIMP nsVariant::SetAsStringWithSize(PRUint32 size, const char *str) +NS_IMETHODIMP_(void) nsVariant::SetAsStringWithSize(PRUint32 size, const char *str) @@ -2100,2 +2100,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromStringWithSize(&mData, size, str); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromStringWithSize(&mData, size, str); @@ -2105 +2105 @@ -NS_IMETHODIMP nsVariant::SetAsWStringWithSize(PRUint32 size, const PRUnichar *str) +NS_IMETHODIMP_(void) nsVariant::SetAsWStringWithSize(PRUint32 size, const PRUnichar *str) @@ -2107,2 +2107,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromWStringWithSize(&mData, size, str); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromWStringWithSize(&mData, size, str); @@ -2112 +2112 @@ -NS_IMETHODIMP nsVariant::SetAsVoid() +NS_IMETHODIMP_(void) nsVariant::SetAsVoid() @@ -2114,2 +2114,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetToVoid(&mData); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetToVoid(&mData); @@ -2119 +2119 @@ -NS_IMETHODIMP nsVariant::SetAsEmpty() +NS_IMETHODIMP_(void) nsVariant::SetAsEmpty() @@ -2121,2 +2121,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetToEmpty(&mData); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetToEmpty(&mData); @@ -2126 +2126 @@ -NS_IMETHODIMP nsVariant::SetAsEmptyArray() +NS_IMETHODIMP_(void) nsVariant::SetAsEmptyArray() @@ -2128,2 +2128,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetToEmptyArray(&mData); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetToEmptyArray(&mData); @@ -2133 +2133 @@ -NS_IMETHODIMP nsVariant::SetFromVariant(nsIVariant *aValue) +NS_IMETHODIMP_(void) nsVariant::SetFromVariant(nsIVariant *aValue) @@ -2135,2 +2135,2 @@ - if(!mWritable) return NS_ERROR_OBJECT_IS_IMMUTABLE; - return nsVariant::SetFromVariant(&mData, aValue); + if(!mWritable) throw nsexception(NS_ERROR_OBJECT_IS_IMMUTABLE); + return /*thower*/ nsVariant::SetFromVariant(&mData, aValue); --- xpcom/ds/nsVariant.h +++ xpcom/ds/nsVariant.h @@ -125,2 +125,2 @@ - static nsresult Initialize(nsDiscriminatedUnion* data); - static nsresult Cleanup(nsDiscriminatedUnion* data); + static void Initialize(nsDiscriminatedUnion* data); + static void Cleanup(nsDiscriminatedUnion* data); @@ -128,24 +128,24 @@ - static nsresult ConvertToInt8(const nsDiscriminatedUnion& data, PRUint8 *_retval); - static nsresult ConvertToInt16(const nsDiscriminatedUnion& data, PRInt16 *_retval); - static nsresult ConvertToInt32(const nsDiscriminatedUnion& data, PRInt32 *_retval); - static nsresult ConvertToInt64(const nsDiscriminatedUnion& data, PRInt64 *_retval); - static nsresult ConvertToUint8(const nsDiscriminatedUnion& data, PRUint8 *_retval); - static nsresult ConvertToUint16(const nsDiscriminatedUnion& data, PRUint16 *_retval); - static nsresult ConvertToUint32(const nsDiscriminatedUnion& data, PRUint32 *_retval); - static nsresult ConvertToUint64(const nsDiscriminatedUnion& data, PRUint64 *_retval); - static nsresult ConvertToFloat(const nsDiscriminatedUnion& data, float *_retval); - static nsresult ConvertToDouble(const nsDiscriminatedUnion& data, double *_retval); - static nsresult ConvertToBool(const nsDiscriminatedUnion& data, PRBool *_retval); - static nsresult ConvertToChar(const nsDiscriminatedUnion& data, char *_retval); - static nsresult ConvertToWChar(const nsDiscriminatedUnion& data, PRUnichar *_retval); - static nsresult ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval); - static nsresult ConvertToAString(const nsDiscriminatedUnion& data, nsAString & _retval); - static nsresult ConvertToAUTF8String(const nsDiscriminatedUnion& data, nsAUTF8String & _retval); - static nsresult ConvertToACString(const nsDiscriminatedUnion& data, nsACString & _retval); - static nsresult ConvertToString(const nsDiscriminatedUnion& data, char **_retval); - static nsresult ConvertToWString(const nsDiscriminatedUnion& data, PRUnichar **_retval); - static nsresult ConvertToISupports(const nsDiscriminatedUnion& data, nsISupports **_retval); - static nsresult ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid, void * *iface); - static nsresult ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type, nsIID* iid, PRUint32 *count, void * *ptr); - static nsresult ConvertToStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, char **str); - static nsresult ConvertToWStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, PRUnichar **str); + static void ConvertToInt8(const nsDiscriminatedUnion& data, PRUint8 *_retval); + static void ConvertToInt16(const nsDiscriminatedUnion& data, PRInt16 *_retval); + static void ConvertToInt32(const nsDiscriminatedUnion& data, PRInt32 *_retval); + static void ConvertToInt64(const nsDiscriminatedUnion& data, PRInt64 *_retval); + static void ConvertToUint8(const nsDiscriminatedUnion& data, PRUint8 *_retval); + static void ConvertToUint16(const nsDiscriminatedUnion& data, PRUint16 *_retval); + static void ConvertToUint32(const nsDiscriminatedUnion& data, PRUint32 *_retval); + static void ConvertToUint64(const nsDiscriminatedUnion& data, PRUint64 *_retval); + static void ConvertToFloat(const nsDiscriminatedUnion& data, float *_retval); + static void ConvertToDouble(const nsDiscriminatedUnion& data, double *_retval); + static void ConvertToBool(const nsDiscriminatedUnion& data, PRBool *_retval); + static void ConvertToChar(const nsDiscriminatedUnion& data, char *_retval); + static void ConvertToWChar(const nsDiscriminatedUnion& data, PRUnichar *_retval); + static void ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval); + static void ConvertToAString(const nsDiscriminatedUnion& data, nsAString & _retval); + static void ConvertToAUTF8String(const nsDiscriminatedUnion& data, nsAUTF8String & _retval); + static void ConvertToACString(const nsDiscriminatedUnion& data, nsACString & _retval); + static void ConvertToString(const nsDiscriminatedUnion& data, char **_retval); + static void ConvertToWString(const nsDiscriminatedUnion& data, PRUnichar **_retval); + static void ConvertToISupports(const nsDiscriminatedUnion& data, nsISupports **_retval); + static void ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid, void * *iface); + static void ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type, nsIID* iid, PRUint32 *count, void * *ptr); + static void ConvertToStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, char **str); + static void ConvertToWStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, PRUnichar **str); @@ -153 +153 @@ - static nsresult SetFromVariant(nsDiscriminatedUnion* data, nsIVariant* aValue); + static void SetFromVariant(nsDiscriminatedUnion* data, nsIVariant* aValue); @@ -155,24 +155,24 @@ - static nsresult SetFromInt8(nsDiscriminatedUnion* data, PRUint8 aValue); - static nsresult SetFromInt16(nsDiscriminatedUnion* data, PRInt16 aValue); - static nsresult SetFromInt32(nsDiscriminatedUnion* data, PRInt32 aValue); - static nsresult SetFromInt64(nsDiscriminatedUnion* data, PRInt64 aValue); - static nsresult SetFromUint8(nsDiscriminatedUnion* data, PRUint8 aValue); - static nsresult SetFromUint16(nsDiscriminatedUnion* data, PRUint16 aValue); - static nsresult SetFromUint32(nsDiscriminatedUnion* data, PRUint32 aValue); - static nsresult SetFromUint64(nsDiscriminatedUnion* data, PRUint64 aValue); - static nsresult SetFromFloat(nsDiscriminatedUnion* data, float aValue); - static nsresult SetFromDouble(nsDiscriminatedUnion* data, double aValue); - static nsresult SetFromBool(nsDiscriminatedUnion* data, PRBool aValue); - static nsresult SetFromChar(nsDiscriminatedUnion* data, char aValue); - static nsresult SetFromWChar(nsDiscriminatedUnion* data, PRUnichar aValue); - static nsresult SetFromID(nsDiscriminatedUnion* data, const nsID & aValue); - static nsresult SetFromAString(nsDiscriminatedUnion* data, const nsAString & aValue); - static nsresult SetFromAUTF8String(nsDiscriminatedUnion* data, const nsAUTF8String & aValue); - static nsresult SetFromACString(nsDiscriminatedUnion* data, const nsACString & aValue); - static nsresult SetFromString(nsDiscriminatedUnion* data, const char *aValue); - static nsresult SetFromWString(nsDiscriminatedUnion* data, const PRUnichar *aValue); - static nsresult SetFromISupports(nsDiscriminatedUnion* data, nsISupports *aValue); - static nsresult SetFromInterface(nsDiscriminatedUnion* data, const nsIID& iid, nsISupports *aValue); - static nsresult SetFromArray(nsDiscriminatedUnion* data, PRUint16 type, const nsIID* iid, PRUint32 count, void * aValue); - static nsresult SetFromStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const char *aValue); - static nsresult SetFromWStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const PRUnichar *aValue); + static void SetFromInt8(nsDiscriminatedUnion* data, PRUint8 aValue); + static void SetFromInt16(nsDiscriminatedUnion* data, PRInt16 aValue); + static void SetFromInt32(nsDiscriminatedUnion* data, PRInt32 aValue); + static void SetFromInt64(nsDiscriminatedUnion* data, PRInt64 aValue); + static void SetFromUint8(nsDiscriminatedUnion* data, PRUint8 aValue); + static void SetFromUint16(nsDiscriminatedUnion* data, PRUint16 aValue); + static void SetFromUint32(nsDiscriminatedUnion* data, PRUint32 aValue); + static void SetFromUint64(nsDiscriminatedUnion* data, PRUint64 aValue); + static void SetFromFloat(nsDiscriminatedUnion* data, float aValue); + static void SetFromDouble(nsDiscriminatedUnion* data, double aValue); + static void SetFromBool(nsDiscriminatedUnion* data, PRBool aValue); + static void SetFromChar(nsDiscriminatedUnion* data, char aValue); + static void SetFromWChar(nsDiscriminatedUnion* data, PRUnichar aValue); + static void SetFromID(nsDiscriminatedUnion* data, const nsID & aValue); + static void SetFromAString(nsDiscriminatedUnion* data, const nsAString & aValue); + static void SetFromAUTF8String(nsDiscriminatedUnion* data, const nsAUTF8String & aValue); + static void SetFromACString(nsDiscriminatedUnion* data, const nsACString & aValue); + static void SetFromString(nsDiscriminatedUnion* data, const char *aValue); + static void SetFromWString(nsDiscriminatedUnion* data, const PRUnichar *aValue); + static void SetFromISupports(nsDiscriminatedUnion* data, nsISupports *aValue); + static void SetFromInterface(nsDiscriminatedUnion* data, const nsIID& iid, nsISupports *aValue); + static void SetFromArray(nsDiscriminatedUnion* data, PRUint16 type, const nsIID* iid, PRUint32 count, void * aValue); + static void SetFromStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const char *aValue); + static void SetFromWStringWithSize(nsDiscriminatedUnion* data, PRUint32 size, const PRUnichar *aValue); @@ -180,3 +180,3 @@ - static nsresult SetToVoid(nsDiscriminatedUnion* data); - static nsresult SetToEmpty(nsDiscriminatedUnion* data); - static nsresult SetToEmptyArray(nsDiscriminatedUnion* data); + static void SetToVoid(nsDiscriminatedUnion* data); + static void SetToEmpty(nsDiscriminatedUnion* data); + static void SetToEmptyArray(nsDiscriminatedUnion* data); --- xpcom/glue/nsArrayEnumerator.cpp +++ xpcom/glue/nsArrayEnumerator.cpp @@ -71 +71 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -76 +76 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -80 +80 @@ - return NS_OK; + return; @@ -84,2 +84,4 @@ - nsresult rv = mValueArray->GetLength(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mValueArray->GetLength(&cnt); + } + catch (nsexception &exc) { throw; } @@ -87 +87 @@ - return NS_OK; + return; @@ -90 +90 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -95 +95 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -99 +99 @@ - return NS_OK; + return; @@ -103,2 +103,4 @@ - nsresult rv = mValueArray->GetLength(&cnt); - if (NS_FAILED(rv)) return rv; + try { + mValueArray->GetLength(&cnt); + } + catch (nsexception &exc) { throw; } @@ -106 +106 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -108 +108 @@ - return mValueArray->QueryElementAt(mIndex++, NS_GET_IID(nsISupports), (void**)aResult); + return /*thower*/ mValueArray->QueryElementAt(mIndex++, NS_GET_IID(nsISupports), (void**)aResult); @@ -111,2 +111 @@ -nsresult -NS_NewArrayEnumerator(nsISimpleEnumerator* *result, +void NS_NewArrayEnumerator(nsISimpleEnumerator* *result, @@ -117 +117 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -120 +120 @@ - return NS_OK; + return; @@ -169 +169 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -174 +174 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -177 +177 @@ - return NS_OK; + return; @@ -180 +180 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -185 +185 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -188 +188 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -199 +199 @@ - return NS_OK; + return; @@ -230,2 +230 @@ -nsresult -NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult, +void NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult, @@ -235 +235 @@ - if (!enumerator) return NS_ERROR_OUT_OF_MEMORY; + @@ -238 +238 @@ - return NS_OK; + return; --- xpcom/glue/nsArrayEnumerator.h +++ xpcom/glue/nsArrayEnumerator.h @@ -53,2 +53 @@ -NS_COM_GLUE nsresult -NS_NewArrayEnumerator(nsISimpleEnumerator* *result, +NS_COM_GLUE void NS_NewArrayEnumerator(nsISimpleEnumerator* *result, @@ -61,2 +61 @@ -NS_COM_GLUE nsresult -NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult, +NS_COM_GLUE void NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult, --- xpcom/glue/nsArrayUtils.h +++ xpcom/glue/nsArrayUtils.h @@ -69 +69 @@ - nsresult* mErrorPtr; + void * mErrorPtr; --- xpcom/glue/nsAutoLock.h +++ xpcom/glue/nsAutoLock.h @@ -338,3 +338,3 @@ - nsresult Wait(PRIntervalTime interval = PR_INTERVAL_NO_TIMEOUT) { - return PR_Wait(mMonitor, interval) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void Wait(PRIntervalTime interval = PR_INTERVAL_NO_TIMEOUT) { + return wrap_nsexception(PR_Wait(mMonitor, interval) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); @@ -347,3 +347,3 @@ - nsresult Notify() { - return PR_Notify(mMonitor) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void Notify() { + return wrap_nsexception(PR_Notify(mMonitor) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); @@ -356,3 +356,3 @@ - nsresult NotifyAll() { - return PR_NotifyAll(mMonitor) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void NotifyAll() { + return wrap_nsexception(PR_NotifyAll(mMonitor) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); @@ -413,3 +413,3 @@ - nsresult Wait(PRIntervalTime interval = PR_INTERVAL_NO_TIMEOUT) { - return PR_CWait(mLockObject, interval) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void Wait(PRIntervalTime interval = PR_INTERVAL_NO_TIMEOUT) { + return wrap_nsexception(PR_CWait(mLockObject, interval) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); @@ -418,3 +418,3 @@ - nsresult Notify() { - return PR_CNotify(mLockObject) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void Notify() { + return wrap_nsexception(PR_CNotify(mLockObject) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); @@ -423,3 +423,3 @@ - nsresult NotifyAll() { - return PR_CNotifyAll(mLockObject) == PR_SUCCESS - ? NS_OK : NS_ERROR_FAILURE; + void NotifyAll() { + return wrap_nsexception(PR_CNotifyAll(mLockObject) == PR_SUCCESS + ? NS_OK : NS_ERROR_FAILURE); --- xpcom/glue/nsCOMPtr.h +++ xpcom/glue/nsCOMPtr.h @@ -406,3 +406,4 @@ - nsresult rv = mRawPtr->QueryInterface(aIID, &result); - if (NS_FAILED(rv)) - return NULL; + try { + mRawPtr->QueryInterface(aIID, &result); + } + catch (nsexception &exc) return NULL; @@ -450 +450 @@ - nsresult *mErrorPtr; + void *mErrorPtr; --- xpcom/glue/nsCategoryCache.cpp +++ xpcom/glue/nsCategoryCache.cpp @@ -63,4 +63,5 @@ - nsresult rv = catMan->EnumerateCategory(aCategory, - getter_AddRefs(enumerator)); - if (NS_FAILED(rv)) - return; + try { + catMan->EnumerateCategory(aCategory, + getter_AddRefs(enumerator)); + } + catch (nsexception &exc) return; @@ -74 +74,3 @@ - rv = entryName->GetData(categoryEntry); + try { + entryName->GetData(categoryEntry); + } @@ -77,3 +77,3 @@ - catMan->GetCategoryEntry(aCategory, - categoryEntry.get(), - getter_Copies(entryValue)); + IGNORE_NSEXCEPTION(catMan->GetCategoryEntry(aCategory, + categoryEntry.get(), + getter_Copies(entryValue))); @@ -94 +94 @@ - serv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); + IGNORE_NSEXCEPTION(serv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE)); @@ -96,3 +96,3 @@ - serv->AddObserver(this, NS_XPCOM_CATEGORY_ENTRY_ADDED_OBSERVER_ID, PR_FALSE); - serv->AddObserver(this, NS_XPCOM_CATEGORY_ENTRY_REMOVED_OBSERVER_ID, PR_FALSE); - serv->AddObserver(this, NS_XPCOM_CATEGORY_CLEARED_OBSERVER_ID, PR_FALSE); + IGNORE_NSEXCEPTION(serv->AddObserver(this, NS_XPCOM_CATEGORY_ENTRY_ADDED_OBSERVER_ID, PR_FALSE)); + IGNORE_NSEXCEPTION(serv->AddObserver(this, NS_XPCOM_CATEGORY_ENTRY_REMOVED_OBSERVER_ID, PR_FALSE)); + IGNORE_NSEXCEPTION(serv->AddObserver(this, NS_XPCOM_CATEGORY_CLEARED_OBSERVER_ID, PR_FALSE)); @@ -115 +115 @@ - serv->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID); + IGNORE_NSEXCEPTION(serv->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID)); @@ -117,3 +117,3 @@ - serv->RemoveObserver(this, NS_XPCOM_CATEGORY_ENTRY_ADDED_OBSERVER_ID); - serv->RemoveObserver(this, NS_XPCOM_CATEGORY_ENTRY_REMOVED_OBSERVER_ID); - serv->RemoveObserver(this, NS_XPCOM_CATEGORY_CLEARED_OBSERVER_ID); + IGNORE_NSEXCEPTION(serv->RemoveObserver(this, NS_XPCOM_CATEGORY_ENTRY_ADDED_OBSERVER_ID)); + IGNORE_NSEXCEPTION(serv->RemoveObserver(this, NS_XPCOM_CATEGORY_ENTRY_REMOVED_OBSERVER_ID)); + IGNORE_NSEXCEPTION(serv->RemoveObserver(this, NS_XPCOM_CATEGORY_CLEARED_OBSERVER_ID)); @@ -122 +122 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -126 +126 @@ - return NS_OK; + return; @@ -131 +131 @@ - return NS_OK; + return; @@ -136 +136 @@ - return NS_OK; + return; @@ -141 +141 @@ - strWrapper->GetData(str); + IGNORE_NSEXCEPTION(strWrapper->GetData(str)); @@ -147 +147 @@ - return NS_OK; + return; @@ -150,3 +150,3 @@ - catMan->GetCategoryEntry(mCategory.get(), - str.get(), - getter_Copies(entryValue)); + IGNORE_NSEXCEPTION(catMan->GetCategoryEntry(mCategory.get(), + str.get(), + getter_Copies(entryValue))); @@ -166 +166 @@ - return NS_OK; + return; --- xpcom/glue/nsComponentManagerUtils.cpp +++ xpcom/glue/nsComponentManagerUtils.cpp @@ -53,2 +53 @@ -nsresult -CallGetService(const nsCID &aCID, const nsIID &aIID, void **aResult) +void CallGetService(const nsCID &aCID, const nsIID &aIID, void **aResult) @@ -57 +57,3 @@ - nsresult status = NS_GetServiceManager(getter_AddRefs(servMgr)); + try { + NS_GetServiceManager(getter_AddRefs(servMgr)); + } @@ -59,2 +59,4 @@ - status = servMgr->GetService(aCID, aIID, aResult); - return status; + try { + servMgr->GetService(aCID, aIID, aResult); + } + throw nsexception(status); @@ -63,2 +63 @@ -nsresult -CallGetService(const char *aContractID, const nsIID &aIID, void **aResult) +void CallGetService(const char *aContractID, const nsIID &aIID, void **aResult) @@ -67 +67,3 @@ - nsresult status = NS_GetServiceManager(getter_AddRefs(servMgr)); + try { + NS_GetServiceManager(getter_AddRefs(servMgr)); + } @@ -69,2 +69,4 @@ - status = servMgr->GetServiceByContractID(aContractID, aIID, aResult); - return status; + try { + servMgr->GetServiceByContractID(aContractID, aIID, aResult); + } + throw nsexception(status); @@ -77,2 +77 @@ -nsresult -CallGetService(const nsCID &aCID, const nsIID &aIID, void **aResult) +void CallGetService(const nsCID &aCID, const nsIID &aIID, void **aResult) @@ -83 +83 @@ - return compMgr->nsComponentManagerImpl::GetService(aCID, aIID, aResult); + return wrap_nsexception(compMgr->nsComponentManagerImpl::GetService(aCID, aIID, aResult)); @@ -86,2 +86 @@ -nsresult -CallGetService(const char *aContractID, const nsIID &aIID, void **aResult) +void CallGetService(const char *aContractID, const nsIID &aIID, void **aResult) @@ -92,3 +92,3 @@ - return compMgr-> - nsComponentManagerImpl::GetServiceByContractID(aContractID, - aIID, aResult); + return wrap_nsexception(compMgr-> + nsComponentManagerImpl::GetServiceByContractID(aContractID, + aIID, aResult)); @@ -101,2 +101 @@ -nsresult -CallCreateInstance(const nsCID &aCID, nsISupports *aDelegate, +void CallCreateInstance(const nsCID &aCID, nsISupports *aDelegate, @@ -106 +106,3 @@ - nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr)); + try { + NS_GetComponentManager(getter_AddRefs(compMgr)); + } @@ -108,2 +108,4 @@ - status = compMgr->CreateInstance(aCID, aDelegate, aIID, aResult); - return status; + try { + compMgr->CreateInstance(aCID, aDelegate, aIID, aResult); + } + throw nsexception(status); @@ -112,2 +112 @@ -nsresult -CallCreateInstance(const char *aContractID, nsISupports *aDelegate, +void CallCreateInstance(const char *aContractID, nsISupports *aDelegate, @@ -117 +117,3 @@ - nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr)); + try { + NS_GetComponentManager(getter_AddRefs(compMgr)); + } @@ -119,3 +119,5 @@ - status = compMgr->CreateInstanceByContractID(aContractID, aDelegate, - aIID, aResult); - return status; + try { + compMgr->CreateInstanceByContractID(aContractID, aDelegate, + aIID, aResult); + } + throw nsexception(status); @@ -124,2 +124 @@ -nsresult -CallGetClassObject(const nsCID &aCID, const nsIID &aIID, void **aResult) +void CallGetClassObject(const nsCID &aCID, const nsIID &aIID, void **aResult) @@ -128 +128,3 @@ - nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr)); + try { + NS_GetComponentManager(getter_AddRefs(compMgr)); + } @@ -130,2 +130,4 @@ - status = compMgr->GetClassObject(aCID, aIID, aResult); - return status; + try { + compMgr->GetClassObject(aCID, aIID, aResult); + } + throw nsexception(status); @@ -134,2 +134 @@ -nsresult -CallGetClassObject(const char *aContractID, const nsIID &aIID, void **aResult) +void CallGetClassObject(const char *aContractID, const nsIID &aIID, void **aResult) @@ -138 +138,3 @@ - nsresult status = NS_GetComponentManager(getter_AddRefs(compMgr)); + try { + NS_GetComponentManager(getter_AddRefs(compMgr)); + } @@ -140,3 +140,5 @@ - status = compMgr->GetClassObjectByContractID(aContractID, aIID, - aResult); - return status; + try { + compMgr->GetClassObjectByContractID(aContractID, aIID, + aResult); + } + throw nsexception(status); @@ -149,2 +149 @@ -nsresult -CallCreateInstance(const nsCID &aCID, nsISupports *aDelegate, +void CallCreateInstance(const nsCID &aCID, nsISupports *aDelegate, @@ -156,2 +156,2 @@ - return compMgr-> - nsComponentManagerImpl::CreateInstance(aCID, aDelegate, aIID, aResult); + return wrap_nsexception(compMgr-> + nsComponentManagerImpl::CreateInstance(aCID, aDelegate, aIID, aResult)); @@ -160,2 +160 @@ -nsresult -CallCreateInstance(const char *aContractID, nsISupports *aDelegate, +void CallCreateInstance(const char *aContractID, nsISupports *aDelegate, @@ -167,4 +167,4 @@ - return compMgr-> - nsComponentManagerImpl::CreateInstanceByContractID(aContractID, - aDelegate, aIID, - aResult); + return wrap_nsexception(compMgr-> + nsComponentManagerImpl::CreateInstanceByContractID(aContractID, + aDelegate, aIID, + aResult)); @@ -173,2 +173 @@ -nsresult -CallGetClassObject(const nsCID &aCID, const nsIID &aIID, void **aResult) +void CallGetClassObject(const nsCID &aCID, const nsIID &aIID, void **aResult) @@ -179,2 +179,2 @@ - return compMgr-> - nsComponentManagerImpl::GetClassObject(aCID, aIID, aResult); + return wrap_nsexception(compMgr-> + nsComponentManagerImpl::GetClassObject(aCID, aIID, aResult)); @@ -183,2 +183 @@ -nsresult -CallGetClassObject(const char *aContractID, const nsIID &aIID, void **aResult) +void CallGetClassObject(const char *aContractID, const nsIID &aIID, void **aResult) @@ -189 +189 @@ - return compMgr-> + return /*thower*/ compMgr-> @@ -200,3 +200,4 @@ - nsresult status = CallCreateInstance(mCID, mOuter, aIID, &result); - if (NS_FAILED(status)) - result = NULL; + try { + CallCreateInstance(mCID, mOuter, aIID, &result); + } + catch (nsexception &exc) result = NULL; @@ -212,3 +212,4 @@ - nsresult status = CallCreateInstance(mContractID, mOuter, aIID, &result); - if (NS_FAILED(status)) - result = NULL; + try { + CallCreateInstance(mContractID, mOuter, aIID, &result); + } + catch (nsexception &exc) result = NULL; @@ -224,3 +224,4 @@ - nsresult status = mFactory->CreateInstance(mOuter, aIID, &result); - if ( NS_FAILED(status) ) - result = NULL; + try { + mFactory->CreateInstance(mOuter, aIID, &result); + } + catch (nsexception &exc) result = NULL; @@ -236,3 +236,4 @@ - nsresult status = CallGetClassObject(mCID, aIID, &result); - if ( NS_FAILED(status) ) - result = NULL; + try { + CallGetClassObject(mCID, aIID, &result); + } + catch (nsexception &exc) result = NULL; @@ -248,3 +248,4 @@ - nsresult status = CallGetClassObject(mContractID, aIID, &result); - if ( NS_FAILED(status) ) - result = NULL; + try { + CallGetClassObject(mContractID, aIID, &result); + } + catch (nsexception &exc) result = NULL; --- xpcom/glue/nsComponentManagerUtils.h +++ xpcom/glue/nsComponentManagerUtils.h @@ -52,2 +52 @@ -NS_COM_GLUE nsresult -CallCreateInstance +NS_COM_GLUE void CallCreateInstance @@ -57,2 +57 @@ -NS_COM_GLUE nsresult -CallCreateInstance +NS_COM_GLUE void CallCreateInstance @@ -62,2 +62 @@ -NS_COM_GLUE nsresult -CallGetClassObject +NS_COM_GLUE void CallGetClassObject @@ -66,2 +66 @@ -NS_COM_GLUE nsresult -CallGetClassObject +NS_COM_GLUE void CallGetClassObject @@ -93 +93 @@ - nsresult* mErrorPtr; + void * mErrorPtr; @@ -118 +118 @@ - nsresult* mErrorPtr; + void * mErrorPtr; @@ -143 +143 @@ - nsresult* mErrorPtr; + void * mErrorPtr; @@ -210 +210 @@ - nsresult* mErrorPtr; + void * mErrorPtr; @@ -233 +233 @@ - nsresult* mErrorPtr; + void * mErrorPtr; --- xpcom/glue/nsCycleCollectionParticipant.cpp +++ xpcom/glue/nsCycleCollectionParticipant.cpp @@ -41,2 +41 @@ -nsresult -nsXPCOMCycleCollectionParticipant::Root(void *p) +void nsXPCOMCycleCollectionParticipant::Root(void *p) @@ -46 +46 @@ - return NS_OK; + return; @@ -49,2 +49 @@ -nsresult -nsXPCOMCycleCollectionParticipant::Unlink(void *p) +void nsXPCOMCycleCollectionParticipant::Unlink(void *p) @@ -52 +52 @@ - return NS_OK; + return; @@ -55,2 +55 @@ -nsresult -nsXPCOMCycleCollectionParticipant::Unroot(void *p) +void nsXPCOMCycleCollectionParticipant::Unroot(void *p) @@ -60 +60 @@ - return NS_OK; + return; @@ -63,2 +63 @@ -nsresult -nsXPCOMCycleCollectionParticipant::Traverse +void nsXPCOMCycleCollectionParticipant::Traverse @@ -67 +67 @@ - return NS_OK; + return; @@ -79,2 +79,2 @@ - s->QueryInterface(NS_GET_IID(nsCycleCollectionISupports), - getter_AddRefs(foo)); + IGNORE_NSEXCEPTION(s->QueryInterface(NS_GET_IID(nsCycleCollectionISupports), + getter_AddRefs(foo))); --- xpcom/glue/nsCycleCollectionParticipant.h +++ xpcom/glue/nsCycleCollectionParticipant.h @@ -115 +115 @@ - NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb) = 0; + NS_IMETHOD_(void) Traverse(void *p, nsCycleCollectionTraversalCallback &cb) = 0; @@ -117,3 +117,3 @@ - NS_IMETHOD Root(void *p) = 0; - NS_IMETHOD Unlink(void *p) = 0; - NS_IMETHOD Unroot(void *p) = 0; + NS_IMETHOD_(void) Root(void *p) = 0; + NS_IMETHOD_(void) Unlink(void *p) = 0; + NS_IMETHOD_(void) Unroot(void *p) = 0; @@ -132 +132 @@ - NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb); + NS_IMETHOD_(void) Traverse(void *p, nsCycleCollectionTraversalCallback &cb); @@ -134,3 +134,3 @@ - NS_IMETHOD Root(void *p); - NS_IMETHOD Unlink(void *p); - NS_IMETHOD Unroot(void *p); + NS_IMETHOD_(void) Root(void *p); + NS_IMETHOD_(void) Unlink(void *p); + NS_IMETHOD_(void) Unroot(void *p); --- xpcom/glue/nsEnumeratorUtils.cpp +++ xpcom/glue/nsEnumeratorUtils.cpp @@ -63 +63 @@ - NS_IMETHOD GetNext(nsAString& aResult); + NS_IMETHOD_(void) GetNext(nsAString& aResult); @@ -87 +87 @@ -NS_IMETHODIMP EmptyEnumeratorImpl::HasMoreElements(PRBool* aResult) +NS_IMETHODIMP_(void) EmptyEnumeratorImpl::HasMoreElements(PRBool* aResult) @@ -90 +90 @@ - return NS_OK; + return; @@ -93 +93 @@ -NS_IMETHODIMP EmptyEnumeratorImpl::HasMore(PRBool* aResult) +NS_IMETHODIMP_(void) EmptyEnumeratorImpl::HasMore(PRBool* aResult) @@ -96 +96 @@ - return NS_OK; + return; @@ -99 +99 @@ -NS_IMETHODIMP EmptyEnumeratorImpl::GetNext(nsISupports** aResult) +NS_IMETHODIMP_(void) EmptyEnumeratorImpl::GetNext(nsISupports** aResult) @@ -101 +101 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -104 +104 @@ -NS_IMETHODIMP EmptyEnumeratorImpl::GetNext(nsACString& aResult) +NS_IMETHODIMP_(void) EmptyEnumeratorImpl::GetNext(nsACString& aResult) @@ -106 +106 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -109 +109 @@ -NS_IMETHODIMP EmptyEnumeratorImpl::GetNext(nsAString& aResult) +NS_IMETHODIMP_(void) EmptyEnumeratorImpl::GetNext(nsAString& aResult) @@ -111 +111 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -116,2 +116 @@ -nsresult -NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult) +void NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult) @@ -120 +120 @@ - return NS_OK; + return; @@ -131,2 +131,2 @@ - NS_IMETHOD HasMoreElements(PRBool* aResult); - NS_IMETHOD GetNext(nsISupports** aResult); + NS_IMETHOD_(void) HasMoreElements(PRBool* aResult); + NS_IMETHOD_(void) GetNext(nsISupports** aResult); @@ -158 +158 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -163 +163 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -166 +166 @@ - return NS_OK; + return; @@ -170 +170 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -175 +175 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -178 +178 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -184 +184 @@ - return NS_OK; + return; @@ -187,2 +187 @@ -nsresult -NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, +void NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, @@ -193 +193 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -196 +196 @@ - return NS_OK; + return; @@ -207,2 +207,2 @@ - NS_IMETHOD HasMoreElements(PRBool* aResult); - NS_IMETHOD GetNext(nsISupports** aResult); + NS_IMETHOD_(void) HasMoreElements(PRBool* aResult); + NS_IMETHOD_(void) GetNext(nsISupports** aResult); @@ -236 +236 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -241 +241 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -247 +247 @@ - return NS_OK; + return; @@ -251,2 +251,4 @@ - rv = mFirstEnumerator->HasMoreElements(aResult); - if (NS_FAILED(rv)) return rv; + try { + mFirstEnumerator->HasMoreElements(aResult); + } + catch (nsexception &exc) { throw; } @@ -255 +255 @@ - return NS_OK; + return; @@ -260,2 +260,4 @@ - rv = mSecondEnumerator->HasMoreElements(aResult); - if (NS_FAILED(rv)) return rv; + try { + mSecondEnumerator->HasMoreElements(aResult); + } + catch (nsexception &exc) { throw; } @@ -264 +264 @@ - return NS_OK; + return; @@ -268 +268 @@ - return NS_OK; + return; @@ -271 +271 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -276 +276 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -279 +279 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -282 +282 @@ - return mFirstEnumerator->GetNext(aResult); + return /*thower*/ mFirstEnumerator->GetNext(aResult); @@ -284 +284 @@ - return mSecondEnumerator->GetNext(aResult); + return /*thower*/ mSecondEnumerator->GetNext(aResult); @@ -287,2 +287 @@ -nsresult -NS_NewUnionEnumerator(nsISimpleEnumerator* *result, +void NS_NewUnionEnumerator(nsISimpleEnumerator* *result, @@ -300 +300 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -304 +304 @@ - return NS_OK; + return; --- xpcom/glue/nsEnumeratorUtils.h +++ xpcom/glue/nsEnumeratorUtils.h @@ -46,2 +46 @@ -NS_COM_GLUE nsresult -NS_NewEmptyEnumerator(nsISimpleEnumerator* *aResult); +NS_COM_GLUE void NS_NewEmptyEnumerator(nsISimpleEnumerator* *aResult); @@ -49,2 +49 @@ -NS_COM_GLUE nsresult -NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, +NS_COM_GLUE void NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, @@ -53,2 +53 @@ -NS_COM_GLUE nsresult -NS_NewUnionEnumerator(nsISimpleEnumerator* *result, +NS_COM_GLUE void NS_NewUnionEnumerator(nsISimpleEnumerator* *result, --- xpcom/glue/nsGREGlue.cpp +++ xpcom/glue/nsGREGlue.cpp @@ -149,2 +149 @@ -nsresult -GRE_GetGREPathWithProperties(const GREVersionRange *versions, +void GRE_GetGREPathWithProperties(const GREVersionRange *versions, @@ -165 +165 @@ - return NS_OK; + return; @@ -191 +191 @@ - return NS_ERROR_FILE_NAME_TOO_LONG; + throw nsexception(NS_ERROR_FILE_NAME_TOO_LONG); @@ -195 +195 @@ - return NS_OK; + return; @@ -202 +202 @@ - return NS_OK; + return; @@ -278 +278 @@ - return NS_OK; + return; @@ -294 +294 @@ - return NS_OK; + return; @@ -306 +306 @@ - return NS_OK; + return; @@ -315 +315 @@ - return NS_OK; + return; @@ -323 +323 @@ - return NS_OK; + return; @@ -427 +427 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -572,4 +572,5 @@ - rv = c->parser->GetString(aHeader, properties->property, - buffer, sizeof(buffer)); - if (NS_FAILED(rv)) - return PR_TRUE; + try { + c->parser->GetString(aHeader, properties->property, + buffer, sizeof(buffer)); + } + catch (nsexception &exc) return PR_TRUE; @@ -581,3 +581,4 @@ - rv = c->parser->GetString(aHeader, "GRE_PATH", c->pathBuffer, c->buflen); - if (NS_FAILED(rv)) - return PR_TRUE; + try { + c->parser->GetString(aHeader, "GRE_PATH", c->pathBuffer, c->buflen); + } + catch (nsexception &exc) return PR_TRUE; @@ -603,3 +603,4 @@ - nsresult rv = parser.Init(filename); - if (NS_FAILED(rv)) - return PR_FALSE; + try { + parser.Init(filename); + } + catch (nsexception &exc) return PR_FALSE; @@ -615 +615 @@ - parser.GetSections(CheckINIHeader, &c); + IGNORE_NSEXCEPTION(parser.GetSections(CheckINIHeader, &c)); --- xpcom/glue/nsGenericFactory.cpp +++ xpcom/glue/nsGenericFactory.cpp @@ -76 +76 @@ -NS_IMETHODIMP nsGenericFactory::CreateInstance(nsISupports *aOuter, +NS_IMETHODIMP_(void) nsGenericFactory::CreateInstance(nsISupports *aOuter, @@ -80 +80 @@ - return mInfo->mConstructor(aOuter, aIID, aResult); + return wrap_nsexception(mInfo->mConstructor(aOuter, aIID, aResult)); @@ -83 +83 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -86 +86 @@ -NS_IMETHODIMP nsGenericFactory::LockFactory(PRBool aLock) +NS_IMETHODIMP_(void) nsGenericFactory::LockFactory(PRBool aLock) @@ -89 +89 @@ - return NS_OK; + return; @@ -92 +92 @@ -NS_IMETHODIMP nsGenericFactory::GetInterfaces(PRUint32 *countp, +NS_IMETHODIMP_(void) nsGenericFactory::GetInterfaces(PRUint32 *countp, @@ -98 +98 @@ - return NS_OK; + return; @@ -100 +100 @@ - return mInfo->mGetInterfacesProc(countp, array); + return wrap_nsexception(mInfo->mGetInterfacesProc(countp, array)); @@ -103 +103 @@ -NS_IMETHODIMP nsGenericFactory::GetHelperForLanguage(PRUint32 language, +NS_IMETHODIMP_(void) nsGenericFactory::GetHelperForLanguage(PRUint32 language, @@ -107 +107 @@ - return mInfo->mGetLanguageHelperProc(language, helper); + return wrap_nsexception(mInfo->mGetLanguageHelperProc(language, helper)); @@ -109 +109 @@ - return NS_OK; + return; @@ -112 +112 @@ -NS_IMETHODIMP nsGenericFactory::GetContractID(char **aContractID) +NS_IMETHODIMP_(void) nsGenericFactory::GetContractID(char **aContractID) @@ -117 +117 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -122 +122 @@ - return NS_OK; + return; @@ -125 +125 @@ -NS_IMETHODIMP nsGenericFactory::GetClassDescription(char * *aClassDescription) +NS_IMETHODIMP_(void) nsGenericFactory::GetClassDescription(char * *aClassDescription) @@ -131 +131 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -136 +136 @@ - return NS_OK; + return; @@ -139 +139 @@ -NS_IMETHODIMP nsGenericFactory::GetClassID(nsCID * *aClassID) +NS_IMETHODIMP_(void) nsGenericFactory::GetClassID(nsCID * *aClassID) @@ -145,2 +145,2 @@ - return NS_ERROR_OUT_OF_MEMORY; - return NS_OK; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); + return; @@ -149 +149 @@ -NS_IMETHODIMP nsGenericFactory::GetClassIDNoAlloc(nsCID *aClassID) +NS_IMETHODIMP_(void) nsGenericFactory::GetClassIDNoAlloc(nsCID *aClassID) @@ -152 +152 @@ - return NS_OK; + return; @@ -155 +155 @@ -NS_IMETHODIMP nsGenericFactory::GetImplementationLanguage(PRUint32 *langp) +NS_IMETHODIMP_(void) nsGenericFactory::GetImplementationLanguage(PRUint32 *langp) @@ -158 +158 @@ - return NS_OK; + return; @@ -161 +161 @@ -NS_IMETHODIMP nsGenericFactory::GetFlags(PRUint32 *flagsp) +NS_IMETHODIMP_(void) nsGenericFactory::GetFlags(PRUint32 *flagsp) @@ -164 +164 @@ - return NS_OK; + return; @@ -168 +168 @@ -NS_IMETHODIMP nsGenericFactory::SetComponentInfo(const nsModuleComponentInfo *info) +NS_IMETHODIMP_(void) nsGenericFactory::SetComponentInfo(const nsModuleComponentInfo *info) @@ -175 +175 @@ - return NS_OK; + return; @@ -178 +178 @@ -NS_IMETHODIMP nsGenericFactory::GetComponentInfo(const nsModuleComponentInfo **infop) +NS_IMETHODIMP_(void) nsGenericFactory::GetComponentInfo(const nsModuleComponentInfo **infop) @@ -181 +181 @@ - return NS_OK; + return; @@ -184 +184 @@ -NS_METHOD nsGenericFactory::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr) +NS_METHOD_(void) nsGenericFactory::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr) @@ -191 +191,3 @@ - res = factory->QueryInterface(aIID, aInstancePtr); + try { + wrap_nsexception(factory->QueryInterface(aIID, aInstancePtr)); + } @@ -198 +198 @@ - return res; + throw nsexception(res); @@ -201,2 +201 @@ -NS_COM_GLUE nsresult -NS_NewGenericFactory(nsIGenericFactory* *result, +NS_COM_GLUE void NS_NewGenericFactory(nsIGenericFactory* *result, @@ -207,4 +207,8 @@ - rv = nsGenericFactory::Create(NULL, NS_GET_IID(nsIGenericFactory), (void**)&fact); - if (NS_FAILED(rv)) return rv; - rv = fact->SetComponentInfo(info); - if (NS_FAILED(rv)) goto error; + try { + nsGenericFactory::Create(NULL, NS_GET_IID(nsIGenericFactory), (void**)&fact); + } + catch (nsexception &exc) { throw; } + try { + fact->SetComponentInfo(info); + } + catch (nsexception &exc) goto error; @@ -212 +212 @@ - return rv; + throw nsexception(rv); @@ -216 +216 @@ - return rv; + throw nsexception(rv); @@ -247,2 +247 @@ -nsresult -nsGenericModule::AddFactoryNode(nsIGenericFactory* fact) +void nsGenericModule::AddFactoryNode(nsIGenericFactory* fact) @@ -251 +251 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -254,2 +254 @@ - if (!node) - return NS_ERROR_OUT_OF_MEMORY; + @@ -258 +258 @@ - return NS_OK; + return; @@ -263,2 +263 @@ -nsresult -nsGenericModule::Initialize(nsIComponentManager *compMgr) +void nsGenericModule::Initialize(nsIComponentManager *compMgr) @@ -269 +269 @@ - return NS_OK; + return; @@ -273,3 +273,4 @@ - rv = mCtor(this); - if (NS_FAILED(rv)) - return rv; + try { + mCtor(this); + } + catch (nsexception &exc) { throw; } @@ -286,2 +286 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -301,2 +301,4 @@ - nsresult rv = NS_NewGenericFactory(getter_AddRefs(fact), desc); - if (NS_FAILED(rv)) return rv; + try { + NS_NewGenericFactory(getter_AddRefs(fact), desc); + } + catch (nsexception &exc) { throw; } @@ -307 +307,3 @@ - rv = AddFactoryNode(fact); + try { + AddFactoryNode(fact); + } @@ -309,4 +309,6 @@ - rv = registrar->RegisterFactory(desc->mCID, - desc->mDescription, - desc->mContractID, - fact); + try { + registrar->RegisterFactory(desc->mCID, + desc->mDescription, + desc->mContractID, + fact); + } @@ -314 +314 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -320 +320 @@ - return NS_OK; + return; @@ -345 +345 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -355 +355 @@ - return NS_ERROR_INVALID_POINTER; + throw nsexception(NS_ERROR_INVALID_POINTER); @@ -361,5 +361,4 @@ - rv = Initialize(aCompMgr); - if (NS_FAILED(rv)) { - // Initialization failed! yikes! - return rv; - } + try { + Initialize(aCompMgr); + } + catch (nsexception &exc) { throw; } @@ -374,3 +374,5 @@ - rv = NS_NewGenericFactory(getter_AddRefs(fact), desc); - if (NS_FAILED(rv)) return rv; - return fact->QueryInterface(aIID, r_classObj); + try { + NS_NewGenericFactory(getter_AddRefs(fact), desc); + } + catch (nsexception &exc) { throw; } + return /*thower*/ fact->QueryInterface(aIID, r_classObj); @@ -381 +381 @@ - return NS_ERROR_FACTORY_NOT_REGISTERED; + throw nsexception(NS_ERROR_FACTORY_NOT_REGISTERED); @@ -384 +384 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -402,13 +402,15 @@ - rv = registrar->RegisterFactoryLocation(cp->mCID, - cp->mDescription, - cp->mContractID, - aPath, - registryLocation, - componentType); - if (NS_FAILED(rv)) { -#ifdef DEBUG - printf_stderr("nsGenericModule %s: unable to register %s component => %x\n", - mModuleName?mModuleName:"(null)", cp->mDescription?cp->mDescription:"(null)", rv); -#endif - break; - } + try { + registrar->RegisterFactoryLocation(cp->mCID, + cp->mDescription, + cp->mContractID, + aPath, + registryLocation, + componentType); + } + catch (nsexception &exc) { +#ifdef DEBUG + printf_stderr("nsGenericModule %s: unable to register %s component => %x\n", + mModuleName?mModuleName:"(null)", cp->mDescription?cp->mDescription:"(null)", rv); +#endif + break; + } @@ -419,9 +419,11 @@ - rv = cp->mRegisterSelfProc(aCompMgr, aPath, registryLocation, - componentType, cp); - if (NS_FAILED(rv)) { -#ifdef DEBUG - printf_stderr("nsGenericModule %s: Register hook for %s component returned error => %x\n", - mModuleName?mModuleName:"(null)", cp->mDescription?cp->mDescription:"(null)", rv); -#endif - break; - } + try { + cp->mRegisterSelfProc(aCompMgr, aPath, registryLocation, + componentType, cp); + } + catch (nsexception &exc) { +#ifdef DEBUG + printf_stderr("nsGenericModule %s: Register hook for %s component returned error => %x\n", + mModuleName?mModuleName:"(null)", cp->mDescription?cp->mDescription:"(null)", rv); +#endif + break; + } @@ -432 +432 @@ - return rv; + throw nsexception(rv); @@ -435 +435 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -455,7 +455,9 @@ - rv = registrar->UnregisterFactoryLocation(cp->mCID, aPath); - if (NS_FAILED(rv)) { -#ifdef DEBUG - printf_stderr("nsGenericModule %s: unable to unregister %s component => %x\n", - mModuleName, cp->mDescription, rv); -#endif - } + try { + registrar->UnregisterFactoryLocation(cp->mCID, aPath); + } + catch (nsexception &exc) { +#ifdef DEBUG + printf_stderr("nsGenericModule %s: unable to unregister %s component => %x\n", + mModuleName, cp->mDescription, rv); +#endif + } @@ -465 +465 @@ - return NS_OK; + return; @@ -468 +468 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -472 +472 @@ - return NS_ERROR_INVALID_POINTER; + throw nsexception(NS_ERROR_INVALID_POINTER); @@ -475 +475 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -478,2 +478 @@ -NS_COM_GLUE nsresult -NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result) +NS_COM_GLUE void NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result) @@ -488,2 +488 @@ - if (!m) - return NS_ERROR_OUT_OF_MEMORY; + @@ -493 +493 @@ - return rv; + throw nsexception(rv); --- xpcom/glue/nsGenericFactory.h +++ xpcom/glue/nsGenericFactory.h @@ -59,2 +59,2 @@ - NS_IMETHOD SetComponentInfo(const nsModuleComponentInfo *info); - NS_IMETHOD GetComponentInfo(const nsModuleComponentInfo **infop); + NS_IMETHOD_(void) SetComponentInfo(const nsModuleComponentInfo *info); + NS_IMETHOD_(void) GetComponentInfo(const nsModuleComponentInfo **infop); @@ -62 +62 @@ - NS_IMETHOD CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult); + NS_IMETHOD_(void) CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult); @@ -64 +64 @@ - NS_IMETHOD LockFactory(PRBool aLock); + NS_IMETHOD_(void) LockFactory(PRBool aLock); @@ -66 +66 @@ - static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + static NS_METHOD_(void) Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); @@ -112 +112 @@ - nsresult Initialize(nsIComponentManager* compMgr); + void Initialize(nsIComponentManager* compMgr); @@ -115 +115 @@ - nsresult AddFactoryNode(nsIGenericFactory* fact); + void AddFactoryNode(nsIGenericFactory* fact); --- xpcom/glue/nsHashKeys.h +++ xpcom/glue/nsHashKeys.h @@ -414,3 +414,3 @@ - nsresult rv = -#endif - const_cast(aKey)->GetHashCode(&code); + try { + const_cast(aKey)->GetHashCode(&code); + } --- xpcom/glue/nsIGenericFactory.h +++ xpcom/glue/nsIGenericFactory.h @@ -72,2 +72,2 @@ - NS_IMETHOD SetComponentInfo(const nsModuleComponentInfo *info) = 0; - NS_IMETHOD GetComponentInfo(const nsModuleComponentInfo **infop) = 0; + NS_IMETHOD_(void) SetComponentInfo(const nsModuleComponentInfo *info) = 0; + NS_IMETHOD_(void) GetComponentInfo(const nsModuleComponentInfo **infop) = 0; @@ -78,2 +78 @@ -NS_COM_GLUE nsresult -NS_NewGenericFactory(nsIGenericFactory **result, +NS_COM_GLUE void NS_NewGenericFactory(nsIGenericFactory **result, @@ -105 +105 @@ -typedef NS_CALLBACK(NSConstructorProcPtr)(nsISupports *aOuter, +typedef NS_CALLBACK_(void, NSConstructorProcPtr)(nsISupports *aOuter, @@ -133 +133 @@ -typedef NS_CALLBACK(NSRegisterSelfProcPtr)(nsIComponentManager *aCompMgr, +typedef NS_CALLBACK_(void, NSRegisterSelfProcPtr)(nsIComponentManager *aCompMgr, @@ -160 +160 @@ -typedef NS_CALLBACK(NSUnregisterSelfProcPtr)(nsIComponentManager *aCompMgr, +typedef NS_CALLBACK_(void, NSUnregisterSelfProcPtr)(nsIComponentManager *aCompMgr, @@ -171 +171 @@ -typedef NS_CALLBACK(NSFactoryDestructorProcPtr)(void); +typedef NS_CALLBACK_(void, NSFactoryDestructorProcPtr)(void); @@ -188 +188 @@ -typedef NS_CALLBACK(NSGetInterfacesProcPtr)(PRUint32 *countp, +typedef NS_CALLBACK_(void, NSGetInterfacesProcPtr)(PRUint32 *countp, @@ -207 +207 @@ -typedef NS_CALLBACK(NSGetLanguageHelperProcPtr)(PRUint32 language, +typedef NS_CALLBACK_(void, NSGetLanguageHelperProcPtr)(PRUint32 language, @@ -261 +261 @@ -typedef nsresult (PR_CALLBACK *nsModuleConstructorProc) (nsIModule *self); +typedef void (PR_CALLBACK *nsModuleConstructorProc) (nsIModule *self); @@ -309,2 +309 @@ -NS_COM_GLUE nsresult -NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result); +NS_COM_GLUE void NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result); --- xpcom/glue/nsIInterfaceRequestorUtils.cpp +++ xpcom/glue/nsIInterfaceRequestorUtils.cpp @@ -53 +53,3 @@ - status = factoryPtr->GetInterface(aIID, &result); + try { + factoryPtr->GetInterface(aIID, &result); + } @@ -57,2 +57 @@ - if ( NS_FAILED(status) ) - result = NULL; + catch (nsexception &exc) result = NULL; --- xpcom/glue/nsIInterfaceRequestorUtils.h +++ xpcom/glue/nsIInterfaceRequestorUtils.h @@ -78 +78 @@ - nsresult* mErrorPtr; + void * mErrorPtr; --- xpcom/glue/nsINIParser.cpp +++ xpcom/glue/nsINIParser.cpp @@ -69,2 +69 @@ -nsresult -nsINIParser::Init(nsILocalFile* aFile) +void nsINIParser::Init(nsILocalFile* aFile) @@ -88 +88,3 @@ - rv = aFile->GetNativePath(path); + try { + aFile->GetNativePath(path); + } @@ -94 +94 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -96 +96 @@ - return InitFromFILE(fd); + return /*thower*/ InitFromFILE(fd); @@ -99,2 +99 @@ -nsresult -nsINIParser::Init(const char *aPath) +void nsINIParser::Init(const char *aPath) @@ -105 +105 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -107 +107 @@ - return InitFromFILE(fd); + return /*thower*/ InitFromFILE(fd); @@ -115,2 +115 @@ -nsresult -nsINIParser::InitFromFILE(FILE *fd) +void nsINIParser::InitFromFILE(FILE *fd) @@ -119 +119 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -123 +123 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -127 +127 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -131,2 +131 @@ - if (!mFileContents) - return NS_ERROR_OUT_OF_MEMORY; + @@ -136 +136 @@ - return NS_BASE_STREAM_OSERROR; + throw nsexception(NS_BASE_STREAM_OSERROR); @@ -140 +140 @@ - return NS_BASE_STREAM_OSERROR; + throw nsexception(NS_BASE_STREAM_OSERROR); @@ -186,2 +186 @@ - if (!val) - return NS_ERROR_OUT_OF_MEMORY; + @@ -209 +209 @@ - return NS_OK; + return; @@ -212,2 +212 @@ -nsresult -nsINIParser::GetString(const char *aSection, const char *aKey, +void nsINIParser::GetString(const char *aSection, const char *aKey, @@ -222 +222 @@ - return NS_OK; + return; @@ -228 +228 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -231,2 +231 @@ -nsresult -nsINIParser::GetString(const char *aSection, const char *aKey, +void nsINIParser::GetString(const char *aSection, const char *aKey, @@ -243 +243 @@ - return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; + throw nsexception(NS_ERROR_LOSS_OF_SIGNIFICANT_DATA); @@ -245 +245 @@ - return NS_OK; + return; @@ -251 +251 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -263,2 +263 @@ -nsresult -nsINIParser::GetSections(INISectionCallback aCB, void *aClosure) +void nsINIParser::GetSections(INISectionCallback aCB, void *aClosure) @@ -272 +272 @@ - return NS_OK; + return; @@ -275,2 +275 @@ -nsresult -nsINIParser::GetStrings(const char *aSection, +void nsINIParser::GetStrings(const char *aSection, @@ -286 +286 @@ - return NS_OK; + return; @@ -289 +289 @@ - return NS_OK; + return; --- xpcom/glue/nsINIParser.h +++ xpcom/glue/nsINIParser.h @@ -70 +70 @@ - nsresult Init(nsILocalFile* aFile); + void Init(nsILocalFile* aFile); @@ -78 +78 @@ - nsresult Init(const char *aPath); + void Init(const char *aPath); @@ -91 +91 @@ - nsresult GetSections(INISectionCallback aCB, void *aClosure); + void GetSections(INISectionCallback aCB, void *aClosure); @@ -106 +106 @@ - nsresult GetStrings(const char *aSection, + void GetStrings(const char *aSection, @@ -119 +119 @@ - nsresult GetString(const char *aSection, const char *aKey, + void GetString(const char *aSection, const char *aKey, @@ -133 +133 @@ - nsresult GetString(const char *aSection, const char* aKey, + void GetString(const char *aSection, const char* aKey, @@ -156 +156 @@ - nsresult InitFromFILE(FILE *fd); + void InitFromFILE(FILE *fd); --- xpcom/glue/nsISupportsImpl.cpp +++ xpcom/glue/nsISupportsImpl.cpp @@ -40,2 +40 @@ -nsresult NS_FASTCALL -NS_TableDrivenQI(void* aThis, const QITableEntry* entries, +void NS_TableDrivenQI(void* aThis, const QITableEntry* entries, @@ -51 +51 @@ - return NS_OK; + return; @@ -58 +58 @@ - return NS_ERROR_NO_INTERFACE; + throw nsexception(NS_ERROR_NO_INTERFACE); --- xpcom/glue/nsISupportsImpl.h +++ xpcom/glue/nsISupportsImpl.h @@ -413,2 +413 @@ -NS_COM_GLUE nsresult NS_FASTCALL -NS_TableDrivenQI(void* aThis, const QITableEntry* entries, +NS_COM_GLUE void NS_TableDrivenQI(void* aThis, const QITableEntry* entries, --- xpcom/glue/nsIWeakReferenceUtils.h +++ xpcom/glue/nsIWeakReferenceUtils.h @@ -87 +87 @@ - nsresult* mErrorPtr; + void * mErrorPtr; --- xpcom/glue/nsMemory.cpp +++ xpcom/glue/nsMemory.cpp @@ -48,2 +48 @@ -NS_COM_GLUE nsresult -nsMemory::HeapMinimize(PRBool aImmediate) +NS_COM_GLUE void nsMemory::HeapMinimize(PRBool aImmediate) @@ -52 +52,3 @@ - nsresult rv = NS_GetMemoryManager(getter_AddRefs(mem)); + try { + NS_GetMemoryManager(getter_AddRefs(mem)); + } @@ -55 +55 @@ - return mem->HeapMinimize(aImmediate); + return /*thower*/ mem->HeapMinimize(aImmediate); @@ -71,2 +71,4 @@ - nsresult rv = NS_GetMemoryManager(&mem); - if (NS_FAILED(rv)) return nsnull; + try { + NS_GetMemoryManager(&mem); + } + catch (nsexception &exc) return nsnull; --- xpcom/glue/nsMemory.h +++ xpcom/glue/nsMemory.h @@ -76 +76 @@ - static NS_COM_GLUE nsresult HeapMinimize(PRBool aImmediate); + static NS_COM_GLUE void HeapMinimize(PRBool aImmediate); --- xpcom/glue/nsProxyRelease.cpp +++ xpcom/glue/nsProxyRelease.cpp @@ -50 +50 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -53 +53 @@ - return NS_OK; + return; @@ -60,2 +60 @@ -nsresult -NS_ProxyRelease(nsIEventTarget *target, nsISupports *doomed, +void NS_ProxyRelease(nsIEventTarget *target, nsISupports *doomed, @@ -68 +68 @@ - return NS_OK; + return; @@ -73 +73,3 @@ - rv = target->IsOnCurrentThread(&onCurrentThread); + try { + target->IsOnCurrentThread(&onCurrentThread); + } @@ -76 +76 @@ - return NS_OK; + return; @@ -81,5 +81 @@ - if (!ev) { - // we do not release doomed here since it may cause a delete on the - // wrong thread. better to leak than crash. - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -87,7 +87,9 @@ - rv = target->Dispatch(ev, NS_DISPATCH_NORMAL); - if (NS_FAILED(rv)) { - NS_WARNING("failed to post proxy release event"); - // again, it is better to leak the doomed object than risk crashing as - // a result of deleting it on the wrong thread. - } - return rv; + try { + target->Dispatch(ev, NS_DISPATCH_NORMAL); + } + catch (nsexception &exc) { + NS_WARNING("failed to post proxy release event"); + // again, it is better to leak the doomed object than risk crashing as + // a result of deleting it on the wrong thread. + } + throw nsexception(rv); --- xpcom/glue/nsProxyRelease.h +++ xpcom/glue/nsProxyRelease.h @@ -73,2 +73 @@ -NS_COM_GLUE nsresult -NS_ProxyRelease +NS_COM_GLUE void NS_ProxyRelease --- xpcom/glue/nsServiceManagerUtils.h +++ xpcom/glue/nsServiceManagerUtils.h @@ -44,2 +44 @@ -NS_COM_GLUE nsresult -CallGetService(const nsCID &aClass, const nsIID &aIID, void **aResult); +NS_COM_GLUE void CallGetService(const nsCID &aClass, const nsIID &aIID, void **aResult); @@ -47,2 +47 @@ -NS_COM_GLUE nsresult -CallGetService(const char *aContractID, const nsIID &aIID, void **aResult); +NS_COM_GLUE void CallGetService(const char *aContractID, const nsIID &aIID, void **aResult); @@ -72,3 +72,4 @@ - nsresult rv = CallGetService(mCID, aIID, &result); - if (NS_FAILED(rv)) - return NULL; + try { + CallGetService(mCID, aIID, &result); + } + catch (nsexception &exc) return NULL; @@ -110 +110 @@ - nsresult *mErrorPtr; + void *mErrorPtr; @@ -132,3 +132,4 @@ - nsresult rv = CallGetService(mContractID, aIID, &result); - if (NS_FAILED(rv)) - return NULL; + try { + CallGetService(mContractID, aIID, &result); + } + catch (nsexception &exc) return NULL; @@ -171 +171 @@ - nsresult* mErrorPtr; + void * mErrorPtr; @@ -227 +227 @@ - nsresult* mErrorPtr; + void * mErrorPtr; --- xpcom/glue/nsStringAPI.cpp +++ xpcom/glue/nsStringAPI.cpp @@ -194 +194 @@ - NS_StringCutData(*this, 0, cutLen); + IGNORE_NSEXCEPTION(NS_StringCutData(*this, 0, cutLen)); @@ -210 +210 @@ - NS_StringCutData(*this, len - cutLen, cutLen); + IGNORE_NSEXCEPTION(NS_StringCutData(*this, len - cutLen, cutLen)); @@ -616 +616 @@ - NS_CStringCutData(*this, 0, cutLen); + IGNORE_NSEXCEPTION(NS_CStringCutData(*this, 0, cutLen)); @@ -632 +632 @@ - NS_CStringCutData(*this, len - cutLen, cutLen); + IGNORE_NSEXCEPTION(NS_CStringCutData(*this, len - cutLen, cutLen)); @@ -854,3 +854,3 @@ - NS_StringContainerInit2(*this, data + aStartPos, len - aStartPos, - NS_STRING_CONTAINER_INIT_DEPEND | - NS_STRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, data + aStartPos, len - aStartPos, + NS_STRING_CONTAINER_INIT_DEPEND | + NS_STRING_CONTAINER_INIT_SUBSTRING)); @@ -872,3 +872,3 @@ - NS_StringContainerInit2(*this, data + aStartPos, aLength, - NS_STRING_CONTAINER_INIT_DEPEND | - NS_STRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, data + aStartPos, aLength, + NS_STRING_CONTAINER_INIT_DEPEND | + NS_STRING_CONTAINER_INIT_SUBSTRING)); @@ -886,3 +886,3 @@ - NS_CStringContainerInit2(*this, data + aStartPos, len - aStartPos, - NS_CSTRING_CONTAINER_INIT_DEPEND | - NS_CSTRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, data + aStartPos, len - aStartPos, + NS_CSTRING_CONTAINER_INIT_DEPEND | + NS_CSTRING_CONTAINER_INIT_SUBSTRING)); @@ -904,3 +904,3 @@ - NS_CStringContainerInit2(*this, data + aStartPos, aLength, - NS_CSTRING_CONTAINER_INIT_DEPEND | - NS_CSTRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, data + aStartPos, aLength, + NS_CSTRING_CONTAINER_INIT_DEPEND | + NS_CSTRING_CONTAINER_INIT_SUBSTRING)); --- xpcom/glue/nsStringAPI.h +++ xpcom/glue/nsStringAPI.h @@ -126 +126 @@ - NS_StringCopy(*this, aString); + IGNORE_NSEXCEPTION(NS_StringCopy(*this, aString)); @@ -130 +130 @@ - NS_StringSetData(*this, aData, aLength); + IGNORE_NSEXCEPTION(NS_StringSetData(*this, aData, aLength)); @@ -134 +134 @@ - NS_StringSetData(*this, &aChar, 1); + IGNORE_NSEXCEPTION(NS_StringSetData(*this, &aChar, 1)); @@ -145 +145 @@ - NS_StringSetDataRange(*this, cutStart, cutLength, data, length); + IGNORE_NSEXCEPTION(NS_StringSetDataRange(*this, cutStart, cutLength, data, length)); @@ -155 +155 @@ - NS_StringSetDataRange(*this, cutStart, cutLength, data, dataLen); + IGNORE_NSEXCEPTION(NS_StringSetDataRange(*this, cutStart, cutLength, data, dataLen)); @@ -408 +408 @@ - NS_CStringCopy(*this, aString); + IGNORE_NSEXCEPTION(NS_CStringCopy(*this, aString)); @@ -412 +412 @@ - NS_CStringSetData(*this, aData, aLength); + IGNORE_NSEXCEPTION(NS_CStringSetData(*this, aData, aLength)); @@ -416 +416 @@ - NS_CStringSetData(*this, &aChar, 1); + IGNORE_NSEXCEPTION(NS_CStringSetData(*this, &aChar, 1)); @@ -429 +429 @@ - NS_CStringSetDataRange(*this, cutStart, cutLength, data, length); + IGNORE_NSEXCEPTION(NS_CStringSetDataRange(*this, cutStart, cutLength, data, length)); @@ -439 +439 @@ - NS_CStringSetDataRange(*this, cutStart, cutLength, data, dataLen); + IGNORE_NSEXCEPTION(NS_CStringSetDataRange(*this, cutStart, cutLength, data, dataLen)); @@ -673 +673 @@ - NS_StringContainerInit(*this); + IGNORE_NSEXCEPTION(NS_StringContainerInit(*this)); @@ -678,2 +678,2 @@ - NS_StringContainerInit(*this); - NS_StringCopy(*this, aString); + IGNORE_NSEXCEPTION(NS_StringContainerInit(*this)); + IGNORE_NSEXCEPTION(NS_StringCopy(*this, aString)); @@ -685,2 +685,2 @@ - NS_StringContainerInit(*this); - NS_StringCopy(*this, aReadable); + IGNORE_NSEXCEPTION(NS_StringContainerInit(*this)); + IGNORE_NSEXCEPTION(NS_StringCopy(*this, aReadable)); @@ -692 +692 @@ - NS_StringContainerInit2(*this, aData, aLength, 0); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aData, aLength, 0)); @@ -713,2 +713,2 @@ - NS_StringContainerInit2(*this, aData, aLength, - NS_STRING_CONTAINER_INIT_ADOPT); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aData, aLength, + NS_STRING_CONTAINER_INIT_ADOPT)); @@ -721 +721 @@ - NS_StringContainerInit2(*this, aData, aLength, aFlags); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aData, aLength, aFlags)); @@ -733 +733 @@ - NS_CStringContainerInit(*this); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(*this)); @@ -738,2 +738,2 @@ - NS_CStringContainerInit(*this); - NS_CStringCopy(*this, aString); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(*this)); + IGNORE_NSEXCEPTION(NS_CStringCopy(*this, aString)); @@ -745,2 +745,2 @@ - NS_CStringContainerInit(*this); - NS_CStringCopy(*this, aReadable); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(*this)); + IGNORE_NSEXCEPTION(NS_CStringCopy(*this, aReadable)); @@ -752,2 +752,2 @@ - NS_CStringContainerInit(*this); - NS_CStringSetData(*this, aData, aLength); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(*this)); + IGNORE_NSEXCEPTION(NS_CStringSetData(*this, aData, aLength)); @@ -774,2 +774,2 @@ - NS_CStringContainerInit2(*this, aData, aLength, - NS_CSTRING_CONTAINER_INIT_ADOPT); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, aData, aLength, + NS_CSTRING_CONTAINER_INIT_ADOPT)); @@ -782 +782 @@ - NS_CStringContainerInit2(*this, aData, aLength, aFlags); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, aData, aLength, aFlags)); @@ -806,2 +806,2 @@ - NS_StringContainerInit2(*this, aData, aLength, - NS_STRING_CONTAINER_INIT_DEPEND); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aData, aLength, + NS_STRING_CONTAINER_INIT_DEPEND)); @@ -829,2 +829,2 @@ - NS_CStringContainerInit2(*this, aData, aLength, - NS_CSTRING_CONTAINER_INIT_DEPEND); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, aData, aLength, + NS_CSTRING_CONTAINER_INIT_DEPEND)); @@ -845 +845 @@ - NS_UTF16ToCString(aSource, NS_CSTRING_ENCODING_UTF8, aDest); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(aSource, NS_CSTRING_ENCODING_UTF8, aDest)); @@ -851 +851 @@ - NS_CStringToUTF16(aSource, NS_CSTRING_ENCODING_UTF8, aDest); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(aSource, NS_CSTRING_ENCODING_UTF8, aDest)); @@ -857 +857 @@ - NS_UTF16ToCString(aSource, NS_CSTRING_ENCODING_ASCII, aDest); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(aSource, NS_CSTRING_ENCODING_ASCII, aDest)); @@ -863 +863 @@ - NS_CStringToUTF16(aSource, NS_CSTRING_ENCODING_ASCII, aDest); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(aSource, NS_CSTRING_ENCODING_ASCII, aDest)); @@ -877 +877 @@ - NS_CStringToUTF16(aStr, NS_CSTRING_ENCODING_ASCII, *this); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(aStr, NS_CSTRING_ENCODING_ASCII, *this)); @@ -883,2 +883,2 @@ - NS_CStringToUTF16(nsDependentCString(aData, aLength), - NS_CSTRING_ENCODING_ASCII, *this); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(nsDependentCString(aData, aLength), + NS_CSTRING_ENCODING_ASCII, *this)); @@ -899 +899 @@ - NS_CStringToUTF16(aStr, NS_CSTRING_ENCODING_UTF8, *this); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(aStr, NS_CSTRING_ENCODING_UTF8, *this)); @@ -905,2 +905,2 @@ - NS_CStringToUTF16(nsDependentCString(aData, aLength), - NS_CSTRING_ENCODING_UTF8, *this); + IGNORE_NSEXCEPTION(NS_CStringToUTF16(nsDependentCString(aData, aLength), + NS_CSTRING_ENCODING_UTF8, *this)); @@ -921 +921 @@ - NS_UTF16ToCString(aStr, NS_CSTRING_ENCODING_UTF8, *this); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(aStr, NS_CSTRING_ENCODING_UTF8, *this)); @@ -927,2 +927,2 @@ - NS_UTF16ToCString(nsDependentString(aData, aLength), - NS_CSTRING_ENCODING_UTF8, *this); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(nsDependentString(aData, aLength), + NS_CSTRING_ENCODING_UTF8, *this)); @@ -943 +943 @@ - NS_UTF16ToCString(aStr, NS_CSTRING_ENCODING_ASCII, *this); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(aStr, NS_CSTRING_ENCODING_ASCII, *this)); @@ -949,2 +949,2 @@ - NS_UTF16ToCString(nsDependentString(aData, aLength), - NS_CSTRING_ENCODING_ASCII, *this); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(nsDependentString(aData, aLength), + NS_CSTRING_ENCODING_ASCII, *this)); @@ -1097 +1097 @@ - NS_StringContainerInit(*this); + IGNORE_NSEXCEPTION(NS_StringContainerInit(*this)); @@ -1102,3 +1102,3 @@ - NS_StringContainerInit2(*this, aStart, aLength, - NS_STRING_CONTAINER_INIT_DEPEND | - NS_STRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aStart, aLength, + NS_STRING_CONTAINER_INIT_DEPEND | + NS_STRING_CONTAINER_INIT_SUBSTRING)); @@ -1115,3 +1115,3 @@ - NS_StringContainerInit2(*this, aStart, aLength, - NS_STRING_CONTAINER_INIT_DEPEND | - NS_STRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_StringContainerInit2(*this, aStart, aLength, + NS_STRING_CONTAINER_INIT_DEPEND | + NS_STRING_CONTAINER_INIT_SUBSTRING)); @@ -1137 +1137 @@ - NS_CStringContainerInit(*this); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(*this)); @@ -1142,3 +1142,3 @@ - NS_CStringContainerInit2(*this, aStart, aLength, - NS_CSTRING_CONTAINER_INIT_DEPEND | - NS_CSTRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, aStart, aLength, + NS_CSTRING_CONTAINER_INIT_DEPEND | + NS_CSTRING_CONTAINER_INIT_SUBSTRING)); @@ -1155,3 +1155,3 @@ - NS_CStringContainerInit2(*this, aStart, aLength, - NS_CSTRING_CONTAINER_INIT_DEPEND | - NS_CSTRING_CONTAINER_INIT_SUBSTRING); + IGNORE_NSEXCEPTION(NS_CStringContainerInit2(*this, aStart, aLength, + NS_CSTRING_CONTAINER_INIT_DEPEND | + NS_CSTRING_CONTAINER_INIT_SUBSTRING)); --- xpcom/glue/nsThreadUtils.cpp +++ xpcom/glue/nsThreadUtils.cpp @@ -51 +51 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -55 +55 @@ - return NS_OK; + return; @@ -60 +60 @@ -NS_METHOD +NS_METHOD_(void) @@ -65,2 +65,4 @@ - nsresult rv = nsThreadManager::get()-> - nsThreadManager::NewThread(0, getter_AddRefs(thread)); + try { + wrap_nsexception(nsThreadManager::get()-> + nsThreadManager::NewThread(0, getter_AddRefs(thread))); + } @@ -73 +73,3 @@ - rv = mgr->NewThread(0, getter_AddRefs(thread)); + try { + mgr->NewThread(0, getter_AddRefs(thread)); + } @@ -78 +78,3 @@ - rv = thread->Dispatch(event, NS_DISPATCH_NORMAL); + try { + thread->Dispatch(event, NS_DISPATCH_NORMAL); + } @@ -84 +84 @@ - return NS_OK; + return; @@ -87 +87 @@ -NS_METHOD +NS_METHOD_(void) @@ -91 +91 @@ - return nsThreadManager::get()->nsThreadManager::GetCurrentThread(result); + return wrap_nsexception(nsThreadManager::get()->nsThreadManager::GetCurrentThread(result)); @@ -97 +97 @@ - return mgr->GetCurrentThread(result); + return /*thower*/ mgr->GetCurrentThread(result); @@ -101 +101 @@ -NS_METHOD +NS_METHOD_(void) @@ -105 +105 @@ - return nsThreadManager::get()->nsThreadManager::GetMainThread(result); + return wrap_nsexception(nsThreadManager::get()->nsThreadManager::GetMainThread(result)); @@ -111 +111 @@ - return mgr->GetMainThread(result); + return /*thower*/ mgr->GetMainThread(result); @@ -125 +125 @@ - mgr->GetIsMainThread(&result); + IGNORE_NSEXCEPTION(mgr->GetIsMainThread(&result)); @@ -130 +130 @@ -NS_METHOD +NS_METHOD_(void) @@ -138 +138,3 @@ - nsresult rv = NS_GetCurrentThread(getter_AddRefs(thread)); + try { + NS_GetCurrentThread(getter_AddRefs(thread)); + } @@ -141 +141 @@ - return thread->Dispatch(event, NS_DISPATCH_NORMAL); + return /*thower*/ thread->Dispatch(event, NS_DISPATCH_NORMAL); @@ -144 +144 @@ -NS_METHOD +NS_METHOD_(void) @@ -148 +148,3 @@ - nsresult rv = NS_GetMainThread(getter_AddRefs(thread)); + try { + NS_GetMainThread(getter_AddRefs(thread)); + } @@ -150 +150 @@ - return thread->Dispatch(event, dispatchFlags); + return /*thower*/ thread->Dispatch(event, dispatchFlags); @@ -153 +153 @@ -NS_METHOD +NS_METHOD_(void) @@ -166 +166,3 @@ - rv = NS_GetCurrentThread(getter_AddRefs(current)); + try { + NS_GetCurrentThread(getter_AddRefs(current)); + } @@ -175 +175,3 @@ - rv = thread->ProcessNextEvent(PR_FALSE, &processedEvent); + try { + thread->ProcessNextEvent(PR_FALSE, &processedEvent); + } @@ -181 +181 @@ - return rv; + throw nsexception(rv); @@ -195 +195 @@ - NS_GetCurrentThread(getter_AddRefs(current)); + IGNORE_NSEXCEPTION(NS_GetCurrentThread(getter_AddRefs(current))); @@ -215 +215 @@ - NS_GetCurrentThread(getter_AddRefs(current)); + IGNORE_NSEXCEPTION(NS_GetCurrentThread(getter_AddRefs(current))); --- xpcom/glue/nsThreadUtils.h +++ xpcom/glue/nsThreadUtils.h @@ -80 +80 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -89 +89 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -98 +98 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -119 +119 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -133 +133 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -152 +152 @@ -extern NS_COM_GLUE NS_METHOD +extern NS_COM_GLUE NS_METHOD_(void) @@ -199 +199 @@ - NS_GetCurrentThread(&thread); + IGNORE_NSEXCEPTION(NS_GetCurrentThread(&thread)); @@ -206 +206 @@ - NS_GetMainThread(&thread); + IGNORE_NSEXCEPTION(NS_GetMainThread(&thread)); --- xpcom/glue/nsWeakReference.cpp +++ xpcom/glue/nsWeakReference.cpp @@ -113 +113,3 @@ - status = factoryPtr->GetWeakReference(&result); + try { + factoryPtr->GetWeakReference(&result); + } @@ -125,2 +125 @@ -NS_COM_GLUE nsresult -nsSupportsWeakReference::GetWeakReference( nsIWeakReference** aInstancePtr ) +NS_COM_GLUE void nsSupportsWeakReference::GetWeakReference( nsIWeakReference** aInstancePtr ) @@ -129 +129 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -144 +144 @@ - return status; + throw nsexception(status); @@ -149 +149 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -152 +152 @@ - return mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_POINTER; + return wrap_nsexception(mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_POINTER); --- xpcom/glue/nsXPCOMGlue.h +++ xpcom/glue/nsXPCOMGlue.h @@ -85,2 +85 @@ -extern "C" NS_COM_GLUE nsresult -GRE_GetGREPathWithProperties(const GREVersionRange *versions, +extern "C" NS_COM_GLUE void GRE_GetGREPathWithProperties(const GREVersionRange *versions, --- xpcom/glue/nsXPTCUtils.h +++ xpcom/glue/nsXPTCUtils.h @@ -55,2 +55 @@ - nsresult - InitStub(const nsIID& aIID) + void InitStub(const nsIID& aIID) @@ -58 +58 @@ - return NS_GetXPTCallStub(aIID, this, &mXPTCStub); + return /*thower*/ NS_GetXPTCallStub(aIID, this, &mXPTCStub); --- xpcom/io/SpecialSystemDirectory.cpp +++ xpcom/io/SpecialSystemDirectory.cpp @@ -221,2 +221 @@ -static nsresult -GetUnixHomeDir(nsILocalFile** aFile) +static void GetUnixHomeDir(nsILocalFile** aFile) @@ -237 +237 @@ - return NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), @@ -243,2 +243 @@ -nsresult -GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory, +void GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory, @@ -267 +267 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -271 +271 @@ - return NS_NewNativeLocalFile(nsDependentCString(path), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString(path), @@ -302 +302 @@ - return NS_NewNativeLocalFile(nsDependentCString("/"), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString("/"), @@ -361 +361 @@ - return NS_NewNativeLocalFile(nsDependentCString(tPath), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString(tPath), @@ -567 +567 @@ - return NS_NewNativeLocalFile(nsDependentCString("/usr/local/netscape/"), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString("/usr/local/netscape/"), @@ -571 +571 @@ - return NS_NewNativeLocalFile(nsDependentCString("/usr/local/lib/netscape/"), + return /*thower*/ NS_NewNativeLocalFile(nsDependentCString("/usr/local/lib/netscape/"), @@ -576 +576 @@ - return GetUnixHomeDir(aFile); + return /*thower*/ GetUnixHomeDir(aFile); @@ -581,6 +581,8 @@ - nsresult rv = GetUnixHomeDir(getter_AddRefs(home)); - if (NS_FAILED(rv)) - return rv; - rv = home->AppendNative(NS_LITERAL_CSTRING("Desktop")); - if (NS_FAILED(rv)) - return rv; + try { + GetUnixHomeDir(getter_AddRefs(home)); + } + catch (nsexception &exc) { throw; } + try { + home->AppendNative(NS_LITERAL_CSTRING("Desktop")); + } + catch (nsexception &exc) { throw; } @@ -588,3 +588,4 @@ - rv = home->Exists(&exists); - if (NS_FAILED(rv)) - return rv; + try { + home->Exists(&exists); + } + catch (nsexception &exc) { throw; } @@ -592 +592 @@ - return GetUnixHomeDir(aFile); + return /*thower*/ GetUnixHomeDir(aFile); @@ -595 +595 @@ - return NS_OK; + return; @@ -698 +698 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); --- xpcom/io/SpecialSystemDirectory.h +++ xpcom/io/SpecialSystemDirectory.h @@ -130,2 +130 @@ -nsresult -GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory, +void GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory, --- xpcom/io/nsAppFileLocationProvider.cpp +++ xpcom/io/nsAppFileLocationProvider.cpp @@ -130 +130 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -149 +149,3 @@ - rv = GetProductDirectory(getter_AddRefs(localFile)); + try { + GetProductDirectory(getter_AddRefs(localFile)); + } @@ -153 +153,3 @@ - rv = GetProductDirectory(getter_AddRefs(localFile)); + try { + GetProductDirectory(getter_AddRefs(localFile)); + } @@ -155 +155,3 @@ - rv = localFile->AppendNative(APP_REGISTRY_NAME); + try { + localFile->AppendNative(APP_REGISTRY_NAME); + } @@ -159 +159,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -161 +161,3 @@ - rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + try { + localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + } @@ -165 +165,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -167 +167,3 @@ - rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + try { + localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + } @@ -169 +169,3 @@ - rv = localFile->AppendRelativeNativePath(DEFAULTS_PREF_DIR_NAME); + try { + localFile->AppendRelativeNativePath(DEFAULTS_PREF_DIR_NAME); + } @@ -175 +175,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -177 +177,3 @@ - rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + try { + localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); + } @@ -179 +179,3 @@ - rv = localFile->AppendRelativeNativePath(DEFAULTS_PROFILE_DIR_NAME); + try { + localFile->AppendRelativeNativePath(DEFAULTS_PROFILE_DIR_NAME); + } @@ -184 +184,3 @@ - rv = GetDefaultUserProfileRoot(getter_AddRefs(localFile)); + try { + GetDefaultUserProfileRoot(getter_AddRefs(localFile)); + } @@ -188 +188,3 @@ - rv = GetDefaultUserProfileRoot(getter_AddRefs(localFile), PR_TRUE); + try { + GetDefaultUserProfileRoot(getter_AddRefs(localFile), PR_TRUE); + } @@ -192 +192,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -194 +194,3 @@ - rv = localFile->AppendRelativeNativePath(RES_DIR_NAME); + try { + localFile->AppendRelativeNativePath(RES_DIR_NAME); + } @@ -198 +198,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -200 +200,3 @@ - rv = localFile->AppendRelativeNativePath(CHROME_DIR_NAME); + try { + localFile->AppendRelativeNativePath(CHROME_DIR_NAME); + } @@ -204 +204,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -206 +206,3 @@ - rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME); + try { + localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME); + } @@ -249 +249,3 @@ - rv = NS_NewNativeLocalFile(nsDependentCString(pathVar), PR_TRUE, getter_AddRefs(localFile)); + try { + NS_NewNativeLocalFile(nsDependentCString(pathVar), PR_TRUE, getter_AddRefs(localFile)); + } @@ -253 +253,3 @@ - rv = GetProductDirectory(getter_AddRefs(localFile)); + try { + GetProductDirectory(getter_AddRefs(localFile)); + } @@ -255 +255,3 @@ - rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME); + try { + localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME); + } @@ -260 +260,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -262 +262,3 @@ - rv = localFile->AppendRelativeNativePath(SEARCH_DIR_NAME); + try { + localFile->AppendRelativeNativePath(SEARCH_DIR_NAME); + } @@ -266 +266,3 @@ - rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, _retval); + try { + NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, _retval); + } @@ -268 +268,3 @@ - rv = (*_retval)->AppendNative(SEARCH_DIR_NAME); + try { + (*_retval)->AppendNative(SEARCH_DIR_NAME); + } @@ -274 +274,3 @@ - rv = CloneMozBinDirectory(getter_AddRefs(localFile)); + try { + CloneMozBinDirectory(getter_AddRefs(localFile)); + } @@ -278 +278 @@ - return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval); + return /*thower*/ localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval); @@ -280 +280 @@ - return rv; + throw nsexception(rv); @@ -284 +284 @@ -NS_METHOD nsAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalFile) +NS_METHOD_(void) nsAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalFile) @@ -297,2 +297 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -300,6 +300,9 @@ - rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory)); - if (NS_FAILED(rv)) { - rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory)); - if (NS_FAILED(rv)) - return rv; - } + try { + directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory)); + } + catch (nsexception &exc) { + try { + directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mMozBinDirectory)); + } + catch (nsexception &exc) { throw; } + } @@ -309,3 +309,4 @@ - rv = mMozBinDirectory->Clone(getter_AddRefs(aFile)); - if (NS_FAILED(rv)) - return rv; + try { + mMozBinDirectory->Clone(getter_AddRefs(aFile)); + } + catch (nsexception &exc) { throw; } @@ -315 +315 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -318 +318 @@ - return NS_OK; + return; @@ -329 +329 @@ -NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFile, PRBool aLocal) +NS_METHOD_(void) nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFile, PRBool aLocal) @@ -378,2 +378,4 @@ - rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), PR_TRUE, getter_AddRefs(localDir)); - if (NS_FAILED(rv)) return rv; + try { + NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), PR_TRUE, getter_AddRefs(localDir)); + } + catch (nsexception &exc) { throw; } @@ -395,3 +395,7 @@ - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) return rv; - rv = localDir->Exists(&exists); + try { + localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); + } + catch (nsexception &exc) { throw; } + try { + localDir->Exists(&exists); + } @@ -400 +400,3 @@ - rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0700); + try { + localDir->Create(nsIFile::DIRECTORY_TYPE, 0700); + } @@ -402 +402 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -407 +407 @@ - return rv; + throw nsexception(rv); @@ -418 +418 @@ -NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aLocalFile, PRBool aLocal) +NS_METHOD_(void) nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aLocalFile, PRBool aLocal) @@ -425,2 +425,4 @@ - rv = GetProductDirectory(getter_AddRefs(localDir), aLocal); - if (NS_FAILED(rv)) return rv; + try { + GetProductDirectory(getter_AddRefs(localDir), aLocal); + } + catch (nsexception &exc) { throw; } @@ -443 +443 @@ - return rv; + throw nsexception(rv); @@ -466 +466 @@ - NS_IMETHOD HasMoreElements(PRBool *result) + NS_IMETHOD_(void) HasMoreElements(PRBool *result) @@ -479 +479 @@ - return NS_OK; + return; @@ -482 +482 @@ - NS_IMETHOD GetNext(nsISupports **result) + NS_IMETHOD_(void) GetNext(nsISupports **result) @@ -488 +488 @@ - HasMoreElements(&hasMore); + IGNORE_NSEXCEPTION(HasMoreElements(&hasMore)); @@ -490 +490 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -496 +496 @@ - return *result ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(*result ? NS_OK : NS_ERROR_FAILURE); @@ -539 +539 @@ - NS_IMETHOD HasMoreElements(PRBool *result) + NS_IMETHOD_(void) HasMoreElements(PRBool *result) @@ -552,3 +552,3 @@ - NS_NewNativeLocalFile(Substring(pathVar, mEndPath), - PR_TRUE, - getter_AddRefs(localFile)); + IGNORE_NSEXCEPTION(NS_NewNativeLocalFile(Substring(pathVar, mEndPath), + PR_TRUE, + getter_AddRefs(localFile))); @@ -567 +567 @@ - nsAppDirectoryEnumerator::HasMoreElements(result); + IGNORE_NSEXCEPTION(nsAppDirectoryEnumerator::HasMoreElements(result)); @@ -569 +569 @@ - return NS_OK; + return; @@ -576 +576 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -620 +620 @@ - return rv; + throw nsexception(rv); --- xpcom/io/nsAppFileLocationProvider.h +++ xpcom/io/nsAppFileLocationProvider.h @@ -62 +62 @@ - NS_METHOD CloneMozBinDirectory(nsILocalFile **aLocalFile); + NS_METHOD_(void) CloneMozBinDirectory(nsILocalFile **aLocalFile); @@ -70 +70 @@ - NS_METHOD GetProductDirectory(nsILocalFile **aLocalFile, + NS_METHOD_(void) GetProductDirectory(nsILocalFile **aLocalFile, @@ -72 +72 @@ - NS_METHOD GetDefaultUserProfileRoot(nsILocalFile **aLocalFile, + NS_METHOD_(void) GetDefaultUserProfileRoot(nsILocalFile **aLocalFile, --- xpcom/io/nsBinaryStream.cpp +++ xpcom/io/nsBinaryStream.cpp @@ -67 +67 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -71 +71 @@ - return mOutputStream->Flush(); + return /*thower*/ mOutputStream->Flush(); @@ -74 +74 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -78 +78 @@ - return mOutputStream->Close(); + return /*thower*/ mOutputStream->Close(); @@ -81 +81 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -85 +85 @@ - return mOutputStream->Write(aBuf, aCount, aActualBytes); + return /*thower*/ mOutputStream->Write(aBuf, aCount, aActualBytes); @@ -88 +88 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -92 +92 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -95 +95 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -99 +99 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -102 +102 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -106 +106 @@ - return mOutputStream->IsNonBlocking(aNonBlocking); + return /*thower*/ mOutputStream->IsNonBlocking(aNonBlocking); @@ -109,2 +109 @@ -nsresult -nsBinaryOutputStream::WriteFully(const char *aBuf, PRUint32 aCount) +void nsBinaryOutputStream::WriteFully(const char *aBuf, PRUint32 aCount) @@ -117,2 +117,4 @@ - rv = mOutputStream->Write(aBuf, aCount, &bytesWritten); - if (NS_FAILED(rv)) return rv; + try { + mOutputStream->Write(aBuf, aCount, &bytesWritten); + } + catch (nsexception &exc) { throw; } @@ -120,2 +120,2 @@ - return NS_ERROR_FAILURE; - return NS_OK; + throw nsexception(NS_ERROR_FAILURE); + return; @@ -124 +124 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -130 +130 @@ - return NS_OK; + return; @@ -133 +133 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -136 +136 @@ - return Write8(aBoolean); + return wrap_nsexception(Write8(aBoolean)); @@ -139 +139 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -142 +142 @@ - return WriteFully((const char*)&aByte, sizeof aByte); + return /*thower*/ WriteFully((const char*)&aByte, sizeof aByte); @@ -145 +145 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -149 +149 @@ - return WriteFully((const char*)&a16, sizeof a16); + return /*thower*/ WriteFully((const char*)&a16, sizeof a16); @@ -152 +152 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -156 +156 @@ - return WriteFully((const char*)&a32, sizeof a32); + return /*thower*/ WriteFully((const char*)&a32, sizeof a32); @@ -159 +159 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -166,2 +166,4 @@ - rv = Write(reinterpret_cast(&a64), sizeof a64, &bytesWritten); - if (NS_FAILED(rv)) return rv; + try { + Write(reinterpret_cast(&a64), sizeof a64, &bytesWritten); + } + catch (nsexception &exc) { throw; } @@ -169,2 +169,2 @@ - return NS_ERROR_FAILURE; - return rv; + throw nsexception(NS_ERROR_FAILURE); + throw nsexception(rv); @@ -173 +173 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -178 +178 @@ - return Write32(*reinterpret_cast(&aFloat)); + return /*thower*/ Write32(*reinterpret_cast(&aFloat)); @@ -181 +181 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -186 +186 @@ - return Write64(*reinterpret_cast(&aDouble)); + return /*thower*/ Write64(*reinterpret_cast(&aDouble)); @@ -189 +189 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -196,3 +196,5 @@ - rv = Write32(length); - if (NS_FAILED(rv)) return rv; - return WriteFully(aString, length); + try { + Write32(length); + } + catch (nsexception &exc) { throw; } + return /*thower*/ WriteFully(aString, length); @@ -201 +201 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -208,2 +208,4 @@ - rv = Write32(length); - if (NS_FAILED(rv)) return rv; + try { + Write32(length); + } + catch (nsexception &exc) { throw; } @@ -212 +212 @@ - return NS_OK; + return; @@ -224,2 +224 @@ - if (!copy) - return NS_ERROR_OUT_OF_MEMORY; + @@ -230 +230,3 @@ - rv = WriteBytes(reinterpret_cast(copy), byteCount); + try { + wrap_nsexception(WriteBytes(reinterpret_cast(copy), byteCount)); + } @@ -235 +235 @@ - return rv; + throw nsexception(rv); @@ -238 +238 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -241 +241 @@ - return WriteStringZ(NS_ConvertUTF16toUTF8(aString).get()); + return /*thower*/ WriteStringZ(NS_ConvertUTF16toUTF8(aString).get()); @@ -244 +244 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -250,2 +250,4 @@ - rv = Write(aString, aLength, &bytesWritten); - if (NS_FAILED(rv)) return rv; + try { + Write(aString, aLength, &bytesWritten); + } + catch (nsexception &exc) { throw; } @@ -253,2 +253,2 @@ - return NS_ERROR_FAILURE; - return rv; + throw nsexception(NS_ERROR_FAILURE); + throw nsexception(rv); @@ -257 +257 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -260 +260 @@ - return WriteBytes(reinterpret_cast(aBytes), aLength); + return /*thower*/ WriteBytes(reinterpret_cast(aBytes), aLength); @@ -263 +263 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -266,2 +266,2 @@ - return WriteCompoundObject(aObject, NS_GET_IID(nsISupports), - aIsStrongRef); + return wrap_nsexception(WriteCompoundObject(aObject, NS_GET_IID(nsISupports), + aIsStrongRef)); @@ -270 +270 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -273,2 +273,2 @@ - return WriteCompoundObject(aObject, NS_GET_IID(nsISupports), - PR_TRUE); + return wrap_nsexception(WriteCompoundObject(aObject, NS_GET_IID(nsISupports), + PR_TRUE)); @@ -277 +277 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -292 +292 @@ - classInfo->GetClassIDNoAlloc(&cid); + IGNORE_NSEXCEPTION(classInfo->GetClassIDNoAlloc(&cid)); @@ -294 +294,3 @@ - nsresult rv = WriteID(cid); + try { + wrap_nsexception(WriteID(cid)); + } @@ -297 +297,3 @@ - rv = WriteID(aIID); + try { + wrap_nsexception(WriteID(aIID)); + } @@ -300 +300 @@ - return serializable->Write(this); + return /*thower*/ serializable->Write(this); @@ -303 +303 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -306 +306,3 @@ - nsresult rv = Write32(aIID.m0); + try { + Write32(aIID.m0); + } @@ -309 +309,3 @@ - rv = Write16(aIID.m1); + try { + Write16(aIID.m1); + } @@ -312 +312,3 @@ - rv = Write16(aIID.m2); + try { + Write16(aIID.m2); + } @@ -316 +316,3 @@ - rv = Write8(aIID.m3[i]); + try { + Write8(aIID.m3[i]); + } @@ -320 +320 @@ - return NS_OK; + return; @@ -340 +340 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -344 +344 @@ - return mInputStream->Available(aResult); + return /*thower*/ mInputStream->Available(aResult); @@ -347 +347 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -357 +357,3 @@ - nsresult rv = mInputStream->Read(aBuffer, aCount, &bytesRead); + try { + mInputStream->Read(aBuffer, aCount, &bytesRead); + } @@ -363,3 +363 @@ - if (NS_FAILED(rv)) { - return rv; - } + catch (nsexception &exc) { throw; } @@ -374 +374 @@ - return NS_OK; + return; @@ -387 +387 @@ - nsresult mRealResult; + void mRealResult; @@ -392 +392 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -413 +413 @@ - return thunkClosure->mRealResult; + return wrap_nsexception(thunkClosure->mRealResult); @@ -417 +417 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -427,3 +427,5 @@ - nsresult rv = mInputStream->ReadSegments(ReadSegmentForwardingThunk, - &thunkClosure, - count, &bytesRead); + try { + mInputStream->ReadSegments(ReadSegmentForwardingThunk, + &thunkClosure, + count, &bytesRead); + } @@ -436,3 +436 @@ - if (NS_FAILED(rv)) { - return rv; - } + catch (nsexception &exc) { throw; } @@ -447 +447 @@ - return NS_OK; + return; @@ -450 +450 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -454 +454 @@ - return mInputStream->IsNonBlocking(aNonBlocking); + return /*thower*/ mInputStream->IsNonBlocking(aNonBlocking); @@ -457 +457 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -461 +461 @@ - return mInputStream->Close(); + return /*thower*/ mInputStream->Close(); @@ -464 +464 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -470 +470 @@ - return NS_OK; + return; @@ -473 +473 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -477 +477,3 @@ - nsresult rv = Read8(&byteResult); + try { + wrap_nsexception(Read8(&byteResult)); + } @@ -479 +479 @@ - return rv; + throw nsexception(rv); @@ -482 +482 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -488,2 +488,4 @@ - rv = Read(reinterpret_cast(aByte), sizeof(*aByte), &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + Read(reinterpret_cast(aByte), sizeof(*aByte), &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -491,2 +491,2 @@ - return NS_ERROR_FAILURE; - return rv; + throw nsexception(NS_ERROR_FAILURE); + throw nsexception(rv); @@ -495 +495 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -501,2 +501,4 @@ - rv = Read(reinterpret_cast(a16), sizeof *a16, &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + Read(reinterpret_cast(a16), sizeof *a16, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -504 +504 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -506 +506 @@ - return rv; + throw nsexception(rv); @@ -509 +509 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -515,2 +515,4 @@ - rv = Read(reinterpret_cast(a32), sizeof *a32, &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + Read(reinterpret_cast(a32), sizeof *a32, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -518 +518 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -520 +520 @@ - return rv; + throw nsexception(rv); @@ -523 +523 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -529,2 +529,4 @@ - rv = Read(reinterpret_cast(a64), sizeof *a64, &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + Read(reinterpret_cast(a64), sizeof *a64, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -532 +532 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -534 +534 @@ - return rv; + throw nsexception(rv); @@ -537 +537 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -542 +542 @@ - return Read32(reinterpret_cast(aFloat)); + return /*thower*/ Read32(reinterpret_cast(aFloat)); @@ -545 +545 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -550 +550 @@ - return Read64(reinterpret_cast(aDouble)); + return /*thower*/ Read64(reinterpret_cast(aDouble)); @@ -553 +553 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -567 +567 @@ - return NS_OK; + return; @@ -570 +570 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -576,2 +576,4 @@ - rv = Read32(&length); - if (NS_FAILED(rv)) return rv; + try { + Read32(&length); + } + catch (nsexception &exc) { throw; } @@ -580,2 +580,4 @@ - rv = ReadSegments(WriteSegmentToCString, &aString, length, &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + ReadSegments(WriteSegmentToCString, &aString, length, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -584 +584 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -586 +586 @@ - return NS_OK; + return; @@ -614 +614 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -679 +679 @@ - return NS_OK; + return; @@ -683 +683 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -689,2 +689,4 @@ - rv = Read32(&length); - if (NS_FAILED(rv)) return rv; + try { + Read32(&length); + } + catch (nsexception &exc) { throw; } @@ -694 +694 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -703,3 +703,5 @@ - rv = ReadSegments(WriteSegmentToString, &closure, - length*sizeof(PRUnichar), &bytesRead); - if (NS_FAILED(rv)) return rv; + try { + ReadSegments(WriteSegmentToString, &closure, + length*sizeof(PRUnichar), &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -710 +710 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -712 +712 @@ - return NS_OK; + return; @@ -715 +715 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -723,2 +723 @@ - if (!s) - return NS_ERROR_OUT_OF_MEMORY; + @@ -726,5 +726,7 @@ - rv = Read(s, aLength, &bytesRead); - if (NS_FAILED(rv)) { - nsMemory::Free(s); - return rv; - } + try { + Read(s, aLength, &bytesRead); + } + catch (nsexception &exc) { + nsMemory::Free(s); + throw nsexception(rv); + } @@ -733 +733 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -737 +737 @@ - return NS_OK; + return; @@ -740 +740 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -743 +743 @@ - return ReadBytes(aLength, reinterpret_cast(_rval)); + return /*thower*/ ReadBytes(aLength, reinterpret_cast(_rval)); @@ -746 +746 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -751 +751,3 @@ - nsresult rv = ReadID(&cid); + try { + wrap_nsexception(ReadID(&cid)); + } @@ -754 +754,3 @@ - rv = ReadID(&iid); + try { + wrap_nsexception(ReadID(&iid)); + } @@ -763 +763,3 @@ - rv = serializable->Read(this); + try { + serializable->Read(this); + } @@ -766 +766 @@ - return object->QueryInterface(iid, reinterpret_cast(aObject)); + return /*thower*/ object->QueryInterface(iid, reinterpret_cast(aObject)); @@ -769 +769 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -772 +772,3 @@ - nsresult rv = Read32(&aResult->m0); + try { + Read32(&aResult->m0); + } @@ -775 +775,3 @@ - rv = Read16(&aResult->m1); + try { + Read16(&aResult->m1); + } @@ -778 +778,3 @@ - rv = Read16(&aResult->m2); + try { + Read16(&aResult->m2); + } @@ -782 +782,3 @@ - rv = Read8(&aResult->m3[i]); + try { + Read8(&aResult->m3[i]); + } @@ -786 +786 @@ - return NS_OK; + return; --- xpcom/io/nsBinaryStream.h +++ xpcom/io/nsBinaryStream.h @@ -82 +82 @@ - nsresult WriteFully(const char *aBuf, PRUint32 aCount); + void WriteFully(const char *aBuf, PRUint32 aCount); --- xpcom/io/nsDirectoryService.cpp +++ xpcom/io/nsDirectoryService.cpp @@ -109,2 +109 @@ -nsresult -nsDirectoryService::GetCurrentProcessDirectory(nsILocalFile** aFile) +void nsDirectoryService::GetCurrentProcessDirectory(nsILocalFile** aFile) @@ -118 +118 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -123,3 +123,5 @@ - rv = nsDirectoryService::Create(nsnull, - NS_GET_IID(nsIProperties), - getter_AddRefs(dirService)); // needs to be around for life of product + try { + nsDirectoryService::Create(nsnull, + NS_GET_IID(nsIProperties), + getter_AddRefs(dirService)); + } // needs to be around for life of product @@ -130 +130 @@ - dirService->Get(NS_XPCOM_INIT_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(aLocalFile)); + IGNORE_NSEXCEPTION(dirService->Get(NS_XPCOM_INIT_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(aLocalFile))); @@ -135 +135 @@ - return NS_OK; + return; @@ -142 +142 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -226 +226 @@ - return NS_OK; + return; @@ -244 +244 @@ - return NS_OK; + return; @@ -282 +282 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -377 +377 @@ -NS_METHOD +NS_METHOD_(void) @@ -385 +385 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -388 +388 @@ - return gService->QueryInterface(aIID, aResult); + return wrap_nsexception(gService->QueryInterface(aIID, aResult)); @@ -477 +477 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -481 +481 @@ - return NS_OK; + return; @@ -484,2 +484 @@ -nsresult -nsDirectoryService::RealInit() +void nsDirectoryService::RealInit() @@ -493,2 +493 @@ - if (!self) - return NS_ERROR_OUT_OF_MEMORY; + @@ -496,3 +496,4 @@ - rv = NS_NewISupportsArray(getter_AddRefs(((nsDirectoryService*) self)->mProviders)); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewISupportsArray(getter_AddRefs(((nsDirectoryService*) self)->mProviders)); + } + catch (nsexception &exc) { throw; } @@ -500 +500 @@ - NS_RegisterStaticAtoms(directory_atoms, NS_ARRAY_LENGTH(directory_atoms)); + IGNORE_NSEXCEPTION(NS_RegisterStaticAtoms(directory_atoms, NS_ARRAY_LENGTH(directory_atoms))); @@ -504,2 +504 @@ - if (!defaultProvider) - return NS_ERROR_OUT_OF_MEMORY; + @@ -508,2 +508 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -512 +512 @@ - return NS_OK; + return; @@ -530 +530 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -537 +537 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -540 +540 @@ - return NS_OK; + return; @@ -543 +543 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -546 +546 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -575 +575,3 @@ - rv = prov2->GetFiles(fileData->property, getter_AddRefs(newFiles)); + try { + prov2->GetFiles(fileData->property, getter_AddRefs(newFiles)); + } @@ -580,2 +580,2 @@ - NS_NewUnionEnumerator(getter_AddRefs(unionFiles), - (nsISimpleEnumerator*) fileData->data, newFiles); + IGNORE_NSEXCEPTION(NS_NewUnionEnumerator(getter_AddRefs(unionFiles), + (nsISimpleEnumerator*) fileData->data, newFiles)); @@ -601 +601,3 @@ - rv = prov->GetFile(fileData->property, &fileData->persistent, (nsIFile **)&fileData->data); + try { + prov->GetFile(fileData->property, &fileData->persistent, (nsIFile **)&fileData->data); + } @@ -610 +610 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -626,2 +626,2 @@ - cachedFile->Clone(getter_AddRefs(cloneFile)); - return cloneFile->QueryInterface(uuid, result); + IGNORE_NSEXCEPTION(cachedFile->Clone(getter_AddRefs(cloneFile))); + return /*thower*/ cloneFile->QueryInterface(uuid, result); @@ -640 +640,3 @@ - nsresult rv = (fileData.data)->QueryInterface(uuid, result); + try { + (fileData.data)->QueryInterface(uuid, result); + } @@ -642 +642 @@ - return rv; + throw nsexception(rv); @@ -652 +652,3 @@ - nsresult rv = (fileData.data)->QueryInterface(uuid, result); + try { + (fileData.data)->QueryInterface(uuid, result); + } @@ -654 +654 @@ - return rv; + throw nsexception(rv); @@ -657 +657 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -660 +660 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -667 +667 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -670 +670 @@ - value->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(ourFile)); + IGNORE_NSEXCEPTION(value->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(ourFile))); @@ -674 +674 @@ - ourFile->Clone (getter_AddRefs (cloneFile)); + IGNORE_NSEXCEPTION(ourFile->Clone (getter_AddRefs (cloneFile))); @@ -677 +677 @@ - return NS_OK; + return; @@ -680 +680 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -683 +683 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -690,3 +690,5 @@ - nsresult rv = Get(prop, NS_GET_IID(nsIFile), getter_AddRefs(value)); - if (NS_FAILED(rv)) - return NS_OK; + try { + Get(prop, NS_GET_IID(nsIFile), getter_AddRefs(value)); + } + catch (nsexception &exc) return; + @@ -699 +699 @@ - return rv; + throw nsexception(rv); @@ -702 +702 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -707 +707 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -709 +709 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -712 +712 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -715 +715 @@ - return mProviders->AppendElement(supports) ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(mProviders->AppendElement(supports) ? NS_OK : NS_ERROR_FAILURE); @@ -727,2 +727,2 @@ - catman->EnumerateCategory(XPCOM_DIRECTORY_PROVIDER_CATEGORY, - getter_AddRefs(entries)); + IGNORE_NSEXCEPTION(catman->EnumerateCategory(XPCOM_DIRECTORY_PROVIDER_CATEGORY, + getter_AddRefs(entries))); @@ -737 +737 @@ - strings->GetNext(entry); + IGNORE_NSEXCEPTION(strings->GetNext(entry)); @@ -740 +740 @@ - catman->GetCategoryEntry(XPCOM_DIRECTORY_PROVIDER_CATEGORY, entry.get(), getter_Copies(contractID)); + IGNORE_NSEXCEPTION(catman->GetCategoryEntry(XPCOM_DIRECTORY_PROVIDER_CATEGORY, entry.get(), getter_Copies(contractID))); @@ -745 +745 @@ - RegisterProvider(provider); + IGNORE_NSEXCEPTION(RegisterProvider(provider)); @@ -750 +750 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -755 +755 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -757 +757 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -760 +760 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -763 +763 @@ - return mProviders->RemoveElement(supports) ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(mProviders->RemoveElement(supports) ? NS_OK : NS_ERROR_FAILURE); @@ -771 +771 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -787 +787,3 @@ - rv = GetCurrentProcessDirectory(getter_AddRefs(localFile)); + try { + GetCurrentProcessDirectory(getter_AddRefs(localFile)); + } @@ -791 +791,3 @@ - rv = GetCurrentProcessDirectory(getter_AddRefs(localFile)); + try { + GetCurrentProcessDirectory(getter_AddRefs(localFile)); + } @@ -793 +793 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -795,2 +795,2 @@ - localFile->AppendNative(COMPONENT_DIRECTORY); - localFile->AppendNative(COMPONENT_REGISTRY_NAME); + IGNORE_NSEXCEPTION(localFile->AppendNative(COMPONENT_DIRECTORY)); + IGNORE_NSEXCEPTION(localFile->AppendNative(COMPONENT_REGISTRY_NAME)); @@ -800 +800,3 @@ - rv = GetCurrentProcessDirectory(getter_AddRefs(localFile)); + try { + GetCurrentProcessDirectory(getter_AddRefs(localFile)); + } @@ -802 +802 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -804,2 +804,2 @@ - localFile->AppendNative(COMPONENT_DIRECTORY); - localFile->AppendNative(XPTI_REGISTRY_NAME); + IGNORE_NSEXCEPTION(localFile->AppendNative(COMPONENT_DIRECTORY)); + IGNORE_NSEXCEPTION(localFile->AppendNative(XPTI_REGISTRY_NAME)); @@ -812 +812,3 @@ - rv = GetCurrentProcessDirectory(getter_AddRefs(localFile)); + try { + GetCurrentProcessDirectory(getter_AddRefs(localFile)); + } @@ -819 +819,3 @@ - rv = Get(NS_GRE_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localFile)); + try { + Get(NS_GRE_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localFile)); + } @@ -821 +821 @@ - localFile->AppendNative(COMPONENT_DIRECTORY); + IGNORE_NSEXCEPTION(localFile->AppendNative(COMPONENT_DIRECTORY)); @@ -825 +825,3 @@ - rv = GetCurrentProcessDirectory(getter_AddRefs(localFile)); + try { + GetCurrentProcessDirectory(getter_AddRefs(localFile)); + } @@ -827 +827 @@ - localFile->AppendNative(COMPONENT_DIRECTORY); + IGNORE_NSEXCEPTION(localFile->AppendNative(COMPONENT_DIRECTORY)); @@ -831 +831,3 @@ - rv = GetSpecialSystemDirectory(OS_DriveDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(OS_DriveDirectory, getter_AddRefs(localFile)); + } @@ -835 +835,3 @@ - rv = GetSpecialSystemDirectory(OS_TemporaryDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(OS_TemporaryDirectory, getter_AddRefs(localFile)); + } @@ -839 +839,3 @@ - rv = GetSpecialSystemDirectory(OS_CurrentProcessDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(OS_CurrentProcessDirectory, getter_AddRefs(localFile)); + } @@ -843 +843,3 @@ - rv = GetSpecialSystemDirectory(OS_CurrentWorkingDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(OS_CurrentWorkingDirectory, getter_AddRefs(localFile)); + } @@ -1143 +1143,3 @@ - rv = GetSpecialSystemDirectory(Unix_LocalDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(Unix_LocalDirectory, getter_AddRefs(localFile)); + } @@ -1147 +1147,3 @@ - rv = GetSpecialSystemDirectory(Unix_LibDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(Unix_LibDirectory, getter_AddRefs(localFile)); + } @@ -1151 +1151,3 @@ - rv = GetSpecialSystemDirectory(Unix_HomeDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(Unix_HomeDirectory, getter_AddRefs(localFile)); + } @@ -1155 +1155,3 @@ - rv = GetSpecialSystemDirectory(Unix_DesktopDirectory, getter_AddRefs(localFile)); + try { + GetSpecialSystemDirectory(Unix_DesktopDirectory, getter_AddRefs(localFile)); + } @@ -1197 +1197 @@ - return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval); + return /*thower*/ localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval); @@ -1201 +1201 @@ - return rv; + throw nsexception(rv); @@ -1204 +1204 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1210 +1210 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); --- xpcom/io/nsDirectoryService.h +++ xpcom/io/nsDirectoryService.h @@ -72 +72 @@ - static nsresult RealInit(); + static void RealInit(); @@ -75 +75 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -81 +81 @@ - nsresult GetCurrentProcessDirectory(nsILocalFile** aFile); + void GetCurrentProcessDirectory(nsILocalFile** aFile); --- xpcom/io/nsDirectoryServiceUtils.h +++ xpcom/io/nsDirectoryServiceUtils.h @@ -49,2 +49 @@ -inline nsresult -NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result) +inline void NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result) @@ -54,2 +54 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -57 +57 @@ - return serv->Get(specialDirName, NS_GET_IID(nsIFile), + return /*thower*/ serv->Get(specialDirName, NS_GET_IID(nsIFile), --- xpcom/io/nsFastLoadFile.cpp +++ xpcom/io/nsFastLoadFile.cpp @@ -270,2 +270 @@ -nsresult -nsFastLoadFileReader::ReadHeader(nsFastLoadHeader *aHeader) +void nsFastLoadFileReader::ReadHeader(nsFastLoadHeader *aHeader) @@ -276,3 +276,4 @@ - rv = Read(reinterpret_cast(aHeader), sizeof *aHeader, &bytesRead); - if (NS_FAILED(rv)) - return rv; + try { + Read(reinterpret_cast(aHeader), sizeof *aHeader, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -282 +282 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -290 +290 @@ - return NS_OK; + return; @@ -295 +295 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -299 +299 @@ - return NS_OK; + return; @@ -302 +302 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -306 +306 @@ - return NS_OK; + return; @@ -386 +386 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -395 +395 @@ - return NS_OK; + return; @@ -398 +398 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -409 +409 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -416,2 +416 @@ - if (!uriMapEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -422 +422 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -430 +430 @@ - return NS_OK; + return; @@ -433 +433 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -449 +449 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -459,3 +459,4 @@ - rv = Tell(&prevDocMapEntry->mSaveOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Tell(&prevDocMapEntry->mSaveOffset)); + } + catch (nsexception &exc) { throw; } @@ -497 +497 @@ - return NS_OK; + return; @@ -500 +500 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -512 +512 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -527 +527 @@ - return NS_OK; + return; @@ -530 +530 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -539,4 +539,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - entry->mSaveOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + entry->mSaveOffset); + } + catch (nsexception &exc) { throw; } @@ -556 +556 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -558,4 +558,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - entry->mNextSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + entry->mNextSegmentOffset); + } + catch (nsexception &exc) { throw; } @@ -566 +566,3 @@ - rv = Read32(&entry->mNextSegmentOffset); + try { + wrap_nsexception(Read32(&entry->mNextSegmentOffset)); + } @@ -569 +569,3 @@ - rv = Read32(&bytesLeft); + try { + wrap_nsexception(Read32(&bytesLeft)); + } @@ -574,2 +574 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -582 +582,3 @@ - rv = nsBinaryInputStream::Read(aBuffer, aCount, aBytesRead); + try { + wrap_nsexception(nsBinaryInputStream::Read(aBuffer, aCount, aBytesRead)); + } @@ -594 +594 @@ - return rv; + throw nsexception(rv); @@ -597 +597 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -606,2 +606,4 @@ - nsresult rv = nsBinaryInputStream::ReadSegments(aWriter, aClosure, aCount, - aResult); + try { + wrap_nsexception(nsBinaryInputStream::ReadSegments(aWriter, aClosure, aCount, + aResult)); + } @@ -619 +619 @@ - return rv; + throw nsexception(rv); @@ -622 +622 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -625 +625,3 @@ - nsresult rv = nsBinaryInputStream::SetInputStream(aInputStream); + try { + wrap_nsexception(nsBinaryInputStream::SetInputStream(aInputStream)); + } @@ -629 +629 @@ - return rv; + throw nsexception(rv); @@ -637 +637 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -644,3 +644,4 @@ - nsresult rv = seekable->Tell(&saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Tell(&saveOffset); + } + catch (nsexception &exc) { throw; } @@ -649,3 +649,4 @@ - rv = mBufferAccess->GetUnbufferedStream(getter_AddRefs(stream)); - if (NS_FAILED(rv)) - return rv; + try { + mBufferAccess->GetUnbufferedStream(getter_AddRefs(stream)); + } + catch (nsexception &exc) { throw; } @@ -655 +655 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -658,3 +658,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0); + } + catch (nsexception &exc) { throw; } @@ -666,3 +666,4 @@ - rv = stream->Read(buf, rem, &len); - if (NS_FAILED(rv)) - return rv; + try { + stream->Read(buf, rem, &len); + } + catch (nsexception &exc) { throw; } @@ -670 +670 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -672,3 +672,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_CUR, 4); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_CUR, 4); + } + catch (nsexception &exc) { throw; } @@ -689,2 +689 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -699,3 +699,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); + } + catch (nsexception &exc) { throw; } @@ -704 +704 @@ - return NS_OK; + return; @@ -707 +707 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -710 +710 @@ - return NS_NewArrayEnumerator(aDependencies, mFooter.mDependencies); + return /*thower*/ NS_NewArrayEnumerator(aDependencies, mFooter.mDependencies); @@ -713,2 +713 @@ -nsresult -nsFastLoadFileReader::ReadFooter(nsFastLoadFooter *aFooter) +void nsFastLoadFileReader::ReadFooter(nsFastLoadFooter *aFooter) @@ -718,3 +718,4 @@ - rv = ReadFooterPrefix(aFooter); - if (NS_FAILED(rv)) - return rv; + try { + ReadFooterPrefix(aFooter); + } + catch (nsexception &exc) { throw; } @@ -723,2 +723 @@ - if (!aFooter->mIDMap) - return NS_ERROR_OUT_OF_MEMORY; + @@ -728,3 +728,4 @@ - rv = ReadSlowID(&aFooter->mIDMap[i]); - if (NS_FAILED(rv)) - return rv; + try { + ReadSlowID(&aFooter->mIDMap[i]); + } + catch (nsexception &exc) { throw; } @@ -734,2 +734 @@ - if (!aFooter->mObjectMap) - return NS_ERROR_OUT_OF_MEMORY; + @@ -740,3 +740,4 @@ - rv = ReadSharpObjectInfo(entry); - if (NS_FAILED(rv)) - return rv; + try { + ReadSharpObjectInfo(entry); + } + catch (nsexception &exc) { throw; } @@ -754 +754 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -761 +761 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -767,3 +767,4 @@ - rv = ReadMuxedDocumentInfo(&info); - if (NS_FAILED(rv)) - return rv; + try { + ReadMuxedDocumentInfo(&info); + } + catch (nsexception &exc) { throw; } @@ -778 +778 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -792,3 +792,4 @@ - rv = NS_NewISupportsArray(getter_AddRefs(readDeps)); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewISupportsArray(getter_AddRefs(readDeps)); + } + catch (nsexception &exc) { throw; } @@ -798,3 +798,4 @@ - rv = ReadCString(filename); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(ReadCString(filename)); + } + catch (nsexception &exc) { throw; } @@ -803,3 +803,4 @@ - rv = Read64(reinterpret_cast(&fastLoadMtime)); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read64(reinterpret_cast(&fastLoadMtime))); + } + catch (nsexception &exc) { throw; } @@ -808,3 +808,4 @@ - rv = NS_NewNativeLocalFile(filename, PR_TRUE, getter_AddRefs(file)); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewNativeLocalFile(filename, PR_TRUE, getter_AddRefs(file)); + } + catch (nsexception &exc) { throw; } @@ -813,3 +813,4 @@ - rv = file->GetLastModifiedTime(¤tMtime); - if (NS_FAILED(rv)) - return rv; + try { + file->GetLastModifiedTime(¤tMtime); + } + catch (nsexception &exc) { throw; } @@ -820 +820 @@ - file->GetNativePath(path); + IGNORE_NSEXCEPTION(file->GetNativePath(path)); @@ -824 +824 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -827,3 +827,4 @@ - rv = readDeps->AppendElement(file); - if (NS_FAILED(rv)) - return rv; + try { + readDeps->AppendElement(file); + } + catch (nsexception &exc) { throw; } @@ -833 +833 @@ - return NS_OK; + return; @@ -836,2 +836 @@ -nsresult -nsFastLoadFileReader::ReadFooterPrefix(nsFastLoadFooterPrefix *aFooterPrefix) +void nsFastLoadFileReader::ReadFooterPrefix(nsFastLoadFooterPrefix *aFooterPrefix) @@ -841,3 +841,4 @@ - rv = Read32(&aFooterPrefix->mNumIDs); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aFooterPrefix->mNumIDs)); + } + catch (nsexception &exc) { throw; } @@ -845,3 +845,4 @@ - rv = Read32(&aFooterPrefix->mNumSharpObjects); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aFooterPrefix->mNumSharpObjects)); + } + catch (nsexception &exc) { throw; } @@ -849,3 +849,4 @@ - rv = Read32(&aFooterPrefix->mNumMuxedDocuments); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aFooterPrefix->mNumMuxedDocuments)); + } + catch (nsexception &exc) { throw; } @@ -853,3 +853,4 @@ - rv = Read32(&aFooterPrefix->mNumDependencies); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aFooterPrefix->mNumDependencies)); + } + catch (nsexception &exc) { throw; } @@ -857 +857 @@ - return NS_OK; + return; @@ -860,2 +860 @@ -nsresult -nsFastLoadFileReader::ReadSlowID(nsID *aID) +void nsFastLoadFileReader::ReadSlowID(nsID *aID) @@ -865,3 +865,4 @@ - rv = Read32(&aID->m0); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aID->m0)); + } + catch (nsexception &exc) { throw; } @@ -869,3 +869,4 @@ - rv = Read16(&aID->m1); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read16(&aID->m1)); + } + catch (nsexception &exc) { throw; } @@ -873,3 +873,4 @@ - rv = Read16(&aID->m2); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read16(&aID->m2)); + } + catch (nsexception &exc) { throw; } @@ -878,3 +878,4 @@ - rv = Read(reinterpret_cast(aID->m3), sizeof aID->m3, &bytesRead); - if (NS_FAILED(rv)) - return rv; + try { + Read(reinterpret_cast(aID->m3), sizeof aID->m3, &bytesRead); + } + catch (nsexception &exc) { throw; } @@ -883,2 +883,2 @@ - return NS_ERROR_FAILURE; - return NS_OK; + throw nsexception(NS_ERROR_FAILURE); + return; @@ -887,2 +887 @@ -nsresult -nsFastLoadFileReader::ReadFastID(NSFastLoadID *aID) +void nsFastLoadFileReader::ReadFastID(NSFastLoadID *aID) @@ -890 +890,3 @@ - nsresult rv = Read32(aID); + try { + wrap_nsexception(Read32(aID)); + } @@ -893 +893 @@ - return rv; + throw nsexception(rv); @@ -896,2 +896 @@ -nsresult -nsFastLoadFileReader::ReadSharpObjectInfo(nsFastLoadSharpObjectInfo *aInfo) +void nsFastLoadFileReader::ReadSharpObjectInfo(nsFastLoadSharpObjectInfo *aInfo) @@ -901,3 +901,4 @@ - rv = Read32(&aInfo->mCIDOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aInfo->mCIDOffset)); + } + catch (nsexception &exc) { throw; } @@ -908,3 +908,4 @@ - rv = Read16(&aInfo->mStrongRefCnt); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read16(&aInfo->mStrongRefCnt)); + } + catch (nsexception &exc) { throw; } @@ -912,3 +912,4 @@ - rv = Read16(&aInfo->mWeakRefCnt); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read16(&aInfo->mWeakRefCnt)); + } + catch (nsexception &exc) { throw; } @@ -916 +916 @@ - return NS_OK; + return; @@ -919,2 +919 @@ -nsresult -nsFastLoadFileReader::ReadMuxedDocumentInfo(nsFastLoadMuxedDocumentInfo *aInfo) +void nsFastLoadFileReader::ReadMuxedDocumentInfo(nsFastLoadMuxedDocumentInfo *aInfo) @@ -925,3 +925,4 @@ - rv = ReadCString(spec); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(ReadCString(spec)); + } + catch (nsexception &exc) { throw; } @@ -929,3 +929,4 @@ - rv = Read32(&aInfo->mInitialSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&aInfo->mInitialSegmentOffset)); + } + catch (nsexception &exc) { throw; } @@ -934 +934 @@ - return NS_OK; + return; @@ -937,2 +937 @@ -nsresult -nsFastLoadFileReader::Open() +void nsFastLoadFileReader::Open() @@ -944 +944 @@ - mBufferAccess->DisableBuffering(); + IGNORE_NSEXCEPTION(mBufferAccess->DisableBuffering()); @@ -946 +946,3 @@ - rv = ReadHeader(&mHeader); + try { + ReadHeader(&mHeader); + } @@ -949,3 +949,2 @@ - mBufferAccess->EnableBuffering(); - if (NS_FAILED(rv)) - return rv; + IGNORE_NSEXCEPTION(mBufferAccess->EnableBuffering()); + catch (nsexception &exc) { throw; } @@ -954 +954 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -956 +956 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -958,3 +958,4 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_END, 0); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_END, 0); + } + catch (nsexception &exc) { throw; } @@ -963,3 +963,4 @@ - rv = mSeekableInput->Tell(&fileSize); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Tell(&fileSize); + } + catch (nsexception &exc) { throw; } @@ -971 +971 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -973,4 +973,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - PRInt32(mHeader.mFooterOffset)); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + PRInt32(mHeader.mFooterOffset)); + } + catch (nsexception &exc) { throw; } @@ -978,3 +978,4 @@ - rv = ReadFooter(&mFooter); - if (NS_FAILED(rv)) - return rv; + try { + ReadFooter(&mFooter); + } + catch (nsexception &exc) { throw; } @@ -982 +982 @@ - return mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + return /*thower*/ mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, @@ -986 +986 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1004 +1004 @@ - return mInputStream->Close(); + return /*thower*/ mInputStream->Close(); @@ -1007,2 +1007 @@ -nsresult -nsFastLoadFileReader::DeserializeObject(nsISupports* *aObject) +void nsFastLoadFileReader::DeserializeObject(nsISupports* *aObject) @@ -1013,3 +1013,4 @@ - rv = ReadFastID(&fastCID); - if (NS_FAILED(rv)) - return rv; + try { + ReadFastID(&fastCID); + } + catch (nsexception &exc) { throw; } @@ -1019,2 +1019 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1024 +1024 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1026,3 +1026,4 @@ - rv = serializable->Read(this); - if (NS_FAILED(rv)) - return rv; + try { + serializable->Read(this); + } + catch (nsexception &exc) { throw; } @@ -1032 +1032 @@ - return NS_OK; + return; @@ -1035,2 +1035 @@ -nsresult -nsFastLoadFileReader::ReadObject(PRBool aIsStrongRef, nsISupports* *aObject) +void nsFastLoadFileReader::ReadObject(PRBool aIsStrongRef, nsISupports* *aObject) @@ -1041,3 +1041,4 @@ - rv = Read32(&oid); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Read32(&oid)); + } + catch (nsexception &exc) { throw; } @@ -1052,3 +1052,4 @@ - rv = DeserializeObject(getter_AddRefs(object)); - if (NS_FAILED(rv)) - return rv; + try { + DeserializeObject(getter_AddRefs(object)); + } + catch (nsexception &exc) { throw; } @@ -1068,3 +1068,4 @@ - rv = mSeekableInput->Tell(&saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Tell(&saveOffset); + } + catch (nsexception &exc) { throw; } @@ -1088,4 +1088,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - entry->mCIDOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + entry->mCIDOffset); + } + catch (nsexception &exc) { throw; } @@ -1094,3 +1094,4 @@ - rv = DeserializeObject(getter_AddRefs(object)); - if (NS_FAILED(rv)) - return rv; + try { + DeserializeObject(getter_AddRefs(object)); + } + catch (nsexception &exc) { throw; } @@ -1101,3 +1101,4 @@ - rv = mSeekableInput->Tell(&entry->mSkipOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Tell(&entry->mSkipOffset); + } + catch (nsexception &exc) { throw; } @@ -1108,4 +1108,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + saveOffset); + } + catch (nsexception &exc) { throw; } @@ -1129,3 +1129,4 @@ - rv = mSeekableInput->Tell(¤tOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Tell(¤tOffset); + } + catch (nsexception &exc) { throw; } @@ -1142,4 +1142,5 @@ - rv = mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, - entry->mSkipOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableInput->Seek(nsISeekableStream::NS_SEEK_SET, + entry->mSkipOffset); + } + catch (nsexception &exc) { throw; } @@ -1165,3 +1165,4 @@ - rv = ReadFastID(&iid); - if (NS_FAILED(rv)) - return rv; + try { + ReadFastID(&iid); + } + catch (nsexception &exc) { throw; } @@ -1169,4 +1169,5 @@ - rv = object->QueryInterface(mFooter.GetID(iid), - reinterpret_cast(aObject)); - if (NS_FAILED(rv)) - return rv; + try { + object->QueryInterface(mFooter.GetID(iid), + reinterpret_cast(aObject)); + } + catch (nsexception &exc) { throw; } @@ -1178 +1178 @@ - return NS_OK; + return; @@ -1181 +1181 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1187,3 +1187,4 @@ - rv = ReadFastID(&fastID); - if (NS_FAILED(rv)) - return rv; + try { + ReadFastID(&fastID); + } + catch (nsexception &exc) { throw; } @@ -1192 +1192 @@ - return NS_OK; + return; @@ -1195 +1195 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1199 +1199 @@ - return mSeekableInput->Seek(aWhence, aOffset); + return /*thower*/ mSeekableInput->Seek(aWhence, aOffset); @@ -1202 +1202 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1205 +1205 @@ - return mSeekableInput->Tell(aResult); + return /*thower*/ mSeekableInput->Tell(aResult); @@ -1208 +1208 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1211 +1211 @@ - return mSeekableInput->SetEOF(); + return /*thower*/ mSeekableInput->SetEOF(); @@ -1214,2 +1214 @@ -NS_COM nsresult -NS_NewFastLoadFileReader(nsIObjectInputStream* *aResult, +NS_COM void NS_NewFastLoadFileReader(nsIObjectInputStream* *aResult, @@ -1219,2 +1219 @@ - if (!reader) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1225,3 +1225,4 @@ - nsresult rv = reader->Open(); - if (NS_FAILED(rv)) - return rv; + try { + reader->Open(); + } + catch (nsexception &exc) { throw; } @@ -1231 +1231 @@ - return NS_OK; + return; @@ -1278,2 +1278 @@ -nsresult -nsFastLoadFileWriter::MapID(const nsID& aSlowID, NSFastLoadID *aResult) +void nsFastLoadFileWriter::MapID(const nsID& aSlowID, NSFastLoadID *aResult) @@ -1284,2 +1284 @@ - if (!entry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1293 +1293 @@ - return NS_OK; + return; @@ -1296,2 +1296 @@ -nsresult -nsFastLoadFileWriter::WriteHeader(nsFastLoadHeader *aHeader) +void nsFastLoadFileWriter::WriteHeader(nsFastLoadHeader *aHeader) @@ -1302,3 +1302,4 @@ - rv = Write(aHeader->mMagic, MFL_FILE_MAGIC_SIZE, &bytesWritten); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write(aHeader->mMagic, MFL_FILE_MAGIC_SIZE, &bytesWritten)); + } + catch (nsexception &exc) { throw; } @@ -1307 +1307 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1309,3 +1309,4 @@ - rv = Write32(aHeader->mChecksum); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aHeader->mChecksum)); + } + catch (nsexception &exc) { throw; } @@ -1313,3 +1313,4 @@ - rv = Write32(aHeader->mVersion); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aHeader->mVersion)); + } + catch (nsexception &exc) { throw; } @@ -1317,3 +1317,4 @@ - rv = Write32(aHeader->mFooterOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aHeader->mFooterOffset)); + } + catch (nsexception &exc) { throw; } @@ -1321,3 +1321,4 @@ - rv = Write32(aHeader->mFileSize); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aHeader->mFileSize)); + } + catch (nsexception &exc) { throw; } @@ -1325 +1325 @@ - return NS_OK; + return; @@ -1330 +1330 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1334 +1334 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -1336 +1336 @@ - return NS_OK; + return; @@ -1339 +1339 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1343 +1343 @@ - return NS_OK; + return; @@ -1360 +1360 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1369 +1369 @@ - return NS_OK; + return; @@ -1372 +1372 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1387,2 +1387 @@ - if (!docMapEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1406 +1406 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1409,2 +1409 @@ - if (!spec) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1419,2 +1419 @@ - if (!uriMapEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1425 +1425 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1433 +1433 @@ - return NS_OK; + return; @@ -1436 +1436 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1443,3 +1443,4 @@ - rv = mSeekableOutput->Tell(¤tSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Tell(¤tSegmentOffset); + } + catch (nsexception &exc) { throw; } @@ -1456 +1456 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1484 +1484 @@ - return NS_OK; + return; @@ -1491,4 +1491,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - prevSegmentOffset + 4); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + prevSegmentOffset + 4); + } + catch (nsexception &exc) { throw; } @@ -1498,3 +1498,4 @@ - rv = Write32(currentSegmentOffset32 - prevSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(currentSegmentOffset32 - prevSegmentOffset)); + } + catch (nsexception &exc) { throw; } @@ -1506,4 +1506,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - currentSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + currentSegmentOffset); + } + catch (nsexception &exc) { throw; } @@ -1519,4 +1519,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - docMapEntry->mCurrentSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + docMapEntry->mCurrentSegmentOffset); + } + catch (nsexception &exc) { throw; } @@ -1524,3 +1524,4 @@ - rv = Write32(currentSegmentOffset32); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(currentSegmentOffset32)); + } + catch (nsexception &exc) { throw; } @@ -1528,4 +1528,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - currentSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + currentSegmentOffset); + } + catch (nsexception &exc) { throw; } @@ -1539,3 +1539,4 @@ - rv = Write32(0); // nextSegmentOffset placeholder - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(0)); + } // nextSegmentOffset placeholder + catch (nsexception &exc) { throw; } @@ -1543,3 +1543,4 @@ - rv = Write32(0); // length placeholder - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(0)); + } // length placeholder + catch (nsexception &exc) { throw; } @@ -1553 +1553 @@ - return NS_OK; + return; @@ -1556 +1556 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1569 +1569 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1585 +1585 @@ - return NS_OK; + return; @@ -1592 +1592 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1596,3 +1596,4 @@ - nsresult rv = aFile->GetNativePath(path); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(path); + } + catch (nsexception &exc) { throw; } @@ -1604,2 +1604 @@ - if (!entry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1609,2 +1609 @@ - if (!tmp) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1620,5 +1620,7 @@ - rv = aFile->GetLastModifiedTime(&entry->mLastModified); - if (NS_FAILED(rv)) { - PL_DHashTableOperate(&mDependencyMap, path.get(), PL_DHASH_REMOVE); - rv = NS_OK; - } + try { + aFile->GetLastModifiedTime(&entry->mLastModified); + } + catch (nsexception &exc) { + PL_DHashTableOperate(&mDependencyMap, path.get(), PL_DHASH_REMOVE); + rv = NS_OK; + } @@ -1626 +1626 @@ - return rv; + throw nsexception(rv); @@ -1629,2 +1629 @@ -nsresult -nsFastLoadFileWriter::WriteFooterPrefix(const nsFastLoadFooterPrefix& aFooterPrefix) +void nsFastLoadFileWriter::WriteFooterPrefix(const nsFastLoadFooterPrefix& aFooterPrefix) @@ -1634,3 +1634,4 @@ - rv = Write32(aFooterPrefix.mNumIDs); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aFooterPrefix.mNumIDs)); + } + catch (nsexception &exc) { throw; } @@ -1638,3 +1638,4 @@ - rv = Write32(aFooterPrefix.mNumSharpObjects); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aFooterPrefix.mNumSharpObjects)); + } + catch (nsexception &exc) { throw; } @@ -1642,3 +1642,4 @@ - rv = Write32(aFooterPrefix.mNumMuxedDocuments); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aFooterPrefix.mNumMuxedDocuments)); + } + catch (nsexception &exc) { throw; } @@ -1646,3 +1646,4 @@ - rv = Write32(aFooterPrefix.mNumDependencies); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aFooterPrefix.mNumDependencies)); + } + catch (nsexception &exc) { throw; } @@ -1650 +1650 @@ - return NS_OK; + return; @@ -1653,2 +1653 @@ -nsresult -nsFastLoadFileWriter::WriteSlowID(const nsID& aID) +void nsFastLoadFileWriter::WriteSlowID(const nsID& aID) @@ -1658,3 +1658,4 @@ - rv = Write32(aID.m0); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aID.m0)); + } + catch (nsexception &exc) { throw; } @@ -1662,3 +1662,4 @@ - rv = Write16(aID.m1); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write16(aID.m1)); + } + catch (nsexception &exc) { throw; } @@ -1666,3 +1666,4 @@ - rv = Write16(aID.m2); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write16(aID.m2)); + } + catch (nsexception &exc) { throw; } @@ -1671,4 +1671,5 @@ - rv = Write(reinterpret_cast(aID.m3), sizeof aID.m3, - &bytesWritten); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write(reinterpret_cast(aID.m3), sizeof aID.m3, + &bytesWritten)); + } + catch (nsexception &exc) { throw; } @@ -1677,2 +1677,2 @@ - return NS_ERROR_FAILURE; - return NS_OK; + throw nsexception(NS_ERROR_FAILURE); + return; @@ -1681,2 +1681 @@ -nsresult -nsFastLoadFileWriter::WriteFastID(NSFastLoadID aID) +void nsFastLoadFileWriter::WriteFastID(NSFastLoadID aID) @@ -1684 +1684 @@ - return Write32(aID ^ MFL_ID_XOR_KEY); + return wrap_nsexception(Write32(aID ^ MFL_ID_XOR_KEY)); @@ -1687,2 +1687 @@ -nsresult -nsFastLoadFileWriter::WriteSharpObjectInfo(const nsFastLoadSharpObjectInfo& aInfo) +void nsFastLoadFileWriter::WriteSharpObjectInfo(const nsFastLoadSharpObjectInfo& aInfo) @@ -1695,3 +1695,4 @@ - rv = Write32(aInfo.mCIDOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aInfo.mCIDOffset)); + } + catch (nsexception &exc) { throw; } @@ -1699,3 +1699,4 @@ - rv = Write16(aInfo.mStrongRefCnt); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write16(aInfo.mStrongRefCnt)); + } + catch (nsexception &exc) { throw; } @@ -1703,3 +1703,4 @@ - rv = Write16(aInfo.mWeakRefCnt); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write16(aInfo.mWeakRefCnt)); + } + catch (nsexception &exc) { throw; } @@ -1707 +1707 @@ - return NS_OK; + return; @@ -1710,2 +1710 @@ -nsresult -nsFastLoadFileWriter::WriteMuxedDocumentInfo(const nsFastLoadMuxedDocumentInfo& aInfo) +void nsFastLoadFileWriter::WriteMuxedDocumentInfo(const nsFastLoadMuxedDocumentInfo& aInfo) @@ -1715,3 +1715,4 @@ - rv = WriteStringZ(aInfo.mURISpec); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(WriteStringZ(aInfo.mURISpec)); + } + catch (nsexception &exc) { throw; } @@ -1719,3 +1719,4 @@ - rv = Write32(aInfo.mInitialSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(aInfo.mInitialSegmentOffset)); + } + catch (nsexception &exc) { throw; } @@ -1723 +1723 @@ - return NS_OK; + return; @@ -1808,2 +1808 @@ -nsresult -nsFastLoadFileWriter::WriteFooter() +void nsFastLoadFileWriter::WriteFooter() @@ -1820,3 +1820,4 @@ - rv = WriteFooterPrefix(footerPrefix); - if (NS_FAILED(rv)) - return rv; + try { + WriteFooterPrefix(footerPrefix); + } + catch (nsexception &exc) { throw; } @@ -1826,2 +1826 @@ - if (!idvec) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1832,2 +1832,4 @@ - rv = WriteSlowID(idvec[i]); - if (NS_FAILED(rv)) break; + try { + WriteSlowID(idvec[i]); + } + catch (nsexception &exc) break; @@ -1837,2 +1837 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1843,2 +1843 @@ - if (!objvec) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1854,2 +1854,4 @@ - rv = WriteSharpObjectInfo(objvec[i]); - if (NS_FAILED(rv)) break; + try { + WriteSharpObjectInfo(objvec[i]); + } + catch (nsexception &exc) break; @@ -1859,2 +1859 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1864,2 +1864 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1872,2 +1872 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1875 +1875 @@ - return NS_OK; + return; @@ -1878,2 +1878 @@ -nsresult -nsFastLoadFileWriter::Init() +void nsFastLoadFileWriter::Init() @@ -1884 +1884 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1890 +1890 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1897 +1897 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1903 +1903 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1909 +1909 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -1912 +1912 @@ - return NS_OK; + return; @@ -1915,2 +1915 @@ -nsresult -nsFastLoadFileWriter::Open() +void nsFastLoadFileWriter::Open() @@ -1920,4 +1920,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - sizeof(nsFastLoadHeader)); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + sizeof(nsFastLoadHeader)); + } + catch (nsexception &exc) { throw; } @@ -1925 +1925 @@ - return Init(); + return /*thower*/ Init(); @@ -1928 +1928 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1938 +1938,3 @@ - rv = mSeekableOutput->Tell(&footerOffset); + try { + mSeekableOutput->Tell(&footerOffset); + } @@ -1941,2 +1941 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1949,4 +1949,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - currentSegmentOffset + 4); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + currentSegmentOffset + 4); + } + catch (nsexception &exc) { throw; } @@ -1954,3 +1954,4 @@ - rv = Write32(mHeader.mFooterOffset - currentSegmentOffset); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(mHeader.mFooterOffset - currentSegmentOffset)); + } + catch (nsexception &exc) { throw; } @@ -1959,4 +1959,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - mHeader.mFooterOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + mHeader.mFooterOffset); + } + catch (nsexception &exc) { throw; } @@ -1967,3 +1967,4 @@ - rv = WriteFooter(); - if (NS_FAILED(rv)) - return rv; + try { + WriteFooter(); + } + catch (nsexception &exc) { throw; } @@ -1971 +1971,3 @@ - rv = mSeekableOutput->Tell(&fileSize); + try { + mSeekableOutput->Tell(&fileSize); + } @@ -1973,2 +1973 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -1976,3 +1976,4 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, 0); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, 0); + } + catch (nsexception &exc) { throw; } @@ -1980,3 +1980,4 @@ - rv = WriteHeader(&mHeader); - if (NS_FAILED(rv)) - return rv; + try { + WriteHeader(&mHeader); + } + catch (nsexception &exc) { throw; } @@ -1991 +1991,3 @@ - rv = mBufferAccess->GetUnbufferedStream(getter_AddRefs(output)); + try { + mBufferAccess->GetUnbufferedStream(getter_AddRefs(output)); + } @@ -1993 +1993 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1996,3 +1996,4 @@ - rv = mFileIO->GetInputStream(getter_AddRefs(input)); - if (NS_FAILED(rv)) - return rv; + try { + mFileIO->GetInputStream(getter_AddRefs(input)); + } + catch (nsexception &exc) { throw; } @@ -2005 +2005,3 @@ - rv = bufferAccess->GetUnbufferedStream(getter_AddRefs(input)); + try { + bufferAccess->GetUnbufferedStream(getter_AddRefs(input)); + } @@ -2007 +2007 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -2012,3 +2012,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0); + } + catch (nsexception &exc) { throw; } @@ -2033,2 +2033 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -2046,4 +2046,5 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, - offsetof(nsFastLoadHeader, mChecksum)); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, + offsetof(nsFastLoadHeader, mChecksum)); + } + catch (nsexception &exc) { throw; } @@ -2054,5 +2054,6 @@ - rv = output->Write(reinterpret_cast(&checksum), - sizeof checksum, - &bytesWritten); - if (NS_FAILED(rv)) - return rv; + try { + output->Write(reinterpret_cast(&checksum), + sizeof checksum, + &bytesWritten); + } + catch (nsexception &exc) { throw; } @@ -2060 +2060 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2063 +2063 @@ - return mOutputStream->Close(); + return /*thower*/ mOutputStream->Close(); @@ -2069,2 +2069 @@ -nsresult -nsFastLoadFileWriter::WriteObjectCommon(nsISupports* aObject, +void nsFastLoadFileWriter::WriteObjectCommon(nsISupports* aObject, @@ -2103 +2103 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2110,5 +2110,7 @@ - rv = Tell(&thisOffset); - if (NS_FAILED(rv)) { - aObject->Release(); - return rv; - } + try { + wrap_nsexception(Tell(&thisOffset)); + } + catch (nsexception &exc) { + aObject->Release(); + throw nsexception(rv); + } @@ -2135 +2135 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2164,3 +2164,4 @@ - rv = Write32(oid ^ MFL_OID_XOR_KEY); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(oid ^ MFL_OID_XOR_KEY)); + } + catch (nsexception &exc) { throw; } @@ -2172 +2172 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2176,3 +2176,4 @@ - rv = classInfo->GetClassIDNoAlloc(&slowCID); - if (NS_FAILED(rv)) - return rv; + try { + classInfo->GetClassIDNoAlloc(&slowCID); + } + catch (nsexception &exc) { throw; } @@ -2181,3 +2181,4 @@ - rv = MapID(slowCID, &fastCID); - if (NS_FAILED(rv)) - return rv; + try { + MapID(slowCID, &fastCID); + } + catch (nsexception &exc) { throw; } @@ -2185,3 +2185,4 @@ - rv = WriteFastID(fastCID); - if (NS_FAILED(rv)) - return rv; + try { + WriteFastID(fastCID); + } + catch (nsexception &exc) { throw; } @@ -2189,3 +2189,4 @@ - rv = serializable->Write(this); - if (NS_FAILED(rv)) - return rv; + try { + serializable->Write(this); + } + catch (nsexception &exc) { throw; } @@ -2194 +2194 @@ - return NS_OK; + return; @@ -2197 +2197 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2207 +2207 @@ - return WriteObjectCommon(aObject, aIsStrongRef, 0); + return /*thower*/ WriteObjectCommon(aObject, aIsStrongRef, 0); @@ -2210 +2210 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2220 +2220 @@ - return WriteObjectCommon(aObject, PR_TRUE, MFL_SINGLE_REF_PSEUDO_TAG); + return /*thower*/ WriteObjectCommon(aObject, PR_TRUE, MFL_SINGLE_REF_PSEUDO_TAG); @@ -2223 +2223 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2238 +2238 @@ - rootObject->QueryInterface(aIID, getter_AddRefs(roundtrip)); + IGNORE_NSEXCEPTION(rootObject->QueryInterface(aIID, getter_AddRefs(roundtrip))); @@ -2244,3 +2244,4 @@ - rv = WriteObjectCommon(rootObject, aIsStrongRef, MFL_QUERY_INTERFACE_TAG); - if (NS_FAILED(rv)) - return rv; + try { + WriteObjectCommon(rootObject, aIsStrongRef, MFL_QUERY_INTERFACE_TAG); + } + catch (nsexception &exc) { throw; } @@ -2249,3 +2249,4 @@ - rv = MapID(aIID, &iid); - if (NS_FAILED(rv)) - return rv; + try { + MapID(aIID, &iid); + } + catch (nsexception &exc) { throw; } @@ -2253 +2253 @@ - return WriteFastID(iid); + return /*thower*/ WriteFastID(iid); @@ -2256 +2256 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2262,3 +2262,4 @@ - rv = MapID(aID, &fastID); - if (NS_FAILED(rv)) - return rv; + try { + MapID(aID, &fastID); + } + catch (nsexception &exc) { throw; } @@ -2266 +2266 @@ - return WriteFastID(fastID); + return /*thower*/ WriteFastID(fastID); @@ -2269 +2269 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2273 +2273 @@ - return mSeekableOutput->Seek(aWhence, aOffset); + return /*thower*/ mSeekableOutput->Seek(aWhence, aOffset); @@ -2276 +2276 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2279 +2279 @@ - return mSeekableOutput->Tell(aResult); + return /*thower*/ mSeekableOutput->Tell(aResult); @@ -2282 +2282 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2285 +2285 @@ - return mSeekableOutput->SetEOF(); + return /*thower*/ mSeekableOutput->SetEOF(); @@ -2288 +2288 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2291 +2291,3 @@ - nsresult rv = nsBinaryOutputStream::SetOutputStream(aStream); + try { + wrap_nsexception(nsBinaryOutputStream::SetOutputStream(aStream)); + } @@ -2293 +2293 @@ - return rv; + throw nsexception(rv); @@ -2296,2 +2296 @@ -NS_COM nsresult -NS_NewFastLoadFileWriter(nsIObjectOutputStream* *aResult, +NS_COM void NS_NewFastLoadFileWriter(nsIObjectOutputStream* *aResult, @@ -2303,2 +2303 @@ - if (!writer) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2309,3 +2309,4 @@ - nsresult rv = writer->Open(); - if (NS_FAILED(rv)) - return rv; + try { + writer->Open(); + } + catch (nsexception &exc) { throw; } @@ -2315 +2315 @@ - return NS_OK; + return; @@ -2324 +2324 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2329 +2329 @@ - return NS_OK; + return; @@ -2332 +2332 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2336 +2336 @@ - return NS_OK; + return; @@ -2371,2 +2371 @@ -nsresult -nsFastLoadFileUpdater::Open(nsFastLoadFileReader* aReader) +void nsFastLoadFileUpdater::Open(nsFastLoadFileReader* aReader) @@ -2375,3 +2375,4 @@ - rv = nsFastLoadFileWriter::Init(); - if (NS_FAILED(rv)) - return rv; + try { + nsFastLoadFileWriter::Init(); + } + catch (nsexception &exc) { throw; } @@ -2386 +2386,3 @@ - rv = MapID(readIDMap[i], &fastID); + try { + MapID(readIDMap[i], &fastID); + } @@ -2388,2 +2388 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -2419,3 +2419,4 @@ - rv = inputSeekable->Tell(&saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + inputSeekable->Tell(&saveOffset); + } + catch (nsexception &exc) { throw; } @@ -2427,4 +2427,5 @@ - rv = inputSeekable->Seek(nsISeekableStream::NS_SEEK_SET, - readEntry->mCIDOffset); - if (NS_FAILED(rv)) - return rv; + try { + inputSeekable->Seek(nsISeekableStream::NS_SEEK_SET, + readEntry->mCIDOffset); + } + catch (nsexception &exc) { throw; } @@ -2432,4 +2432,5 @@ - rv = aReader - ->DeserializeObject(getter_AddRefs(readEntry->mReadObject)); - if (NS_FAILED(rv)) - return rv; + try { + aReader + ->DeserializeObject(getter_AddRefs(readEntry->mReadObject)); + } + catch (nsexception &exc) { throw; } @@ -2453,3 +2453,4 @@ - rv = inputSeekable->Tell(&readEntry->mSkipOffset); - if (NS_FAILED(rv)) - return rv; + try { + inputSeekable->Tell(&readEntry->mSkipOffset); + } + catch (nsexception &exc) { throw; } @@ -2467,2 +2467 @@ - if (!writeEntry) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2482,3 +2482,4 @@ - rv = inputSeekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + inputSeekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); + } + catch (nsexception &exc) { throw; } @@ -2496 +2496 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2500,3 +2500,4 @@ - rv = readDeps->Count(&n); - if (NS_FAILED(rv)) - return rv; + try { + readDeps->Count(&n); + } + catch (nsexception &exc) { throw; } @@ -2506,3 +2506,4 @@ - rv = readDeps->GetElementAt(i, getter_AddRefs(file)); - if (NS_FAILED(rv)) - return rv; + try { + readDeps->GetElementAt(i, getter_AddRefs(file)); + } + catch (nsexception &exc) { throw; } @@ -2510,3 +2510,4 @@ - rv = AddDependency(file); - if (NS_FAILED(rv)) - return rv; + try { + AddDependency(file); + } + catch (nsexception &exc) { throw; } @@ -2519,4 +2519,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - offsetof(nsFastLoadHeader, mFooterOffset)); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + offsetof(nsFastLoadHeader, mFooterOffset)); + } + catch (nsexception &exc) { throw; } @@ -2524,3 +2524,4 @@ - rv = Write32(0); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(Write32(0)); + } + catch (nsexception &exc) { throw; } @@ -2528,4 +2528,5 @@ - rv = mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, - aReader->mHeader.mFooterOffset); - if (NS_FAILED(rv)) - return rv; + try { + mSeekableOutput->Seek(nsISeekableStream::NS_SEEK_SET, + aReader->mHeader.mFooterOffset); + } + catch (nsexception &exc) { throw; } @@ -2540 +2540 @@ - return NS_OK; + return; @@ -2543 +2543 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -2547 +2547,3 @@ - nsresult rv = nsFastLoadFileWriter::Close(); + try { + nsFastLoadFileWriter::Close(); + } @@ -2551 +2551 @@ - return rv; + throw nsexception(rv); @@ -2554,2 +2554 @@ -NS_COM nsresult -NS_NewFastLoadFileUpdater(nsIObjectOutputStream* *aResult, +NS_COM void NS_NewFastLoadFileUpdater(nsIObjectOutputStream* *aResult, @@ -2562 +2562 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -2565,2 +2565 @@ - if (!updater) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2571,4 +2571,5 @@ - nsresult rv = updater->Open(static_cast - (aReaderAsStream)); - if (NS_FAILED(rv)) - return rv; + try { + updater->Open(static_cast + (aReaderAsStream)); + } + catch (nsexception &exc) { throw; } @@ -2578 +2578 @@ - return NS_OK; + return; --- xpcom/io/nsFastLoadFile.h +++ xpcom/io/nsFastLoadFile.h @@ -281,2 +281,2 @@ - NS_IMETHOD ReadObject(PRBool aIsStrongRef, nsISupports* *_retval); - NS_IMETHOD ReadID(nsID *aResult); + NS_IMETHOD_(void) ReadObject(PRBool aIsStrongRef, nsISupports* *_retval); + NS_IMETHOD_(void) ReadID(nsID *aResult); @@ -294 +294 @@ - NS_IMETHOD Read(char* aBuffer, PRUint32 aCount, PRUint32 *aBytesRead); + NS_IMETHOD_(void) Read(char* aBuffer, PRUint32 aCount, PRUint32 *aBytesRead); @@ -299 +299 @@ - NS_IMETHODIMP ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, + NS_IMETHODIMP_(void) ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, @@ -303 +303 @@ - NS_IMETHOD SetInputStream(nsIInputStream* aInputStream); + NS_IMETHOD_(void) SetInputStream(nsIInputStream* aInputStream); @@ -305 +305 @@ - nsresult ReadHeader(nsFastLoadHeader *aHeader); + void ReadHeader(nsFastLoadHeader *aHeader); @@ -381,7 +381,7 @@ - nsresult ReadFooter(nsFastLoadFooter *aFooter); - nsresult ReadFooterPrefix(nsFastLoadFooterPrefix *aFooterPrefix); - nsresult ReadSlowID(nsID *aID); - nsresult ReadFastID(NSFastLoadID *aID); - nsresult ReadSharpObjectInfo(nsFastLoadSharpObjectInfo *aInfo); - nsresult ReadMuxedDocumentInfo(nsFastLoadMuxedDocumentInfo *aInfo); - nsresult DeserializeObject(nsISupports* *aObject); + void ReadFooter(nsFastLoadFooter *aFooter); + void ReadFooterPrefix(nsFastLoadFooterPrefix *aFooterPrefix); + void ReadSlowID(nsID *aID); + void ReadFastID(NSFastLoadID *aID); + void ReadSharpObjectInfo(nsFastLoadSharpObjectInfo *aInfo); + void ReadMuxedDocumentInfo(nsFastLoadMuxedDocumentInfo *aInfo); + void DeserializeObject(nsISupports* *aObject); @@ -389,2 +389,2 @@ - nsresult Open(); - NS_IMETHOD Close(); + void Open(); + NS_IMETHOD_(void) Close(); @@ -404,2 +404 @@ -NS_COM nsresult -NS_NewFastLoadFileReader(nsIObjectInputStream* *aResult, +NS_COM void NS_NewFastLoadFileReader(nsIObjectInputStream* *aResult, @@ -451,3 +451,3 @@ - NS_IMETHOD WriteObject(nsISupports* aObject, PRBool aIsStrongRef); - NS_IMETHOD WriteSingleRefObject(nsISupports* aObject); - NS_IMETHOD WriteCompoundObject(nsISupports* aObject, + NS_IMETHOD_(void) WriteObject(nsISupports* aObject, PRBool aIsStrongRef); + NS_IMETHOD_(void) WriteSingleRefObject(nsISupports* aObject); + NS_IMETHOD_(void) WriteCompoundObject(nsISupports* aObject, @@ -456 +456 @@ - NS_IMETHOD WriteID(const nsID& aID); + NS_IMETHOD_(void) WriteID(const nsID& aID); @@ -459 +459 @@ - NS_IMETHOD SetOutputStream(nsIOutputStream* aOutputStream); + NS_IMETHOD_(void) SetOutputStream(nsIOutputStream* aOutputStream); @@ -470 +470 @@ - nsresult MapID(const nsID& aSlowID, NSFastLoadID *aResult); + void MapID(const nsID& aSlowID, NSFastLoadID *aResult); @@ -472,7 +472,7 @@ - nsresult WriteHeader(nsFastLoadHeader *aHeader); - nsresult WriteFooter(); - nsresult WriteFooterPrefix(const nsFastLoadFooterPrefix& aFooterPrefix); - nsresult WriteSlowID(const nsID& aID); - nsresult WriteFastID(NSFastLoadID aID); - nsresult WriteSharpObjectInfo(const nsFastLoadSharpObjectInfo& aInfo); - nsresult WriteMuxedDocumentInfo(const nsFastLoadMuxedDocumentInfo& aInfo); + void WriteHeader(nsFastLoadHeader *aHeader); + void WriteFooter(); + void WriteFooterPrefix(const nsFastLoadFooterPrefix& aFooterPrefix); + void WriteSlowID(const nsID& aID); + void WriteFastID(NSFastLoadID aID); + void WriteSharpObjectInfo(const nsFastLoadSharpObjectInfo& aInfo); + void WriteMuxedDocumentInfo(const nsFastLoadMuxedDocumentInfo& aInfo); @@ -480,3 +480,3 @@ - nsresult Init(); - nsresult Open(); - NS_IMETHOD Close(); + void Init(); + void Open(); + NS_IMETHOD_(void) Close(); @@ -484 +484 @@ - nsresult WriteObjectCommon(nsISupports* aObject, + void WriteObjectCommon(nsISupports* aObject, @@ -528,2 +528 @@ -NS_COM nsresult -NS_NewFastLoadFileWriter(nsIObjectOutputStream* *aResult, +NS_COM void NS_NewFastLoadFileWriter(nsIObjectOutputStream* *aResult, @@ -561,2 +561,2 @@ - nsresult Open(nsFastLoadFileReader* aReader); - NS_IMETHOD Close(); + void Open(nsFastLoadFileReader* aReader); + NS_IMETHOD_(void) Close(); @@ -579,2 +579 @@ -NS_COM nsresult -NS_NewFastLoadFileUpdater(nsIObjectOutputStream* *aResult, +NS_COM void NS_NewFastLoadFileUpdater(nsIObjectOutputStream* *aResult, --- xpcom/io/nsFastLoadService.cpp +++ xpcom/io/nsFastLoadService.cpp @@ -72 +72 @@ - mInputStream->Close(); + IGNORE_NSEXCEPTION(mInputStream->Close()); @@ -74 +74 @@ - mOutputStream->Close(); + IGNORE_NSEXCEPTION(mOutputStream->Close()); @@ -82 +82 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -87 +87 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -90,2 +90 @@ - if (!fastLoadService) - return NS_ERROR_OUT_OF_MEMORY; + @@ -96 +96 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -100 +100,3 @@ - nsresult rv = fastLoadService->QueryInterface(aIID, aResult); + try { + wrap_nsexception(fastLoadService->QueryInterface(aIID, aResult)); + } @@ -102 +102 @@ - return rv; + throw nsexception(rv); @@ -105,2 +105 @@ -nsresult -nsFastLoadService::NewFastLoadFile(const char* aBaseName, nsIFile* *aResult) +void nsFastLoadService::NewFastLoadFile(const char* aBaseName, nsIFile* *aResult) @@ -113,12 +113,14 @@ - rv = NS_GetSpecialDirectory("ProfDS", - getter_AddRefs(profFile)); - if (NS_FAILED(rv)) { - // The directory service doesn't know about "ProfDS", so just ask - // for the regular profile directory key. Note, however, that this - // will fail if a profile hasn't yet been selected. - rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, - getter_AddRefs(profFile)); - if (NS_FAILED(rv)) { - return rv; - } - } + try { + NS_GetSpecialDirectory("ProfDS", + getter_AddRefs(profFile)); + } + catch (nsexception &exc) { + // The directory service doesn't know about "ProfDS", so just ask + // for the regular profile directory key. Note, however, that this + // will fail if a profile hasn't yet been selected. + try { + NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, + getter_AddRefs(profFile)); + } + catch (nsexception &exc) { throw; } + } @@ -129,10 +129,13 @@ - rv = NS_GetSpecialDirectory("ProfLDS", getter_AddRefs(file)); - if (NS_FAILED(rv)) { - // The directory service doesn't know about "ProfLDS", so just ask - // for the regular local profile directory key. Note, however, that - // this will fail if a profile hasn't yet been selected. - rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR, - getter_AddRefs(file)); - } - if (NS_FAILED(rv)) - file = profFile; + try { + NS_GetSpecialDirectory("ProfLDS", getter_AddRefs(file)); + } + catch (nsexception &exc) { + // The directory service doesn't know about "ProfLDS", so just ask + // for the regular local profile directory key. Note, however, that + // this will fail if a profile hasn't yet been selected. + try { + NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR, + getter_AddRefs(file)); + } + } + catch (nsexception &exc) file = profFile; @@ -141,3 +141,4 @@ - rv = file->Equals(profFile, &sameDir); - if (NS_FAILED(rv)) - return rv; + try { + file->Equals(profFile, &sameDir); + } + catch (nsexception &exc) { throw; } @@ -147,3 +147,4 @@ - rv = file->AppendNative(name); - if (NS_FAILED(rv)) - return rv; + try { + file->AppendNative(name); + } + catch (nsexception &exc) { throw; } @@ -155 +155,3 @@ - rv = profFile->AppendNative(name); + try { + profFile->AppendNative(name); + } @@ -157 +157 @@ - profFile->Remove(PR_FALSE); // OK if this fails + IGNORE_NSEXCEPTION(profFile->Remove(PR_FALSE)); // OK if this fails @@ -162 +162 @@ - return NS_OK; + return; @@ -165 +165 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -172,3 +172,4 @@ - nsresult rv = NS_NewFastLoadFileReader(getter_AddRefs(stream), aSrcStream); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewFastLoadFileReader(getter_AddRefs(stream), aSrcStream); + } + catch (nsexception &exc) { throw; } @@ -178 +178 @@ - return NS_OK; + return; @@ -181 +181 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -187 +187 @@ - return NS_NewFastLoadFileWriter(aResult, aDestStream, mFileIO); + return /*thower*/ NS_NewFastLoadFileWriter(aResult, aDestStream, mFileIO); @@ -190 +190 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -194 +194 @@ - return NS_OK; + return; @@ -197 +197 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -202 +202 @@ - return NS_OK; + return; @@ -205 +205 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -209 +209 @@ - return NS_OK; + return; @@ -212 +212 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -217 +217 @@ - return NS_OK; + return; @@ -220 +220 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -224 +224 @@ - return NS_OK; + return; @@ -227 +227 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -232 +232 @@ - return NS_OK; + return; @@ -235 +235 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -239 +239 @@ - return NS_OK; + return; @@ -242 +242 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -254 +254,3 @@ - rv = control->HasMuxedDocument(aURISpec, aResult); + try { + control->HasMuxedDocument(aURISpec, aResult); + } @@ -260 +260,3 @@ - rv = control->HasMuxedDocument(aURISpec, aResult); + try { + control->HasMuxedDocument(aURISpec, aResult); + } @@ -263 +263 @@ - return rv; + throw nsexception(rv); @@ -266 +266 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -281 +281,3 @@ - rv = control->StartMuxedDocument(aURI, aURISpec); + try { + control->StartMuxedDocument(aURI, aURISpec); + } @@ -283 +283 @@ - return rv; + throw nsexception(rv); @@ -289,3 +289,4 @@ - rv = mFileIO->GetOutputStream(getter_AddRefs(output)); - if (NS_FAILED(rv)) - return rv; + try { + mFileIO->GetOutputStream(getter_AddRefs(output)); + } + catch (nsexception &exc) { throw; } @@ -294,5 +294,6 @@ - rv = NS_NewFastLoadFileUpdater(getter_AddRefs(mOutputStream), - output, - mInputStream); - if (NS_FAILED(rv)) - return rv; + try { + NS_NewFastLoadFileUpdater(getter_AddRefs(mOutputStream), + output, + mInputStream); + } + catch (nsexception &exc) { throw; } @@ -304 +304 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -312 +312,3 @@ - rv = control->StartMuxedDocument(aURI, aURISpec); + try { + control->StartMuxedDocument(aURI, aURISpec); + } @@ -314 +314 @@ - return rv; + throw nsexception(rv); @@ -317 +317 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -329 +329,3 @@ - rv = control->SelectMuxedDocument(aURI, aResult); + try { + control->SelectMuxedDocument(aURI, aResult); + } @@ -338 +338,3 @@ - rv = control->SelectMuxedDocument(aURI, aResult); + try { + control->SelectMuxedDocument(aURI, aResult); + } @@ -344 +344 @@ - return rv; + throw nsexception(rv); @@ -347 +347 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -359 +359,3 @@ - rv = control->EndMuxedDocument(aURI); + try { + control->EndMuxedDocument(aURI); + } @@ -365 +365,3 @@ - rv = control->EndMuxedDocument(aURI); + try { + control->EndMuxedDocument(aURI); + } @@ -369 +369 @@ - return rv; + throw nsexception(rv); @@ -372 +372 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -379 +379 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -381 +381 @@ - return control->AddDependency(aFile); + return /*thower*/ control->AddDependency(aFile); @@ -384 +384 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -390,3 +390,4 @@ - nsresult rv = aFile->GetNativePath(path); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(path); + } + catch (nsexception &exc) { throw; } @@ -398 +398 @@ - return NS_OK; + return; @@ -401,3 +401,4 @@ - rv = aControl->ComputeChecksum(&checksum); - if (NS_FAILED(rv)) - return rv; + try { + aControl->ComputeChecksum(&checksum); + } + catch (nsexception &exc) { throw; } @@ -407 +407 @@ - return NS_OK; + return; @@ -410 +410 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -415 +415 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -418,3 +418,4 @@ - nsresult rv = control->GetChecksum(&checksum); - if (NS_FAILED(rv)) - return rv; + try { + control->GetChecksum(&checksum); + } + catch (nsexception &exc) { throw; } @@ -423,3 +423,4 @@ - rv = aFile->GetNativePath(path); - if (NS_FAILED(rv)) - return rv; + try { + aFile->GetNativePath(path); + } + catch (nsexception &exc) { throw; } @@ -429 +429 @@ - return NS_OK; + return; @@ -437 +437 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -445 +445 @@ - return NS_OK; + return; @@ -452 +452 @@ - return NS_OK; + return; @@ -457,3 +457,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, entry->mOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, entry->mOffset); + } + catch (nsexception &exc) { throw; } @@ -461,3 +461,4 @@ - rv = mInputStream->ReadObject(PR_TRUE, aPtrAddr); - if (NS_FAILED(rv)) - return rv; + try { + mInputStream->ReadObject(PR_TRUE, aPtrAddr); + } + catch (nsexception &exc) { throw; } @@ -472 +472 @@ - return NS_OK; + return; @@ -475 +475 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -482 +482 @@ - return NS_OK; + return; @@ -488,3 +488,4 @@ - rv = aInputStream->Read32(&nextOffset); - if (NS_FAILED(rv)) - return rv; + try { + aInputStream->Read32(&nextOffset); + } + catch (nsexception &exc) { throw; } @@ -494 +494 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -497,3 +497,4 @@ - rv = seekable->Tell(&thisOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Tell(&thisOffset); + } + catch (nsexception &exc) { throw; } @@ -501,3 +501,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, nextOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, nextOffset); + } + catch (nsexception &exc) { throw; } @@ -509,2 +509 @@ - if (!mFastLoadPtrMap) - return NS_ERROR_OUT_OF_MEMORY; + @@ -522 +522 @@ - return NS_OK; + return; @@ -525 +525 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -531 +531 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -538 +538 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -541,3 +541,4 @@ - rv = seekable->Tell(&saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Tell(&saveOffset); + } + catch (nsexception &exc) { throw; } @@ -545,3 +545,4 @@ - rv = aOutputStream->Write32(0); // nextOffset placeholder - if (NS_FAILED(rv)) - return rv; + try { + aOutputStream->Write32(0); + } // nextOffset placeholder + catch (nsexception &exc) { throw; } @@ -549,3 +549,4 @@ - rv = aOutputStream->WriteObject(aObject, PR_TRUE); - if (NS_FAILED(rv)) - return rv; + try { + aOutputStream->WriteObject(aObject, PR_TRUE); + } + catch (nsexception &exc) { throw; } @@ -554,3 +554,4 @@ - rv = seekable->Tell(&nextOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Tell(&nextOffset); + } + catch (nsexception &exc) { throw; } @@ -558,3 +558,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, saveOffset); + } + catch (nsexception &exc) { throw; } @@ -562,3 +562,4 @@ - rv = aOutputStream->Write32(nextOffset); - if (NS_FAILED(rv)) - return rv; + try { + aOutputStream->Write32(nextOffset); + } + catch (nsexception &exc) { throw; } @@ -566,3 +566,4 @@ - rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, nextOffset); - if (NS_FAILED(rv)) - return rv; + try { + seekable->Seek(nsISeekableStream::NS_SEEK_SET, nextOffset); + } + catch (nsexception &exc) { throw; } @@ -570 +570 @@ - return NS_OK; + return; --- xpcom/io/nsFastLoadService.h +++ xpcom/io/nsFastLoadService.h @@ -60 +60 @@ - static NS_METHOD + static NS_METHOD_(void) --- xpcom/io/nsInputStreamTee.cpp +++ xpcom/io/nsInputStreamTee.cpp @@ -56 +56 @@ - nsresult TeeSegment(const char *buf, PRUint32 count); + void TeeSegment(const char *buf, PRUint32 count); @@ -58 +58 @@ - static NS_METHOD WriteSegmentFun(nsIInputStream *, void *, const char *, + static NS_METHOD_(void) WriteSegmentFun(nsIInputStream *, void *, const char *, @@ -72,2 +72 @@ -nsresult -nsInputStreamTee::TeeSegment(const char *buf, PRUint32 count) +void nsInputStreamTee::TeeSegment(const char *buf, PRUint32 count) @@ -76 +76 @@ - return NS_OK; // nothing to do + return; // nothing to do @@ -80,10 +80,12 @@ - rv = mSink->Write(buf + bytesWritten, count, &bytesWritten); - if (NS_FAILED(rv)) { - // ok, this is not a fatal error... just drop our reference to mSink - // and continue on as if nothing happened. - NS_WARNING("Write failed (non-fatal)"); - // catch possible misuse of the input stream tee - NS_ASSERTION(rv != NS_BASE_STREAM_WOULD_BLOCK, "sink must be a blocking stream"); - mSink = 0; - break; - } + try { + mSink->Write(buf + bytesWritten, count, &bytesWritten); + } + catch (nsexception &exc) { + // ok, this is not a fatal error... just drop our reference to mSink + // and continue on as if nothing happened. + NS_WARNING("Write failed (non-fatal)"); + // catch possible misuse of the input stream tee + NS_ASSERTION(rv != NS_BASE_STREAM_WOULD_BLOCK, "sink must be a blocking stream"); + mSink = 0; + break; + } @@ -93 +93 @@ - return NS_OK; + return; @@ -96 +96 @@ -NS_METHOD +NS_METHOD_(void) @@ -102 +102,3 @@ - nsresult rv = tee->mWriter(in, tee->mClosure, fromSegment, offset, count, writeCount); + try { + tee->mWriter(in, tee->mClosure, fromSegment, offset, count, writeCount); + } @@ -106 +106 @@ - return rv; + throw nsexception(rv); @@ -109 +109 @@ - return tee->TeeSegment(fromSegment, *writeCount); + return /*thower*/ tee->TeeSegment(fromSegment, *writeCount); @@ -116 +116 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -120 +120,3 @@ - nsresult rv = mSource->Close(); + try { + mSource->Close(); + } @@ -123 +123 @@ - return rv; + throw nsexception(rv); @@ -126 +126 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -130 +130 @@ - return mSource->Available(avail); + return /*thower*/ mSource->Available(avail); @@ -133 +133 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -138 +138,3 @@ - nsresult rv = mSource->Read(buf, count, bytesRead); + try { + mSource->Read(buf, count, bytesRead); + } @@ -140 +140 @@ - return rv; + throw nsexception(rv); @@ -142 +142 @@ - return TeeSegment(buf, *bytesRead); + return /*thower*/ TeeSegment(buf, *bytesRead); @@ -145 +145 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -156 +156 @@ - return mSource->ReadSegments(WriteSegmentFun, this, count, bytesRead); + return /*thower*/ mSource->ReadSegments(WriteSegmentFun, this, count, bytesRead); @@ -159 +159 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -163 +163 @@ - return mSource->IsNonBlocking(result); + return /*thower*/ mSource->IsNonBlocking(result); @@ -166 +166 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -170 +170 @@ - return NS_OK; + return; @@ -173 +173 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -177 +177 @@ - return NS_OK; + return; @@ -180 +180 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -186 +186,3 @@ - nsresult rv = sink->IsNonBlocking(&nonBlocking); + try { + sink->IsNonBlocking(&nonBlocking); + } @@ -192 +192 @@ - return NS_OK; + return; @@ -195 +195 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -199 +199 @@ - return NS_OK; + return; @@ -204,2 +204 @@ -NS_COM nsresult -NS_NewInputStreamTee(nsIInputStream **result, +NS_COM void NS_NewInputStreamTee(nsIInputStream **result, @@ -213,2 +213 @@ - if (!tee) - return NS_ERROR_OUT_OF_MEMORY; + @@ -216,2 +216,4 @@ - rv = tee->SetSource(source); - if (NS_FAILED(rv)) return rv; + try { + tee->SetSource(source); + } + catch (nsexception &exc) { throw; } @@ -219,2 +219,4 @@ - rv = tee->SetSink(sink); - if (NS_FAILED(rv)) return rv; + try { + tee->SetSink(sink); + } + catch (nsexception &exc) { throw; } @@ -223 +223 @@ - return rv; + throw nsexception(rv); --- xpcom/io/nsLinebreakConverter.cpp +++ xpcom/io/nsLinebreakConverter.cpp @@ -362 +362 @@ -nsresult nsLinebreakConverter::ConvertLineBreaksInSitu(char **ioBuffer, ELinebreakType aSrcBreaks, +void nsLinebreakConverter::ConvertLineBreaksInSitu(char **ioBuffer, ELinebreakType aSrcBreaks, @@ -366 +366 @@ - if (!ioBuffer || !*ioBuffer) return NS_ERROR_NULL_POINTER; + if (!ioBuffer || !*ioBuffer) throw nsexception(NS_ERROR_NULL_POINTER); @@ -393 +393 @@ - if (!destBuffer) return NS_ERROR_OUT_OF_MEMORY; + @@ -399 +399 @@ - return NS_OK; + return; @@ -431 +431 @@ -nsresult nsLinebreakConverter::ConvertUnicharLineBreaksInSitu(PRUnichar **ioBuffer, +void nsLinebreakConverter::ConvertUnicharLineBreaksInSitu(PRUnichar **ioBuffer, @@ -435 +435 @@ - if (!ioBuffer || !*ioBuffer) return NS_ERROR_NULL_POINTER; + if (!ioBuffer || !*ioBuffer) throw nsexception(NS_ERROR_NULL_POINTER); @@ -461 +461 @@ - if (!destBuffer) return NS_ERROR_OUT_OF_MEMORY; + @@ -467 +467 @@ - return NS_OK; + return; @@ -474 +474 @@ -nsresult nsLinebreakConverter::ConvertStringLineBreaks(nsString& ioString, +void nsLinebreakConverter::ConvertStringLineBreaks(nsString& ioString, @@ -481 +481 @@ - if (ioString.IsEmpty()) return NS_OK; + if (ioString.IsEmpty()) return; @@ -492,4 +492,6 @@ - rv = ConvertUnicharLineBreaksInSitu(&stringBuf, - aSrcBreaks, aDestBreaks, - ioString.Length() + 1, &newLen); - if (NS_FAILED(rv)) return rv; + try { + ConvertUnicharLineBreaksInSitu(&stringBuf, + aSrcBreaks, aDestBreaks, + ioString.Length() + 1, &newLen); + } + catch (nsexception &exc) { throw; } @@ -500 +500 @@ - return NS_OK; + return; --- xpcom/io/nsLinebreakConverter.h +++ xpcom/io/nsLinebreakConverter.h @@ -112 +112 @@ - static nsresult ConvertStringLineBreaks(nsString& ioString, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks); + static void ConvertStringLineBreaks(nsString& ioString, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks); @@ -130 +130 @@ - static nsresult ConvertLineBreaksInSitu(char **ioBuffer, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks, + static void ConvertLineBreaksInSitu(char **ioBuffer, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks, @@ -148 +148 @@ - static nsresult ConvertUnicharLineBreaksInSitu(PRUnichar **ioBuffer, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks, + static void ConvertUnicharLineBreaksInSitu(PRUnichar **ioBuffer, ELinebreakType aSrcBreaks, ELinebreakType aDestBreaks, --- xpcom/io/nsLocalFile.h +++ xpcom/io/nsLocalFile.h @@ -87,2 +87 @@ -inline nsresult -nsresultForErrno(int err) +inline void nsresultForErrno(int err) @@ -92 +92 @@ - return NS_OK; + return; @@ -94 +94 @@ - return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; + throw nsexception(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST); @@ -96 +96 @@ - return NS_ERROR_FILE_DESTINATION_NOT_DIR; + throw nsexception(NS_ERROR_FILE_DESTINATION_NOT_DIR); @@ -99 +99 @@ - return NS_ERROR_FILE_UNRESOLVABLE_SYMLINK; + throw nsexception(NS_ERROR_FILE_UNRESOLVABLE_SYMLINK); @@ -102 +102 @@ - return NS_ERROR_FILE_ALREADY_EXISTS; + throw nsexception(NS_ERROR_FILE_ALREADY_EXISTS); @@ -107 +107 @@ - return NS_ERROR_FILE_ACCESS_DENIED; + throw nsexception(NS_ERROR_FILE_ACCESS_DENIED); @@ -115 +115 @@ - return NS_ERROR_FILE_DIR_NOT_EMPTY; + throw nsexception(NS_ERROR_FILE_DIR_NOT_EMPTY); @@ -118 +118 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); --- xpcom/io/nsLocalFileCommon.cpp +++ xpcom/io/nsLocalFileCommon.cpp @@ -65 +65 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -71 +71 @@ - aFile->GetNativePath(path); + IGNORE_NSEXCEPTION(aFile->GetNativePath(path)); @@ -73,2 +73,2 @@ - return NS_ERROR_INVALID_ARG; - return InitWithNativePath(path); + throw nsexception(NS_ERROR_INVALID_ARG); + return wrap_nsexception(InitWithNativePath(path)); @@ -82 +82 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -85 +85,3 @@ - nsresult rv = Create(type, attributes); + try { + wrap_nsexception(Create(type, attributes)); + } @@ -87 +87 @@ - return rv; + throw nsexception(rv); @@ -90,3 +90,4 @@ - rv = GetNativeLeafName(leafName); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(GetNativeLeafName(leafName)); + } + catch (nsexception &exc) { throw; } @@ -114 +114,3 @@ - rv = Create(type, attributes); + try { + wrap_nsexception(Create(type, attributes)); + } @@ -116 +116 @@ - return rv; + throw nsexception(rv); @@ -120 +120 @@ - return NS_ERROR_FILE_TOO_BIG; + throw nsexception(NS_ERROR_FILE_TOO_BIG); @@ -155 +155 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -172,6 +172,8 @@ - rv = GetPath(thisPath); - if (NS_FAILED(rv)) - return rv; - rv = fromFile->GetPath(fromPath); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(GetPath(thisPath)); + } + catch (nsexception &exc) { throw; } + try { + fromFile->GetPath(fromPath); + } + catch (nsexception &exc) { throw; } @@ -186 +186 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -208 +208 @@ - return NS_OK; + return; @@ -211 +211 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -217,3 +217,4 @@ - nsresult rv = fromFile->Clone(getter_AddRefs(targetFile)); - if (NS_FAILED(rv)) - return rv; + try { + fromFile->Clone(getter_AddRefs(targetFile)); + } + catch (nsexception &exc) { throw; } @@ -234,3 +234,4 @@ - rv = targetFile->GetParent(getter_AddRefs(parentDir)); - if (NS_FAILED(rv)) - return rv; + try { + targetFile->GetParent(getter_AddRefs(parentDir)); + } + catch (nsexception &exc) { throw; } @@ -238 +238 @@ - return NS_ERROR_FILE_UNRECOGNIZED_PATH; + throw nsexception(NS_ERROR_FILE_UNRECOGNIZED_PATH); @@ -249 +249 @@ - targetFile->Append(NS_ConvertUTF8toUTF16(Substring(nodeBegin, nodeEnd))); + IGNORE_NSEXCEPTION(targetFile->Append(NS_ConvertUTF8toUTF16(Substring(nodeBegin, nodeEnd)))); @@ -256 +256 @@ - return InitWithFile(targetLocalFile); + return /*thower*/ InitWithFile(targetLocalFile); --- xpcom/io/nsLocalFileUnicode.h +++ xpcom/io/nsLocalFileUnicode.h @@ -43,2 +43 @@ -extern "C" NS_EXPORT nsresult -NS_NewUnicodeLocalFile(const PRUnichar *, PRBool, nsILocalFile **); +extern "C" NS_EXPORT void NS_NewUnicodeLocalFile(const PRUnichar *, PRBool, nsILocalFile **); --- xpcom/io/nsLocalFileUnix.cpp +++ xpcom/io/nsLocalFileUnix.cpp @@ -131 +131 @@ - NS_IMETHOD Init(nsLocalFile *parent, PRBool ignored); + NS_IMETHOD_(void) Init(nsLocalFile *parent, PRBool ignored); @@ -137 +137 @@ - NS_IMETHOD GetNextEntry(); + NS_IMETHOD_(void) GetNextEntry(); @@ -157 +157 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -163 +163 @@ - return NS_ERROR_FILE_INVALID_PATH; + throw nsexception(NS_ERROR_FILE_INVALID_PATH); @@ -167 +167 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -171,2 +171,2 @@ - return NSRESULT_FOR_ERRNO(); - return GetNextEntry(); + return /*thower*/ NSRESULT_FOR_ERRNO(); + return /*thower*/ GetNextEntry(); @@ -175 +175 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -181 +181 @@ - return NS_OK; + return; @@ -184 +184 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -188,3 +188,4 @@ - nsresult rv = GetNextFile(getter_AddRefs(file)); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(GetNextFile(getter_AddRefs(file))); + } + catch (nsexception &exc) { throw; } @@ -192 +192 @@ - return NS_OK; + return; @@ -195 +195 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -204 +204 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -211 +211 @@ - return NS_OK; + return; @@ -214 +214 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -220 +220 @@ - return NS_OK; + return; @@ -224,2 +224 @@ - if (!file) - return NS_ERROR_OUT_OF_MEMORY; + @@ -229 +229 @@ - return rv; + throw nsexception(rv); @@ -233 +233 @@ - return GetNextEntry(); + return /*thower*/ GetNextEntry(); @@ -236 +236 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -243 +243 @@ - return NS_OK; + return; @@ -272,2 +272 @@ -nsresult -nsLocalFile::nsLocalFileConstructor(nsISupports *outer, +void nsLocalFile::nsLocalFileConstructor(nsISupports *outer, @@ -283,3 +283,2 @@ - if (!inst) - return NS_ERROR_OUT_OF_MEMORY; - return inst->QueryInterface(aIID, aInstancePtr); + + return /*thower*/ inst->QueryInterface(aIID, aInstancePtr); @@ -288,2 +288 @@ -nsresult -nsLocalFile::FillStatCache() { +void nsLocalFile::FillStatCache() { @@ -293 +293 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -297 +297 @@ - return NS_OK; + return; @@ -300 +300 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -306 +306 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -310 +310 @@ - return NS_OK; + return; @@ -313 +313 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -322 +322 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -328 +328 @@ - return NS_ERROR_FILE_UNRECOGNIZED_PATH; + throw nsexception(NS_ERROR_FILE_UNRECOGNIZED_PATH); @@ -339 +339 @@ - return NS_OK; + return; @@ -342 +342 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -399 +399 @@ - return nsresultForErrno(mkdir_errno); + return /*thower*/ nsresultForErrno(mkdir_errno); @@ -406 +406 @@ - return NS_OK; + return; @@ -409 +409 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -414 +414 @@ - return NS_ErrorAccordingToNSPR(); + return /*thower*/ NS_ErrorAccordingToNSPR(); @@ -416 +416 @@ - return NS_OK; + return; @@ -419 +419 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -424 +424 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -426 +426 @@ - return NS_OK; + return; @@ -443,2 +443 @@ -nsresult -nsLocalFile::CreateAndKeepOpen(PRUint32 type, PRIntn flags, +void nsLocalFile::CreateAndKeepOpen(PRUint32 type, PRIntn flags, @@ -448 +448 @@ - return NS_ERROR_FILE_UNKNOWN_TYPE; + throw nsexception(NS_ERROR_FILE_UNKNOWN_TYPE); @@ -479 +479 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -486 +486 @@ - return NSRESULT_FOR_RETURN(result); + return wrap_nsexception(NSRESULT_FOR_RETURN(result)); @@ -489 +489 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -493,5 +493,7 @@ - nsresult rv = CreateAndKeepOpen(type, - PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE | - PR_EXCL, - permissions, - &junk); + try { + CreateAndKeepOpen(type, + PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE | + PR_EXCL, + permissions, + &junk); + } @@ -500 +500 @@ - return rv; + throw nsexception(rv); @@ -503 +503 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -507 +507 @@ - return NS_OK; + return; @@ -513 +513 @@ - return NS_ERROR_FILE_UNRECOGNIZED_PATH; + throw nsexception(NS_ERROR_FILE_UNRECOGNIZED_PATH); @@ -515 +515 @@ - return AppendRelativeNativePath(fragment); + return wrap_nsexception(AppendRelativeNativePath(fragment)); @@ -518 +518 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -522 +522 @@ - return NS_OK; + return; @@ -526 +526 @@ - return NS_ERROR_FILE_UNRECOGNIZED_PATH; + throw nsexception(NS_ERROR_FILE_UNRECOGNIZED_PATH); @@ -534 +534 @@ - return NS_OK; + return; @@ -537 +537 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -556 +556 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -559 +559 @@ - return NS_OK; + return; @@ -584 +584 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -590 +590 @@ - return NS_OK; + return; @@ -593 +593 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -600 +600 @@ - return NS_OK; + return; @@ -603 +603 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -607 +607 @@ - return NS_OK; + return; @@ -610,2 +610 @@ -nsresult -nsLocalFile::GetNativeTargetPathName(nsIFile *newParent, +void nsLocalFile::GetNativeTargetPathName(nsIFile *newParent, @@ -620 +620 @@ - return rv; + throw nsexception(rv); @@ -626 +626 @@ - return rv; + throw nsexception(rv); @@ -630,3 +630,4 @@ - rv = newParent->Create(DIRECTORY_TYPE, 0755); - if (NS_FAILED(rv)) - return rv; + try { + newParent->Create(DIRECTORY_TYPE, 0755); + } + catch (nsexception &exc) { throw; } @@ -637 +637 @@ - return rv; + throw nsexception(rv); @@ -639 +639 @@ - return NS_ERROR_FILE_DESTINATION_NOT_DIR; + throw nsexception(NS_ERROR_FILE_DESTINATION_NOT_DIR); @@ -653 +653 @@ - return rv; + throw nsexception(rv); @@ -658 +658 @@ - return NS_OK; + return; @@ -661,2 +661 @@ -nsresult -nsLocalFile::CopyDirectoryTo(nsIFile *newParent) +void nsLocalFile::CopyDirectoryTo(nsIFile *newParent) @@ -673 +673 @@ - return rv; + throw nsexception(rv); @@ -675 +675 @@ - return CopyToNative(newParent, EmptyCString()); + return wrap_nsexception(CopyToNative(newParent, EmptyCString())); @@ -678 +678 @@ - return rv; + throw nsexception(rv); @@ -681 +681 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -685 +685 @@ - return rv; + throw nsexception(rv); @@ -688 +688 @@ - return rv; + throw nsexception(rv); @@ -691 +691 @@ - return rv; + throw nsexception(rv); @@ -695 +695 @@ - return rv; + throw nsexception(rv); @@ -697 +697 @@ - return rv; + throw nsexception(rv); @@ -699 +699 @@ - return rv; + throw nsexception(rv); @@ -701 +701 @@ - return NS_ERROR_FILE_ALREADY_EXISTS; // dest exists + throw nsexception(NS_ERROR_FILE_ALREADY_EXISTS); // dest exists @@ -703 +703 @@ - return rv; + throw nsexception(rv); @@ -708 +708 @@ - return rv; + throw nsexception(rv); @@ -713,3 +713,4 @@ - rv = dirIterator->GetNext((nsISupports**)getter_AddRefs(entry)); - if (NS_FAILED(rv)) - continue; + try { + dirIterator->GetNext((nsISupports**)getter_AddRefs(entry)); + } + catch (nsexception &exc) continue; @@ -717 +717 @@ - return rv; + throw nsexception(rv); @@ -719 +719 @@ - return rv; + throw nsexception(rv); @@ -722 +722,3 @@ - rv = newParent->Clone(getter_AddRefs(destClone)); + try { + newParent->Clone(getter_AddRefs(destClone)); + } @@ -730 +730 @@ - return rv2; + throw nsexception(rv2); @@ -734 +734 @@ - return rv; + throw nsexception(rv); @@ -744 +744 @@ - return rv2; + throw nsexception(rv2); @@ -748 +748 @@ - return rv; + throw nsexception(rv); @@ -753 +753 @@ - return NS_OK; + return; @@ -756 +756 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -767 +767 @@ - return rv; + throw nsexception(rv); @@ -770 +770 @@ - return rv; + throw nsexception(rv); @@ -776 +776 @@ - return rv; + throw nsexception(rv); @@ -782 +782 @@ - return rv; + throw nsexception(rv); @@ -785 +785 @@ - return rv; + throw nsexception(rv); @@ -787 +787 @@ - return rv; + throw nsexception(rv); @@ -790 +790 @@ - return rv; + throw nsexception(rv); @@ -792,3 +792,4 @@ - rv = GetNativeTargetPathName(workParent, newName, newPathName); - if (NS_FAILED(rv)) - return rv; + try { + GetNativeTargetPathName(workParent, newName, newPathName); + } + catch (nsexception &exc) { throw; } @@ -802,2 +802 @@ - if (!newFile) - return NS_ERROR_OUT_OF_MEMORY; + @@ -807,3 +807,4 @@ - rv = newFile->InitWithNativePath(newPathName); - if (NS_FAILED(rv)) - return rv; + try { + newFile->InitWithNativePath(newPathName); + } + catch (nsexception &exc) { throw; } @@ -822,6 +822,7 @@ - rv = newFile->CreateAndKeepOpen(NORMAL_FILE_TYPE, - PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE, - myPerms, - &newFD); - if (NS_FAILED(rv)) - return rv; + try { + newFile->CreateAndKeepOpen(NORMAL_FILE_TYPE, + PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE, + myPerms, + &newFD); + } + catch (nsexception &exc) { throw; } @@ -833 +833 @@ - return rv; + throw nsexception(rv); @@ -841 +841 @@ - return NS_OK; + return; @@ -845,6 +845,8 @@ - rv = OpenNSPRFileDesc(PR_RDONLY, myPerms, &oldFD); - if (NS_FAILED(rv)) { - // make sure to clean up properly - PR_Close(newFD); - return rv; - } + try { + OpenNSPRFileDesc(PR_RDONLY, myPerms, &oldFD); + } + catch (nsexception &exc) { + // make sure to clean up properly + PR_Close(newFD); + throw nsexception(rv); + } @@ -888 +888 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -890 +890 @@ - return rv; + throw nsexception(rv); @@ -893 +893 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -896 +896 @@ - return CopyToNative(newParent, newName); + return /*thower*/ CopyToNative(newParent, newName); @@ -899 +899 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -909,3 +909,4 @@ - rv = GetNativeTargetPathName(newParent, newName, newPathName); - if (NS_FAILED(rv)) - return rv; + try { + GetNativeTargetPathName(newParent, newName, newPathName); + } + catch (nsexception &exc) { throw; } @@ -920 +920,3 @@ - rv = CopyToNative(newParent, newName); + try { + CopyToNative(newParent, newName); + } @@ -922 +922,3 @@ - rv = Remove(PR_TRUE); + try { + wrap_nsexception(Remove(PR_TRUE)); + } @@ -924 +924,3 @@ - rv = NSRESULT_FOR_ERRNO(); + try { + NSRESULT_FOR_ERRNO(); + } @@ -927 +927 @@ - return rv; + throw nsexception(rv); @@ -930 +930 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -938,3 +938,4 @@ - nsresult rv = IsSymlink(&isSymLink); - if (NS_FAILED(rv)) - return rv; + try { + wrap_nsexception(IsSymlink(&isSymLink)); + } + catch (nsexception &exc) { throw; } @@ -943 +943 @@ - return NSRESULT_FOR_RETURN(unlink(mPath.get())); + return wrap_nsexception(NSRESULT_FOR_RETURN(unlink(mPath.get()))); @@ -950,2 +950 @@ - if (!dir) - return NS_ERROR_OUT_OF_MEMORY; + @@ -955,3 +955,4 @@ - rv = dir->Init(this, PR_FALSE); - if (NS_FAILED(rv)) - return rv; + try { + dir->Init(this, PR_FALSE); + } + catch (nsexception &exc) { throw; } @@ -962,3 +962,4 @@ - rv = dir->GetNext(getter_AddRefs(item)); - if (NS_FAILED(rv)) - return NS_ERROR_FAILURE; + try { + dir->GetNext(getter_AddRefs(item)); + } + catch (nsexception &exc) throw nsexception(NS_ERROR_FAILURE); @@ -967,2 +967 @@ - if (NS_FAILED(rv)) - return NS_ERROR_FAILURE; + catch (nsexception &exc) throw nsexception(NS_ERROR_FAILURE); @@ -970 +970 @@ - return rv; + throw nsexception(rv); @@ -975 +975 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -978 +978 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -981 +981 @@ - return NS_OK; + return; @@ -984 +984 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -992 +992 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -999 +999 @@ - return NS_OK; + return; @@ -1002 +1002 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1022 +1022 @@ - return NSRESULT_FOR_RETURN(result); + return wrap_nsexception(NSRESULT_FOR_RETURN(result)); @@ -1025 +1025 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1033 +1033 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1041 +1041 @@ - return NS_OK; + return; @@ -1047 +1047 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1050 +1050 @@ - return SetLastModifiedTime(aLastModTimeOfLink); + return /*thower*/ SetLastModifiedTime(aLastModTimeOfLink); @@ -1060 +1060 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1066 +1066 @@ - return NS_OK; + return; @@ -1069 +1069 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1077 +1077 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1079 +1079 @@ - return NS_OK; + return; @@ -1082 +1082 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1094,2 +1094,2 @@ - return NSRESULT_FOR_ERRNO(); - return NS_OK; + return /*thower*/ NSRESULT_FOR_ERRNO(); + return; @@ -1098 +1098 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1101 +1101 @@ - return SetPermissions(aPermissions); + return /*thower*/ SetPermissions(aPermissions); @@ -1104 +1104 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1123 +1123 @@ - return NS_OK; + return; @@ -1126 +1126 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1136,2 +1136,2 @@ - return NSRESULT_FOR_ERRNO(); - return NS_OK; + return /*thower*/ NSRESULT_FOR_ERRNO(); + return; @@ -1140 +1140 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1148 +1148 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1151 +1151 @@ - return NS_OK; + return; @@ -1154 +1154 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1180 +1180 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1197 +1197 @@ - return NS_OK; + return; @@ -1217 +1217 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1226 +1226 @@ - return NS_OK; + return; @@ -1236 +1236 @@ - return NS_ERROR_FILE_INVALID_PATH; + throw nsexception(NS_ERROR_FILE_INVALID_PATH); @@ -1247,2 +1247,4 @@ - nsresult rv = NS_NewNativeLocalFile(nsDependentCString(buffer), PR_TRUE, - getter_AddRefs(localFile)); + try { + NS_NewNativeLocalFile(nsDependentCString(buffer), PR_TRUE, + getter_AddRefs(localFile)); + } @@ -1254,2 +1254,4 @@ - rv = CallQueryInterface(localFile, aParent); - return rv; + try { + wrap_nsexception(CallQueryInterface(localFile, aParent)); + } + throw nsexception(rv); @@ -1325 +1325 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1332 +1332 @@ - return NS_OK; + return; @@ -1336 +1336 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1344,2 +1344,2 @@ - return NS_OK; - return NSRESULT_FOR_ERRNO(); + return; + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1348 +1348 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1356,2 +1356,2 @@ - return NS_OK; - return NSRESULT_FOR_ERRNO(); + return; + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1360 +1360 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1368,2 +1368,2 @@ - return NS_OK; - return NSRESULT_FOR_ERRNO(); + return; + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1372 +1372 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1379 +1379 @@ - return NS_OK; + return; @@ -1382 +1382 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1389 +1389 @@ - return NS_OK; + return; @@ -1392 +1392 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1399 +1399 @@ - return NS_OK; + return; @@ -1402 +1402 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1411 +1411 @@ - return NS_OK; + return; @@ -1414 +1414 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1426 +1426 @@ - return NS_OK; + return; @@ -1429 +1429 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1440 +1440 @@ - return rv; + throw nsexception(rv); @@ -1443 +1443 @@ - return NS_OK; + return; @@ -1446 +1446 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1457 +1457 @@ - return rv; + throw nsexception(rv); @@ -1469 +1469 @@ - return NS_OK; + return; @@ -1472 +1472 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1481 +1481 @@ - return NS_ERROR_FILE_INVALID_PATH; + throw nsexception(NS_ERROR_FILE_INVALID_PATH); @@ -1485 +1485 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1490,2 +1490 @@ - if (!target) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1495 +1495 @@ - return NSRESULT_FOR_ERRNO(); + return /*thower*/ NSRESULT_FOR_ERRNO(); @@ -1508,2 +1508 @@ - if (NS_FAILED(rv)) - break; + catch (nsexception &exc) break; @@ -1519,4 +1519,5 @@ - rv = NS_NewNativeLocalFile(nsDependentCString(target), PR_TRUE, - getter_AddRefs(localFile)); - if (NS_FAILED(rv)) - break; + try { + NS_NewNativeLocalFile(nsDependentCString(target), PR_TRUE, + getter_AddRefs(localFile)); + } + catch (nsexception &exc) break; @@ -1538 +1538,3 @@ - rv = NSRESULT_FOR_ERRNO(); + try { + NSRESULT_FOR_ERRNO(); + } @@ -1547 +1547,3 @@ - rv = NSRESULT_FOR_ERRNO(); + try { + NSRESULT_FOR_ERRNO(); + } @@ -1557,3 +1557,2 @@ - if (NS_FAILED(rv)) - _retval.Truncate(); - return rv; + catch (nsexception &exc) _retval.Truncate(); + throw nsexception(rv); @@ -1563 +1563 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1567 +1567 @@ - return NS_OK; + return; @@ -1570 +1570 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1573 +1573 @@ - return NS_OK; + return; @@ -1576 +1576 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1580,2 +1580 @@ - if (!dir) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1584,7 +1584,7 @@ - nsresult rv = dir->Init(this, PR_FALSE); - if (NS_FAILED(rv)) { - *entries = nsnull; - NS_RELEASE(dir); - } else { - *entries = dir; // transfer reference - } + try { + dir->Init(this, PR_FALSE); + } + catch (nsexception &exc) { + *entries = nsnull; + NS_RELEASE(dir); + } @@ -1592 +1592 @@ - return rv; + throw nsexception(rv); @@ -1595 +1595 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1617,2 +1617,2 @@ - return NS_ERROR_FAILURE; - return NS_OK; + throw nsexception(NS_ERROR_FAILURE); + return; @@ -1621 +1621 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1624 +1624 @@ - return GetNativePath(aPersistentDescriptor); + return /*thower*/ GetNativePath(aPersistentDescriptor); @@ -1627 +1627 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1630 +1630 @@ - return InitWithNativePath(aPersistentDescriptor); + return /*thower*/ InitWithNativePath(aPersistentDescriptor); @@ -1663 +1663 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1666 +1666 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1669 +1669 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1672 +1672 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1676,2 +1676 @@ -nsresult -NS_NewNativeLocalFile(const nsACString &path, PRBool followSymlinks, nsILocalFile **result) +void NS_NewNativeLocalFile(const nsACString &path, PRBool followSymlinks, nsILocalFile **result) @@ -1680,2 +1680 @@ - if (!file) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1685,5 +1685,7 @@ - nsresult rv = file->InitWithNativePath(path); - if (NS_FAILED(rv)) { - NS_RELEASE(file); - return rv; - } + try { + file->InitWithNativePath(path); + } + catch (nsexception &exc) { + NS_RELEASE(file); + throw nsexception(rv); + } @@ -1692 +1692 @@ - return NS_OK; + return; @@ -1726,2 +1726 @@ -nsresult -nsLocalFile::InitWithPath(const nsAString &filePath) +void nsLocalFile::InitWithPath(const nsAString &filePath) @@ -1731,2 +1731 @@ -nsresult -nsLocalFile::Append(const nsAString &node) +void nsLocalFile::Append(const nsAString &node) @@ -1736,2 +1736 @@ -nsresult -nsLocalFile::AppendRelativePath(const nsAString &node) +void nsLocalFile::AppendRelativePath(const nsAString &node) @@ -1741,2 +1741 @@ -nsresult -nsLocalFile::GetLeafName(nsAString &aLeafName) +void nsLocalFile::GetLeafName(nsAString &aLeafName) @@ -1746,2 +1746 @@ -nsresult -nsLocalFile::SetLeafName(const nsAString &aLeafName) +void nsLocalFile::SetLeafName(const nsAString &aLeafName) @@ -1751,2 +1751 @@ -nsresult -nsLocalFile::GetPath(nsAString &_retval) +void nsLocalFile::GetPath(nsAString &_retval) @@ -1754 +1754 @@ - return NS_CopyNativeToUnicode(mPath, _retval); + return /*thower*/ NS_CopyNativeToUnicode(mPath, _retval); @@ -1756,2 +1756 @@ -nsresult -nsLocalFile::CopyTo(nsIFile *newParentDir, const nsAString &newName) +void nsLocalFile::CopyTo(nsIFile *newParentDir, const nsAString &newName) @@ -1761,2 +1761 @@ -nsresult -nsLocalFile::CopyToFollowingLinks(nsIFile *newParentDir, const nsAString &newName) +void nsLocalFile::CopyToFollowingLinks(nsIFile *newParentDir, const nsAString &newName) @@ -1766,2 +1766 @@ -nsresult -nsLocalFile::MoveTo(nsIFile *newParentDir, const nsAString &newName) +void nsLocalFile::MoveTo(nsIFile *newParentDir, const nsAString &newName) @@ -1771,2 +1771 @@ -nsresult -nsLocalFile::GetTarget(nsAString &_retval) +void nsLocalFile::GetTarget(nsAString &_retval) @@ -1779 +1779 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1785 +1785 @@ - return NS_OK; + return; @@ -1788 +1788 @@ - return Equals(otherFile, aResult); + return /*thower*/ Equals(otherFile, aResult); @@ -1791 +1791 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1795 +1795 @@ - return NS_OK; + return; @@ -1798,2 +1798 @@ -nsresult -NS_NewLocalFile(const nsAString &path, PRBool followLinks, nsILocalFile* *result) +void NS_NewLocalFile(const nsAString &path, PRBool followLinks, nsILocalFile* *result) @@ -1802,4 +1802,5 @@ - nsresult rv = NS_CopyUnicodeToNative(path, buf); - if (NS_FAILED(rv)) - return rv; - return NS_NewNativeLocalFile(buf, followLinks, result); + try { + NS_CopyUnicodeToNative(path, buf); + } + catch (nsexception &exc) { throw; } + return /*thower*/ NS_NewNativeLocalFile(buf, followLinks, result); --- xpcom/io/nsLocalFileUnix.h +++ xpcom/io/nsLocalFileUnix.h @@ -94 +94 @@ - static NS_METHOD nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + static NS_METHOD_(void) nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); @@ -127,3 +127,3 @@ - nsresult CopyDirectoryTo(nsIFile *newParent); - nsresult CreateAllAncestors(PRUint32 permissions); - nsresult GetNativeTargetPathName(nsIFile *newParent, + void CopyDirectoryTo(nsIFile *newParent); + void CreateAllAncestors(PRUint32 permissions); + void GetNativeTargetPathName(nsIFile *newParent, @@ -136 +136 @@ - nsresult FillStatCache(); + void FillStatCache(); @@ -138 +138 @@ - nsresult CreateAndKeepOpen(PRUint32 type, PRIntn flags, + void CreateAndKeepOpen(PRUint32 type, PRIntn flags, --- xpcom/io/nsMultiplexInputStream.cpp +++ xpcom/io/nsMultiplexInputStream.cpp @@ -73 +73 @@ - static NS_METHOD ReadSegCb(nsIInputStream* aIn, void* aClosure, + static NS_METHOD_(void) ReadSegCb(nsIInputStream* aIn, void* aClosure, @@ -80 +80 @@ - nsresult mStatus; + void mStatus; @@ -97 +97 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -101 +101 @@ - return NS_OK; + return; @@ -105 +105 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -108 +108 @@ - return mStreams.AppendObject(aStream) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(mStreams.AppendObject(aStream) ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -112 +112 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -120 +120 @@ - return NS_OK; + return; @@ -124 +124 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -134 +134 @@ - return NS_OK; + return; @@ -138 +138 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -145 +145 @@ - return NS_OK; + return; @@ -149 +149 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -158 +158,3 @@ - nsresult rv2 = mStreams[i]->Close(); + try { + mStreams[i]->Close(); + } @@ -160,2 +160 @@ - if (NS_FAILED(rv2)) - rv = rv2; + catch (nsexception &exc) rv = exc.getCode(); @@ -163 +163 @@ - return rv; + throw nsexception(rv); @@ -167 +167 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -171 +171 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -179 +179,3 @@ - rv = mStreams[i]->Available(&streamAvail); + try { + mStreams[i]->Available(&streamAvail); + } @@ -184 +184 @@ - return NS_OK; + return; @@ -188 +188 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -198 +198 @@ - return NS_OK; + return; @@ -200 +200 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -207 +207,3 @@ - rv = mStreams[mCurrentStream]->Read(aBuf, aCount, &read); + try { + mStreams[mCurrentStream]->Read(aBuf, aCount, &read); + } @@ -216,2 +216 @@ - else if (NS_FAILED(rv)) - break; + else catch (nsexception &exc) break; @@ -231 +231 @@ - return *_retval ? NS_OK : rv; + return wrap_nsexception(*_retval ? NS_OK : rv); @@ -237 +237 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -243 +243 @@ - return NS_OK; + return; @@ -246 +246 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -261 +261,3 @@ - rv = mStreams[mCurrentStream]->ReadSegments(ReadSegCb, &state, aCount, &read); + try { + mStreams[mCurrentStream]->ReadSegments(ReadSegCb, &state, aCount, &read); + } @@ -290 +290 @@ - return state.mOffset ? NS_OK : rv; + return wrap_nsexception(state.mOffset ? NS_OK : rv); @@ -293 +293 @@ -NS_METHOD +NS_METHOD_(void) @@ -301,9 +301,10 @@ - rv = (state->mWriter)(state->mThisStream, - state->mClosure, - aFromRawSegment, - aToOffset + state->mOffset, - aCount, - aWriteCount); - if (NS_FAILED(rv)) - state->mDone = PR_TRUE; - return rv; + try { + (state->mWriter)(state->mThisStream, + state->mClosure, + aFromRawSegment, + aToOffset + state->mOffset, + aCount, + aWriteCount); + } + catch (nsexception &exc) state->mDone = PR_TRUE; + throw nsexception(rv); @@ -313 +313 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -318 +318,3 @@ - nsresult rv = mStreams[i]->IsNonBlocking(aNonBlocking); + try { + mStreams[i]->IsNonBlocking(aNonBlocking); + } @@ -324 +324 @@ - return NS_OK; + return; @@ -326 +326 @@ - return NS_OK; + return; @@ -330 +330 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -334 +334 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -347 +347,3 @@ - rv = stream->Seek(NS_SEEK_SET, 0); + try { + stream->Seek(NS_SEEK_SET, 0); + } @@ -352 +352 @@ - return NS_OK; + return; @@ -356 +356 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -360 +360 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -364 +364 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -375 +375,3 @@ - rv = stream->Tell(&pos); + try { + stream->Tell(&pos); + } @@ -381 +381 @@ - return NS_OK; + return; @@ -385 +385 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -388 +388 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -391 +391 @@ -NS_METHOD +NS_METHOD_(void) @@ -399 +399 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -403,2 +403 @@ - if (!inst) - return NS_ERROR_OUT_OF_MEMORY; + @@ -407 +407,3 @@ - nsresult rv = inst->QueryInterface(iid, result); + try { + wrap_nsexception(inst->QueryInterface(iid, result)); + } @@ -410 +410 @@ - return rv; + throw nsexception(rv); --- xpcom/io/nsMultiplexInputStream.h +++ xpcom/io/nsMultiplexInputStream.h @@ -59 +59 @@ -extern NS_METHOD nsMultiplexInputStreamConstructor(nsISupports *outer, +extern NS_METHOD_(void) nsMultiplexInputStreamConstructor(nsISupports *outer, --- xpcom/io/nsNativeCharsetUtils.cpp +++ xpcom/io/nsNativeCharsetUtils.cpp @@ -292 +292 @@ - nsresult NativeToUnicode(const char **input , PRUint32 *inputLeft, + void NativeToUnicode(const char **input , PRUint32 *inputLeft, @@ -294 +294 @@ - nsresult UnicodeToNative(const PRUnichar **input , PRUint32 *inputLeft, + void UnicodeToNative(const PRUnichar **input , PRUint32 *inputLeft, @@ -481,2 +481 @@ -nsresult -nsNativeCharsetConverter::NativeToUnicode(const char **input, +void nsNativeCharsetConverter::NativeToUnicode(const char **input, @@ -498 +498 @@ - return NS_OK; + return; @@ -550 +550 @@ - return NS_OK; + return; @@ -553,2 +553 @@ -nsresult -nsNativeCharsetConverter::UnicodeToNative(const PRUnichar **input, +void nsNativeCharsetConverter::UnicodeToNative(const PRUnichar **input, @@ -569 +569 @@ - return NS_OK; + return; @@ -625 +625 @@ - return NS_OK; + return; @@ -804,2 +804 @@ -NS_COM nsresult -NS_CopyNativeToUnicode(const nsACString &input, nsAString &output) +NS_COM void NS_CopyNativeToUnicode(const nsACString &input, nsAString &output) @@ -822 +822 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -833 +833,3 @@ - nsresult rv = conv.NativeToUnicode(&buf, &bufLeft, &result, &resultLeft); + try { + conv.NativeToUnicode(&buf, &bufLeft, &result, &resultLeft); + } @@ -838 +838 @@ - return rv; + throw nsexception(rv); @@ -841,2 +841 @@ -NS_COM nsresult -NS_CopyUnicodeToNative(const nsAString &input, nsACString &output) +NS_COM void NS_CopyUnicodeToNative(const nsAString &input, nsACString &output) @@ -861,2 +861,4 @@ - nsresult rv = conv.UnicodeToNative(&buf, &bufLeft, &p, &tempLeft); - if (NS_FAILED(rv)) return rv; + try { + conv.UnicodeToNative(&buf, &bufLeft, &p, &tempLeft); + } + catch (nsexception &exc) { throw; } @@ -867 +867 @@ - return NS_OK; + return; --- xpcom/io/nsNativeCharsetUtils.h +++ xpcom/io/nsNativeCharsetUtils.h @@ -57,2 +57,2 @@ -NS_COM nsresult NS_CopyNativeToUnicode(const nsACString &input, nsAString &output); -NS_COM nsresult NS_CopyUnicodeToNative(const nsAString &input, nsACString &output); +NS_COM void NS_CopyNativeToUnicode(const nsACString &input, nsAString &output); +NS_COM void NS_CopyUnicodeToNative(const nsAString &input, nsACString &output); --- xpcom/io/nsPipe.h +++ xpcom/io/nsPipe.h @@ -55 +55 @@ -NS_METHOD NS_HIDDEN +NS_METHOD_(void) NS_HIDDEN --- xpcom/io/nsPipe3.cpp +++ xpcom/io/nsPipe3.cpp @@ -135 +135 @@ - nsresult Fill(); + void Fill(); @@ -142 +142 @@ - nsresult Wait(); + void Wait(); @@ -196 +196 @@ - nsresult Wait(); + void Wait(); @@ -246 +246 @@ - nsresult GetReadSegment(const char *&segment, PRUint32 &segmentLen); + void GetReadSegment(const char *&segment, PRUint32 &segmentLen); @@ -249 +249 @@ - nsresult GetWriteSegment(char *&segment, PRUint32 &segmentLen); + void GetWriteSegment(char *&segment, PRUint32 &segmentLen); @@ -271 +271 @@ - nsresult mStatus; + void mStatus; @@ -338 +338 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -346,2 +346 @@ - if (!mMonitor) - return NS_ERROR_OUT_OF_MEMORY; + @@ -359,3 +359,4 @@ - nsresult rv = mBuffer.Init(segmentSize, segmentSize * segmentCount, segmentAlloc); - if (NS_FAILED(rv)) - return rv; + try { + mBuffer.Init(segmentSize, segmentSize * segmentCount, segmentAlloc); + } + catch (nsexception &exc) { throw; } @@ -365 +365 @@ - return NS_OK; + return; @@ -368 +368 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -373 +373 @@ - return NS_OK; + return; @@ -376 +376 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -381 +381 @@ - return NS_OK; + return; @@ -406,2 +406 @@ -nsresult -nsPipe::GetReadSegment(const char *&segment, PRUint32 &segmentLen) +void nsPipe::GetReadSegment(const char *&segment, PRUint32 &segmentLen) @@ -412 +412 @@ - return NS_FAILED(mStatus) ? mStatus : NS_BASE_STREAM_WOULD_BLOCK; + return wrap_nsexception(NS_FAILED(mStatus) ? mStatus : NS_BASE_STREAM_WOULD_BLOCK); @@ -416 +416 @@ - return NS_OK; + return; @@ -473 +473 @@ - mon.Notify(); + IGNORE_NSEXCEPTION(mon.Notify()); @@ -478,2 +478 @@ -nsresult -nsPipe::GetWriteSegment(char *&segment, PRUint32 &segmentLen) +void nsPipe::GetWriteSegment(char *&segment, PRUint32 &segmentLen) @@ -484 +484 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -491 +491 @@ - return NS_BASE_STREAM_WOULD_BLOCK; + throw nsexception(NS_BASE_STREAM_WOULD_BLOCK); @@ -514 +514 @@ - return NS_OK; + return; @@ -569 +569 @@ - mon.Notify(); + IGNORE_NSEXCEPTION(mon.Notify()); @@ -596 +596 @@ - mon.Notify(); + IGNORE_NSEXCEPTION(mon.Notify()); @@ -599 +599 @@ - mon.Notify(); + IGNORE_NSEXCEPTION(mon.Notify()); @@ -612 +612 @@ - mInputCallback->OnInputStreamReady(mInputStream); + IGNORE_NSEXCEPTION(mInputCallback->OnInputStreamReady(mInputStream)); @@ -617 +617 @@ - mOutputCallback->OnOutputStreamReady(mOutputStream); + IGNORE_NSEXCEPTION(mOutputCallback->OnOutputStreamReady(mOutputStream)); @@ -642,2 +642 @@ -nsresult -nsPipeInputStream::Wait() +void nsPipeInputStream::Wait() @@ -653 +653 @@ - mon.Wait(); + IGNORE_NSEXCEPTION(mon.Wait()); @@ -660 +660 @@ - return mPipe->mStatus == NS_BASE_STREAM_CLOSED ? NS_OK : mPipe->mStatus; + return wrap_nsexception(mPipe->mStatus == NS_BASE_STREAM_CLOSED ? NS_OK : mPipe->mStatus); @@ -720 +720 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -729 +729 @@ - return NS_OK; + return; @@ -732 +732 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -735 +735 @@ - return CloseWithStatus(NS_BASE_STREAM_CLOSED); + return /*thower*/ CloseWithStatus(NS_BASE_STREAM_CLOSED); @@ -738 +738 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -745 +745 @@ - return mPipe->mStatus; + return wrap_nsexception(mPipe->mStatus); @@ -748 +748 @@ - return NS_OK; + return; @@ -751 +751 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -766,24 +766,28 @@ - rv = mPipe->GetReadSegment(segment, segmentLen); - if (NS_FAILED(rv)) { - // ignore this error if we've already read something. - if (*readCount > 0) { - rv = NS_OK; - break; - } - if (rv == NS_BASE_STREAM_WOULD_BLOCK) { - // pipe is empty - if (!mBlocking) - break; - // wait for some data to be written to the pipe - rv = Wait(); - if (NS_SUCCEEDED(rv)) - continue; - } - // ignore this error, just return. - if (rv == NS_BASE_STREAM_CLOSED) { - rv = NS_OK; - break; - } - mPipe->OnPipeException(rv); - break; - } + try { + mPipe->GetReadSegment(segment, segmentLen); + } + catch (nsexception &exc) { + // ignore this error if we've already read something. + if (*readCount > 0) { + rv = NS_OK; + break; + } + if (rv == NS_BASE_STREAM_WOULD_BLOCK) { + // pipe is empty + if (!mBlocking) + break; + // wait for some data to be written to the pipe + try { + Wait(); + } + if (NS_SUCCEEDED(rv)) + continue; + } + // ignore this error, just return. + if (rv == NS_BASE_STREAM_CLOSED) { + rv = NS_OK; + break; + } + mPipe->OnPipeException(rv); + break; + } @@ -799 +799,3 @@ - rv = writer(this, closure, segment, *readCount, segmentLen, &writeCount); + try { + writer(this, closure, segment, *readCount, segmentLen, &writeCount); + } @@ -821 +821 @@ - return rv; + throw nsexception(rv); @@ -824 +824 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -827 +827 @@ - return ReadSegments(NS_CopySegmentToBuffer, toBuf, bufLen, readCount); + return /*thower*/ ReadSegments(NS_CopySegmentToBuffer, toBuf, bufLen, readCount); @@ -830 +830 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -834 +834 @@ - return NS_OK; + return; @@ -837 +837 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -854 +854 @@ - return NS_OK; + return; @@ -858,3 +858,5 @@ - nsresult rv = NS_NewInputStreamReadyEvent(getter_AddRefs(proxy), - callback, target); - if (NS_FAILED(rv)) return rv; + try { + NS_NewInputStreamReadyEvent(getter_AddRefs(proxy), + callback, target); + } + catch (nsexception &exc) { throw; } @@ -875 +875 @@ - return NS_OK; + return; @@ -878 +878 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -882 +882 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -885 +885 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -892 +892 @@ - return mPipe->mStatus; + return wrap_nsexception(mPipe->mStatus); @@ -895 +895 @@ - return NS_OK; + return; @@ -898 +898 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -902 +902 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -910 +910 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -929 +929 @@ - return NS_OK; + return; @@ -941 +941 @@ - return NS_OK; + return; @@ -957 +957 @@ - return NS_OK; + return; @@ -973 +973 @@ - return NS_OK; + return; @@ -983 +983 @@ - return NS_ERROR_UNEXPECTED; // keep compiler happy + throw nsexception(NS_ERROR_UNEXPECTED); // keep compiler happy @@ -1001,2 +1001 @@ -nsresult -nsPipeOutputStream::Wait() +void nsPipeOutputStream::Wait() @@ -1011 +1011 @@ - mon.Wait(); + IGNORE_NSEXCEPTION(mon.Wait()); @@ -1017 +1017 @@ - return mPipe->mStatus == NS_BASE_STREAM_CLOSED ? NS_OK : mPipe->mStatus; + return wrap_nsexception(mPipe->mStatus == NS_BASE_STREAM_CLOSED ? NS_OK : mPipe->mStatus); @@ -1076 +1076 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1086 +1086 @@ - return NS_OK; + return; @@ -1089 +1089 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1092 +1092 @@ - return CloseWithStatus(NS_BASE_STREAM_CLOSED); + return /*thower*/ CloseWithStatus(NS_BASE_STREAM_CLOSED); @@ -1095 +1095 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1110,18 +1110,22 @@ - rv = mPipe->GetWriteSegment(segment, segmentLen); - if (NS_FAILED(rv)) { - if (rv == NS_BASE_STREAM_WOULD_BLOCK) { - // pipe is full - if (!mBlocking) { - // ignore this error if we've already written something - if (*writeCount > 0) - rv = NS_OK; - break; - } - // wait for the pipe to have an empty segment. - rv = Wait(); - if (NS_SUCCEEDED(rv)) - continue; - } - mPipe->OnPipeException(rv); - break; - } + try { + mPipe->GetWriteSegment(segment, segmentLen); + } + catch (nsexception &exc) { + if (rv == NS_BASE_STREAM_WOULD_BLOCK) { + // pipe is full + if (!mBlocking) { + // ignore this error if we've already written something + if (*writeCount > 0) + rv = NS_OK; + break; + } + // wait for the pipe to have an empty segment. + try { + Wait(); + } + if (NS_SUCCEEDED(rv)) + continue; + } + mPipe->OnPipeException(rv); + break; + } @@ -1137 +1137,3 @@ - rv = reader(this, closure, segment, *writeCount, segmentLen, &readCount); + try { + reader(this, closure, segment, *writeCount, segmentLen, &readCount); + } @@ -1159 +1159 @@ - return rv; + throw nsexception(rv); @@ -1162 +1162 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -1173 +1173 @@ - return NS_OK; + return; @@ -1176 +1176 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1181 +1181 @@ - return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount); + return /*thower*/ WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount); @@ -1184 +1184 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1188 +1188 @@ - return NS_OK; + return; @@ -1191 +1191 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -1200 +1200 @@ - return fromStream->Read(toRawSegment, count, readCount); + return /*thower*/ fromStream->Read(toRawSegment, count, readCount); @@ -1203 +1203 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1208 +1208 @@ - return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount); + return /*thower*/ WriteSegments(nsReadFromInputStream, fromStream, count, writeCount); @@ -1211 +1211 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1215 +1215 @@ - return NS_OK; + return; @@ -1218 +1218 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1235 +1235 @@ - return NS_OK; + return; @@ -1239,3 +1239,5 @@ - nsresult rv = NS_NewOutputStreamReadyEvent(getter_AddRefs(proxy), - callback, target); - if (NS_FAILED(rv)) return rv; + try { + NS_NewOutputStreamReadyEvent(getter_AddRefs(proxy), + callback, target); + } + catch (nsexception &exc) { throw; } @@ -1256 +1256 @@ - return NS_OK; + return; @@ -1261,2 +1261 @@ -NS_COM nsresult -NS_NewPipe(nsIInputStream **pipeIn, +NS_COM void NS_NewPipe(nsIInputStream **pipeIn, @@ -1282,3 +1282,5 @@ - nsresult rv = NS_NewPipe2(&in, &out, nonBlockingInput, nonBlockingOutput, - segmentSize, segmentCount, segmentAlloc); - if (NS_FAILED(rv)) return rv; + try { + NS_NewPipe2(&in, &out, nonBlockingInput, nonBlockingOutput, + segmentSize, segmentCount, segmentAlloc); + } + catch (nsexception &exc) { throw; } @@ -1288 +1288 @@ - return NS_OK; + return; @@ -1291,2 +1291 @@ -NS_COM nsresult -NS_NewPipe2(nsIAsyncInputStream **pipeIn, +NS_COM void NS_NewPipe2(nsIAsyncInputStream **pipeIn, @@ -1303,2 +1303 @@ - if (!pipe) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1306,10 +1306,12 @@ - rv = pipe->Init(nonBlockingInput, - nonBlockingOutput, - segmentSize, - segmentCount, - segmentAlloc); - if (NS_FAILED(rv)) { - NS_ADDREF(pipe); - NS_RELEASE(pipe); - return rv; - } + try { + pipe->Init(nonBlockingInput, + nonBlockingOutput, + segmentSize, + segmentCount, + segmentAlloc); + } + catch (nsexception &exc) { + NS_ADDREF(pipe); + NS_RELEASE(pipe); + throw nsexception(rv); + } @@ -1317,3 +1317,3 @@ - pipe->GetInputStream(pipeIn); - pipe->GetOutputStream(pipeOut); - return NS_OK; + IGNORE_NSEXCEPTION(pipe->GetInputStream(pipeIn)); + IGNORE_NSEXCEPTION(pipe->GetOutputStream(pipeOut)); + return; @@ -1322 +1322 @@ -NS_METHOD +NS_METHOD_(void) @@ -1326 +1326 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -1328,2 +1328 @@ - if (!pipe) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1331 +1331,3 @@ - nsresult rv = pipe->QueryInterface(iid, result); + try { + wrap_nsexception(pipe->QueryInterface(iid, result)); + } @@ -1333 +1333 @@ - return rv; + throw nsexception(rv); --- xpcom/io/nsScriptableInputStream.cpp +++ xpcom/io/nsScriptableInputStream.cpp @@ -65 +65 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -69 +69 @@ - return mUnicharInputStream->Close(); + return /*thower*/ mUnicharInputStream->Close(); @@ -72 +72 @@ - return mInputStream->Close(); + return /*thower*/ mInputStream->Close(); @@ -74 +74 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -77 +77 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -84 +84 @@ - return NS_OK; + return; @@ -88 +88 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -94 +94 @@ - return NS_OK; + return; @@ -97 +97 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -102 +102,3 @@ - nsresult rv = mInputStream->Available(aIsAvailable); + try { + mInputStream->Available(aIsAvailable); + } @@ -112 +112 @@ - return NS_OK; + return; @@ -115 +115 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -124,3 +124,4 @@ - rv = mInputStream->Available(&count); - if (NS_FAILED(rv)) - return rv; + try { + mInputStream->Available(&count); + } + catch (nsexception &exc) { throw; } @@ -133,5 +133,7 @@ - rv = mInputStream->Read(buffer, count, &amtRead); - if (NS_FAILED(rv)) { - NS_Free(buffer); - return rv; - } + try { + mInputStream->Read(buffer, count, &amtRead); + } + catch (nsexception &exc) { + NS_Free(buffer); + throw nsexception(rv); + } @@ -141 +141 @@ - return NS_OK; + return; @@ -146 +146 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -150 +150 @@ - return mInputStream->IsNonBlocking(aIsNonBlocking); + return /*thower*/ mInputStream->IsNonBlocking(aIsNonBlocking); @@ -153 +153 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -160 +160 @@ - return NS_OK; + return; @@ -164 +164 @@ - return mInputStream->Read(aData, aCount, aReadCount); + return /*thower*/ mInputStream->Read(aData, aCount, aReadCount); @@ -166 +166 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -169 +169 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -176 +176 @@ - return mInputStream->ReadSegments(aFn, aClosure, aCount, aReadCount); + return /*thower*/ mInputStream->ReadSegments(aFn, aClosure, aCount, aReadCount); @@ -179 +179 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -184 +184,3 @@ - nsresult rv = mUnicharInputStream->ReadString(aCount, aString, &readCount); + try { + mUnicharInputStream->ReadString(aCount, aString, &readCount); + } @@ -191 +191 @@ - return NS_OK; + return; @@ -196 +196,3 @@ - nsresult rv = Read(aCount, getter_Copies(cstr)); + try { + Read(aCount, getter_Copies(cstr)); + } @@ -199 +199 @@ - return NS_OK; + return; @@ -202 +202 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -208 +208 @@ - return cstream->ReadLine(aLine, &mUnicharInputStreamHasMore); + return /*thower*/ cstream->ReadLine(aLine, &mUnicharInputStreamHasMore); @@ -211 +211 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -215 +215,3 @@ - nsresult rv = Read8(&byteResult); + try { + wrap_nsexception(Read8(&byteResult)); + } @@ -217 +217 @@ - return rv; + throw nsexception(rv); @@ -220 +220 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -223 +223 @@ - return ReadFully(sizeof *aVal, reinterpret_cast(aVal)); + return /*thower*/ ReadFully(sizeof *aVal, reinterpret_cast(aVal)); @@ -226 +226 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -229 +229,3 @@ - nsresult rv = ReadFully(sizeof *aVal, reinterpret_cast(aVal)); + try { + ReadFully(sizeof *aVal, reinterpret_cast(aVal)); + } @@ -232 +232 @@ - return NS_OK; + return; @@ -235 +235 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -238 +238,3 @@ - nsresult rv = ReadFully(sizeof *aVal, reinterpret_cast(aVal)); + try { + ReadFully(sizeof *aVal, reinterpret_cast(aVal)); + } @@ -241 +241 @@ - return NS_OK; + return; @@ -244 +244 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -249 +249 @@ - return Read32(reinterpret_cast(aFloat)); + return /*thower*/ Read32(reinterpret_cast(aFloat)); @@ -252 +252 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -258 +258,3 @@ - nsresult rv = ReadFully(sizeof(double), reinterpret_cast(aDouble)); + try { + ReadFully(sizeof(double), reinterpret_cast(aDouble)); + } @@ -263 +263 @@ - return NS_OK; + return; @@ -266 +266 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -273,5 +273,7 @@ - nsresult rv = mInputStream->Read(s, aCount, &bytesRead); - if (NS_FAILED(rv)) { - NS_Free(s); - return rv; - } + try { + mInputStream->Read(s, aCount, &bytesRead); + } + catch (nsexception &exc) { + NS_Free(s); + throw nsexception(rv); + } @@ -280 +280 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -284 +284 @@ - return NS_OK; + return; @@ -287,2 +287 @@ -nsresult -nsScriptableInputStream::ReadFully(PRUint32 aCount, char* aBuf) +void nsScriptableInputStream::ReadFully(PRUint32 aCount, char* aBuf) @@ -291 +291,3 @@ - nsresult rv = Read(aBuf, aCount, &bytesRead); + try { + Read(aBuf, aCount, &bytesRead); + } @@ -293 +293 @@ - return (bytesRead != aCount) ? NS_ERROR_FAILURE : NS_OK; + return wrap_nsexception((bytesRead != aCount) ? NS_ERROR_FAILURE : NS_OK); @@ -297 +297 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -302 +302 @@ - return cstream->Seek(aWhence, aOffset); + return /*thower*/ cstream->Seek(aWhence, aOffset); @@ -305 +305 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -310 +310 @@ - return cstream->Tell(aOffset); + return /*thower*/ cstream->Tell(aOffset); @@ -313 +313 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -318 +318 @@ - return cstream->SetEOF(); + return /*thower*/ cstream->SetEOF(); @@ -322 +322 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -327 +327 @@ - return cstream->GetCount(aCount); + return /*thower*/ cstream->GetCount(aCount); @@ -330 +330 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -335 +335 @@ - return cstream->GetStream(aIndex, aStream); + return /*thower*/ cstream->GetStream(aIndex, aStream); @@ -338 +338 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -343 +343 @@ - return cstream->AppendStream(aStream); + return /*thower*/ cstream->AppendStream(aStream); @@ -346 +346 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -351 +351 @@ - return cstream->InsertStream(aStream, aIndex); + return /*thower*/ cstream->InsertStream(aStream, aIndex); @@ -354 +354 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -359 +359 @@ - return cstream->RemoveStream(aIndex); + return /*thower*/ cstream->RemoveStream(aIndex); @@ -362 +362 @@ -NS_METHOD +NS_METHOD_(void) @@ -365 +365 @@ - if (aOuter) return NS_ERROR_NO_AGGREGATION; + if (aOuter) throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -369 +369 @@ - return sis->QueryInterface(aIID, aResult); + return wrap_nsexception(sis->QueryInterface(aIID, aResult)); --- xpcom/io/nsScriptableInputStream.h +++ xpcom/io/nsScriptableInputStream.h @@ -74,4 +74,4 @@ - NS_IMETHOD Available(PRUint32 *aAvailable); - NS_IMETHOD Close(); - NS_IMETHOD IsNonBlocking(PRBool *aIsNonBlocking); - NS_IMETHOD Read(char* aData, + NS_IMETHOD_(void) Available(PRUint32 *aAvailable); + NS_IMETHOD_(void) Close(); + NS_IMETHOD_(void) IsNonBlocking(PRBool *aIsNonBlocking); + NS_IMETHOD_(void) Read(char* aData, @@ -80 +80 @@ - NS_IMETHOD ReadSegments(nsWriteSegmentFun aFn, + NS_IMETHOD_(void) ReadSegments(nsWriteSegmentFun aFn, @@ -84,2 +84,2 @@ - NS_IMETHOD Init(nsIInputStream* aInputStream); - NS_IMETHOD Read(PRUint32 aCount, char** aData); + NS_IMETHOD_(void) Init(nsIInputStream* aInputStream); + NS_IMETHOD_(void) Read(PRUint32 aCount, char** aData); @@ -91 +91 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -97 +97 @@ - nsresult ReadFully(PRUint32 aCount, char* aBuf); + void ReadFully(PRUint32 aCount, char* aBuf); --- xpcom/io/nsScriptableOutputStream.cpp +++ xpcom/io/nsScriptableOutputStream.cpp @@ -60 +60 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -64 +64 @@ - return mUnicharOutputStream->Close(); + return /*thower*/ mUnicharOutputStream->Close(); @@ -67 +67 @@ - return mOutputStream->Close(); + return /*thower*/ mOutputStream->Close(); @@ -69 +69 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -72 +72 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -76 +76 @@ - return mUnicharOutputStream->Flush(); + return /*thower*/ mUnicharOutputStream->Flush(); @@ -79 +79 @@ - return mOutputStream->Flush(); + return /*thower*/ mOutputStream->Flush(); @@ -81 +81 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -86 +86 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -94 +94 @@ - return NS_OK; + return; @@ -99 +99 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -103 +103 @@ - return mOutputStream->IsNonBlocking(aIsNonBlocking); + return /*thower*/ mOutputStream->IsNonBlocking(aIsNonBlocking); @@ -107 +107 @@ - return NS_OK; + return; @@ -110 +110 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -113 +113 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -119 +119 @@ - mUnicharOutputStream->WriteString(str, &ok); + IGNORE_NSEXCEPTION(mUnicharOutputStream->WriteString(str, &ok)); @@ -121 +121 @@ - return NS_OK; + return; @@ -125 +125 @@ - return mOutputStream->Write(aBuffer, aCount, aWriteCount); + return /*thower*/ mOutputStream->Write(aBuffer, aCount, aWriteCount); @@ -127 +127 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -130 +130 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -134 +134 @@ - return mOutputStream->WriteFrom(aStream, aCount, aWriteCount); + return /*thower*/ mOutputStream->WriteFrom(aStream, aCount, aWriteCount); @@ -136 +136 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -139 +139 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -146 +146 @@ - return mOutputStream->WriteSegments(aFn, aClosure, aCount, aReadCount); + return /*thower*/ mOutputStream->WriteSegments(aFn, aClosure, aCount, aReadCount); @@ -149 +149 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -153 +153 @@ - return mUnicharOutputStream->WriteString(aString, aOK); + return /*thower*/ mUnicharOutputStream->WriteString(aString, aOK); @@ -156 +156 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -161 +161,3 @@ - nsresult rv = mOutputStream->Write(cstr.get(), (PRUint32)cstr.Length(), &count); + try { + mOutputStream->Write(cstr.get(), (PRUint32)cstr.Length(), &count); + } @@ -164 +164 @@ - return NS_OK; + return; @@ -167 +167 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -170 +170 @@ - return Write8(aBoolean); + return wrap_nsexception(Write8(aBoolean)); @@ -173 +173 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -176 +176 @@ - return WriteFully((const char *)&aByte, sizeof aByte); + return /*thower*/ WriteFully((const char *)&aByte, sizeof aByte); @@ -179 +179 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -183 +183 @@ - return WriteFully((const char *)&a16, sizeof a16); + return /*thower*/ WriteFully((const char *)&a16, sizeof a16); @@ -186 +186 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -190 +190 @@ - return WriteFully((const char *)&a32, sizeof a32); + return /*thower*/ WriteFully((const char *)&a32, sizeof a32); @@ -193 +193 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -198 +198 @@ - return Write32(*reinterpret_cast(&aFloat)); + return /*thower*/ Write32(*reinterpret_cast(&aFloat)); @@ -201 +201 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -208 +208 @@ - return WriteFully(reinterpret_cast(&val), sizeof val); + return /*thower*/ WriteFully(reinterpret_cast(&val), sizeof val); @@ -211 +211 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -214 +214 @@ - return WriteFully((char *)aBytes, aCount); + return /*thower*/ WriteFully((char *)aBytes, aCount); @@ -217,2 +217 @@ -nsresult -nsScriptableOutputStream::WriteFully(const char *aBuf, PRUint32 aCount) +void nsScriptableOutputStream::WriteFully(const char *aBuf, PRUint32 aCount) @@ -223 +223,3 @@ - nsresult rv = mOutputStream->Write(aBuf, aCount, &bytesWritten); + try { + mOutputStream->Write(aBuf, aCount, &bytesWritten); + } @@ -225 +225 @@ - return (bytesWritten != aCount) ? NS_ERROR_FAILURE : NS_OK; + return wrap_nsexception((bytesWritten != aCount) ? NS_ERROR_FAILURE : NS_OK); @@ -229 +229 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -234 +234 @@ - return cstream->Seek(aWhence, aOffset); + return /*thower*/ cstream->Seek(aWhence, aOffset); @@ -237 +237 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -242 +242 @@ - return cstream->Tell(aOffset); + return /*thower*/ cstream->Tell(aOffset); @@ -245 +245 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -250 +250 @@ - return cstream->SetEOF(); + return /*thower*/ cstream->SetEOF(); @@ -253 +253 @@ -NS_METHOD +NS_METHOD_(void) @@ -256 +256 @@ - if (aOuter) return NS_ERROR_NO_AGGREGATION; + if (aOuter) throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -260 +260 @@ - return sos->QueryInterface(aIID, aResult); + return wrap_nsexception(sos->QueryInterface(aIID, aResult)); --- xpcom/io/nsScriptableOutputStream.h +++ xpcom/io/nsScriptableOutputStream.h @@ -73 +73 @@ - static NS_METHOD + static NS_METHOD_(void) @@ -79 +79 @@ - nsresult WriteFully(const char *aBuf, PRUint32 aCount); + void WriteFully(const char *aBuf, PRUint32 aCount); --- xpcom/io/nsSegmentedBuffer.cpp +++ xpcom/io/nsSegmentedBuffer.cpp @@ -41,2 +41 @@ -nsresult -nsSegmentedBuffer::Init(PRUint32 segmentSize, PRUint32 maxSize, +void nsSegmentedBuffer::Init(PRUint32 segmentSize, PRUint32 maxSize, @@ -46 +46 @@ - return NS_ERROR_FAILURE; // initialized more than once + throw nsexception(NS_ERROR_FAILURE); // initialized more than once @@ -61 +61 @@ - return NS_OK; + return; @@ -176 +176 @@ - buf->Init(4, 16); + IGNORE_NSEXCEPTION(buf->Init(4, 16)); --- xpcom/io/nsSegmentedBuffer.h +++ xpcom/io/nsSegmentedBuffer.h @@ -59 +59 @@ - NS_COM nsresult Init(PRUint32 segmentSize, PRUint32 maxSize, + NS_COM void Init(PRUint32 segmentSize, PRUint32 maxSize, --- xpcom/io/nsStorageStream.cpp +++ xpcom/io/nsStorageStream.cpp @@ -92 +92 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -97,2 +97 @@ - if (!mSegmentedBuffer) - return NS_ERROR_OUT_OF_MEMORY; + @@ -105 +105 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -107 +107 @@ - return mSegmentedBuffer->Init(segmentSize, maxSize, segmentAllocator); + return /*thower*/ mSegmentedBuffer->Init(segmentSize, maxSize, segmentAllocator); @@ -110 +110 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -118 +118 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -120,2 +120,4 @@ - nsresult rv = Seek(aStartingOffset); - if (NS_FAILED(rv)) return rv; + try { + Seek(aStartingOffset); + } + catch (nsexception &exc) { throw; } @@ -130,2 +130,4 @@ - rv = Seek(aStartingOffset); - if (NS_FAILED(rv)) return rv; + try { + Seek(aStartingOffset); + } + catch (nsexception &exc) { throw; } @@ -136 +136 @@ - return NS_OK; + return; @@ -139 +139 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -159 +159 @@ - return NS_OK; + return; @@ -162 +162 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -165 +165 @@ - return NS_OK; + return; @@ -168 +168 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -224 +224 @@ - return rv; + throw nsexception(rv); @@ -227 +227 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -231 +231 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -234 +234 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -238 +238 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -241 +241 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -245 +245 @@ - return NS_OK; + return; @@ -248 +248 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -253 +253 @@ - return NS_OK; + return; @@ -257 +257 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -263 +263 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -266 +266 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -279 +279 @@ - return NS_OK; + return; @@ -282 +282 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -288 +288 @@ - return NS_OK; + return; @@ -291 +291 @@ -NS_METHOD +NS_METHOD_(void) @@ -302 +302 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -305 +305 @@ - SetLength(aPosition); + IGNORE_NSEXCEPTION(SetLength(aPosition)); @@ -313 +313 @@ - return NS_OK; + return; @@ -332 +332 @@ - return NS_OK; + return; @@ -362 +362 @@ - NS_METHOD Seek(PRUint32 aPosition); + NS_METHOD_(void) Seek(PRUint32 aPosition); @@ -373 +373 @@ - nsresult mStatus; + void mStatus; @@ -383 +383 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -389,2 +389 @@ - if (!inputStream) - return NS_ERROR_OUT_OF_MEMORY; + @@ -394,5 +394,7 @@ - nsresult rv = inputStream->Seek(aStartingOffset); - if (NS_FAILED(rv)) { - NS_RELEASE(inputStream); - return rv; - } + try { + inputStream->Seek(aStartingOffset); + } + catch (nsexception &exc) { + NS_RELEASE(inputStream); + throw nsexception(rv); + } @@ -401 +401 @@ - return NS_OK; + return; @@ -404 +404 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -408 +408 @@ - return NS_OK; + return; @@ -411 +411 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -415 +415 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -418 +418 @@ - return NS_OK; + return; @@ -421 +421 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -424 +424 @@ - return ReadSegments(NS_CopySegmentToBuffer, aBuffer, aCount, aNumRead); + return wrap_nsexception(ReadSegments(NS_CopySegmentToBuffer, aBuffer, aCount, aNumRead)); @@ -427 +427 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -432 +432 @@ - return NS_OK; + return; @@ -434 +434 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -453,2 +453,4 @@ - rv = writer(this, closure, mReadCursor, aCount - remainingCapacity, - count, &bytesConsumed); + try { + writer(this, closure, mReadCursor, aCount - remainingCapacity, + count, &bytesConsumed); + } @@ -470 +470 @@ - return NS_BASE_STREAM_WOULD_BLOCK; + throw nsexception(NS_BASE_STREAM_WOULD_BLOCK); @@ -472 +472 @@ - return NS_OK; + return; @@ -475 +475 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -482 +482 @@ - return NS_OK; + return; @@ -485 +485 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -489 +489 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -504 +504 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -507 +507 @@ - return NS_OK; + return; @@ -509 +509 @@ - return Seek(pos); + return /*thower*/ Seek(pos); @@ -512 +512 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -516 +516 @@ - return mStatus; + return wrap_nsexception(mStatus); @@ -519 +519 @@ - return NS_OK; + return; @@ -522 +522 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -526 +526 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -529 +529 @@ -NS_METHOD +NS_METHOD_(void) @@ -534 +534 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -537 +537 @@ - return NS_OK; + return; @@ -546 +546 @@ - return NS_OK; + return; @@ -549,2 +549 @@ -NS_COM nsresult -NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result) +NS_COM void NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result) @@ -555 +555 @@ - if (!storageStream) return NS_ERROR_OUT_OF_MEMORY; + @@ -558,5 +558,7 @@ - nsresult rv = storageStream->Init(segmentSize, maxSize, nsnull); - if (NS_FAILED(rv)) { - NS_RELEASE(storageStream); - return rv; - } + try { + storageStream->Init(segmentSize, maxSize, nsnull); + } + catch (nsexception &exc) { + NS_RELEASE(storageStream); + throw nsexception(rv); + } @@ -564 +564 @@ - return NS_OK; + return; --- xpcom/io/nsStorageStream.h +++ xpcom/io/nsStorageStream.h @@ -93 +93 @@ - NS_METHOD Seek(PRInt32 aPosition); + NS_METHOD_(void) Seek(PRInt32 aPosition); --- xpcom/io/nsStreamUtils.cpp +++ xpcom/io/nsStreamUtils.cpp @@ -75 +75,3 @@ - nsresult rv = mTarget->IsOnCurrentThread(&val); + try { + mTarget->IsOnCurrentThread(&val); + } @@ -78,2 +78,2 @@ - NS_NewInputStreamReadyEvent(getter_AddRefs(event), mCallback, - mTarget); + IGNORE_NSEXCEPTION(NS_NewInputStreamReadyEvent(getter_AddRefs(event), mCallback, + mTarget)); @@ -82,6 +82,8 @@ - rv = event->OnInputStreamReady(nsnull); - if (NS_FAILED(rv)) { - NS_NOTREACHED("leaking stream event"); - nsISupports *sup = event; - NS_ADDREF(sup); - } + try { + event->OnInputStreamReady(nsnull); + } + catch (nsexception &exc) { + NS_NOTREACHED("leaking stream event"); + nsISupports *sup = event; + NS_ADDREF(sup); + } @@ -93 +93 @@ - NS_IMETHOD OnInputStreamReady(nsIAsyncInputStream *stream) + NS_IMETHOD_(void) OnInputStreamReady(nsIAsyncInputStream *stream) @@ -97,6 +97,7 @@ - nsresult rv = - mTarget->Dispatch(this, NS_DISPATCH_NORMAL); - if (NS_FAILED(rv)) { - NS_WARNING("Dispatch failed"); - return NS_ERROR_FAILURE; - } + try { + mTarget->Dispatch(this, NS_DISPATCH_NORMAL); + } + catch (nsexception &exc) { + NS_WARNING("Dispatch failed"); + throw nsexception(NS_ERROR_FAILURE); + } @@ -104 +104 @@ - return NS_OK; + return; @@ -107 +107 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -111 +111 @@ - mCallback->OnInputStreamReady(mStream); + IGNORE_NSEXCEPTION(mCallback->OnInputStreamReady(mStream)); @@ -114 +114 @@ - return NS_OK; + return; @@ -154 +154,3 @@ - nsresult rv = mTarget->IsOnCurrentThread(&val); + try { + mTarget->IsOnCurrentThread(&val); + } @@ -157,2 +157,2 @@ - NS_NewOutputStreamReadyEvent(getter_AddRefs(event), mCallback, - mTarget); + IGNORE_NSEXCEPTION(NS_NewOutputStreamReadyEvent(getter_AddRefs(event), mCallback, + mTarget)); @@ -161,6 +161,8 @@ - rv = event->OnOutputStreamReady(nsnull); - if (NS_FAILED(rv)) { - NS_NOTREACHED("leaking stream event"); - nsISupports *sup = event; - NS_ADDREF(sup); - } + try { + event->OnOutputStreamReady(nsnull); + } + catch (nsexception &exc) { + NS_NOTREACHED("leaking stream event"); + nsISupports *sup = event; + NS_ADDREF(sup); + } @@ -172 +172 @@ - NS_IMETHOD OnOutputStreamReady(nsIAsyncOutputStream *stream) + NS_IMETHOD_(void) OnOutputStreamReady(nsIAsyncOutputStream *stream) @@ -176,6 +176,7 @@ - nsresult rv = - mTarget->Dispatch(this, NS_DISPATCH_NORMAL); - if (NS_FAILED(rv)) { - NS_WARNING("PostEvent failed"); - return NS_ERROR_FAILURE; - } + try { + mTarget->Dispatch(this, NS_DISPATCH_NORMAL); + } + catch (nsexception &exc) { + NS_WARNING("PostEvent failed"); + throw nsexception(NS_ERROR_FAILURE); + } @@ -183 +183 @@ - return NS_OK; + return; @@ -186 +186 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -190 +190 @@ - mCallback->OnOutputStreamReady(mStream); + IGNORE_NSEXCEPTION(mCallback->OnOutputStreamReady(mStream)); @@ -193 +193 @@ - return NS_OK; + return; @@ -207,2 +207 @@ -NS_COM nsresult -NS_NewInputStreamReadyEvent(nsIInputStreamCallback **event, +NS_COM void NS_NewInputStreamReadyEvent(nsIInputStreamCallback **event, @@ -215,2 +215 @@ - if (!ev) - return NS_ERROR_OUT_OF_MEMORY; + @@ -218 +218 @@ - return NS_OK; + return; @@ -221,2 +221 @@ -NS_COM nsresult -NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **event, +NS_COM void NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **event, @@ -229,2 +229 @@ - if (!ev) - return NS_ERROR_OUT_OF_MEMORY; + @@ -232 +232 @@ - return NS_OK; + return; @@ -264 +264 @@ - nsresult Start(nsIInputStream *source, + void Start(nsIInputStream *source, @@ -279,2 +279 @@ - if (!mLock) - return NS_ERROR_OUT_OF_MEMORY; + @@ -285 +285 @@ - return PostContinuationEvent(); + return wrap_nsexception(PostContinuationEvent()); @@ -306 +306 @@ - mAsyncSource->AsyncWait(this, 0, 0, nsnull); + IGNORE_NSEXCEPTION(mAsyncSource->AsyncWait(this, 0, 0, nsnull)); @@ -309,3 +309,3 @@ - mAsyncSink->AsyncWait(this, - nsIAsyncOutputStream::WAIT_CLOSURE_ONLY, - 0, nsnull); + IGNORE_NSEXCEPTION(mAsyncSink->AsyncWait(this, + nsIAsyncOutputStream::WAIT_CLOSURE_ONLY, + 0, nsnull)); @@ -317 +317 @@ - mAsyncSink->AsyncWait(this, 0, 0, nsnull); + IGNORE_NSEXCEPTION(mAsyncSink->AsyncWait(this, 0, 0, nsnull)); @@ -320,3 +320,3 @@ - mAsyncSource->AsyncWait(this, - nsIAsyncInputStream::WAIT_CLOSURE_ONLY, - 0, nsnull); + IGNORE_NSEXCEPTION(mAsyncSource->AsyncWait(this, + nsIAsyncInputStream::WAIT_CLOSURE_ONLY, + 0, nsnull)); @@ -327 +327 @@ - mAsyncSource->CloseWithStatus(sinkCondition); + IGNORE_NSEXCEPTION(mAsyncSource->CloseWithStatus(sinkCondition)); @@ -329 +329 @@ - mSource->Close(); + IGNORE_NSEXCEPTION(mSource->Close()); @@ -335 +335 @@ - mAsyncSink->CloseWithStatus(sourceCondition); + IGNORE_NSEXCEPTION(mAsyncSink->CloseWithStatus(sourceCondition)); @@ -337 +337 @@ - mSink->Close(); + IGNORE_NSEXCEPTION(mSink->Close()); @@ -356 +356 @@ - NS_IMETHOD OnInputStreamReady(nsIAsyncInputStream *source) + NS_IMETHOD_(void) OnInputStreamReady(nsIAsyncInputStream *source) @@ -359 +359 @@ - return NS_OK; + return; @@ -362 +362 @@ - NS_IMETHOD OnOutputStreamReady(nsIAsyncOutputStream *sink) + NS_IMETHOD_(void) OnOutputStreamReady(nsIAsyncOutputStream *sink) @@ -365 +365 @@ - return NS_OK; + return; @@ -369 +369 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -381 +381 @@ - return NS_OK; + return; @@ -384 +384 @@ - nsresult PostContinuationEvent() + void PostContinuationEvent() @@ -394 +394 @@ - return PostContinuationEvent_Locked(); + return wrap_nsexception(PostContinuationEvent_Locked()); @@ -397 +397 @@ - nsresult PostContinuationEvent_Locked() + void PostContinuationEvent_Locked() @@ -403 +403,3 @@ - rv = mTarget->Dispatch(this, NS_DISPATCH_NORMAL); + try { + mTarget->Dispatch(this, NS_DISPATCH_NORMAL); + } @@ -409 +409 @@ - return rv; + throw nsexception(rv); @@ -439 +439 @@ - nsresult mSinkCondition; + void mSinkCondition; @@ -442 +442 @@ - static NS_METHOD ConsumeInputBuffer(nsIInputStream *inStr, + static NS_METHOD_(void) ConsumeInputBuffer(nsIInputStream *inStr, @@ -451,5 +451,4 @@ - nsresult rv = state->mSink->Write(buffer, count, countWritten); - if (NS_FAILED(rv)) - state->mSinkCondition = rv; - else if (*countWritten == 0) - state->mSinkCondition = NS_BASE_STREAM_CLOSED; + try { + state->mSink->Write(buffer, count, countWritten); + } + catch (nsexception &exc) state->mSinkCondition = rv; @@ -457 +457 @@ - return state->mSinkCondition; + return wrap_nsexception(state->mSinkCondition); @@ -482 +482 @@ - nsresult mSourceCondition; + void mSourceCondition; @@ -485 +485 @@ - static NS_METHOD FillOutputBuffer(nsIOutputStream *outStr, + static NS_METHOD_(void) FillOutputBuffer(nsIOutputStream *outStr, @@ -494,5 +494,4 @@ - nsresult rv = state->mSource->Read(buffer, count, countRead); - if (NS_FAILED(rv)) - state->mSourceCondition = rv; - else if (*countRead == 0) - state->mSourceCondition = NS_BASE_STREAM_CLOSED; + try { + state->mSource->Read(buffer, count, countRead); + } + catch (nsexception &exc) state->mSourceCondition = rv; @@ -500 +500 @@ - return state->mSourceCondition; + return wrap_nsexception(state->mSourceCondition); @@ -519,2 +519 @@ -NS_COM nsresult -NS_AsyncCopy(nsIInputStream *source, +NS_COM void NS_AsyncCopy(nsIInputStream *source, @@ -538,2 +538 @@ - if (!copier) - return NS_ERROR_OUT_OF_MEMORY; + @@ -543 +543,3 @@ - rv = copier->Start(source, sink, target, callback, closure, chunkSize); + try { + copier->Start(source, sink, target, callback, closure, chunkSize); + } @@ -546 +546 @@ - return rv; + throw nsexception(rv); @@ -551,2 +551 @@ -NS_COM nsresult -NS_ConsumeStream(nsIInputStream *stream, PRUint32 maxCount, nsACString &result) +NS_COM void NS_ConsumeStream(nsIInputStream *stream, PRUint32 maxCount, nsACString &result) @@ -559,6 +559,8 @@ - rv = stream->Available(&avail); - if (NS_FAILED(rv)) { - if (rv == NS_BASE_STREAM_CLOSED) - rv = NS_OK; - break; - } + try { + stream->Available(&avail); + } + catch (nsexception &exc) { + if (rv == NS_BASE_STREAM_CLOSED) + rv = NS_OK; + break; + } @@ -574 +574 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -578,3 +578,4 @@ - rv = stream->Read(buf, avail, &n); - if (NS_FAILED(rv)) - break; + try { + stream->Read(buf, avail, &n); + } + catch (nsexception &exc) break; @@ -588 +588 @@ - return rv; + throw nsexception(rv); @@ -593 +593 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -603 +603 @@ - return NS_ERROR_ABORT; // don't call me anymore + throw nsexception(NS_ERROR_ABORT); // don't call me anymore @@ -611,2 +611,4 @@ - nsresult rv = stream->ReadSegments(TestInputStream, - &result, 1, &n); + try { + stream->ReadSegments(TestInputStream, + &result, 1, &n); + } @@ -616 +616 @@ -static NS_METHOD +static NS_METHOD_(void) @@ -626 +626 @@ - return NS_ERROR_ABORT; // don't call me anymore + throw nsexception(NS_ERROR_ABORT); // don't call me anymore @@ -634 +634 @@ - stream->WriteSegments(TestOutputStream, &result, 1, &n); + IGNORE_NSEXCEPTION(stream->WriteSegments(TestOutputStream, &result, 1, &n)); @@ -640 +640 @@ -NS_COM NS_METHOD +NS_COM NS_METHOD_(void) @@ -652,3 +652,4 @@ - nsresult rv = outStr->Write(buffer, count, &n); - if (NS_FAILED(rv)) - return rv; + try { + outStr->Write(buffer, count, &n); + } + catch (nsexception &exc) { throw; } @@ -659 +659 @@ - return NS_OK; + return; @@ -662 +662 @@ -NS_COM NS_METHOD +NS_COM NS_METHOD_(void) @@ -673 +673 @@ - return NS_OK; + return; @@ -676 +676 @@ -NS_COM NS_METHOD +NS_COM NS_METHOD_(void) @@ -685 +685 @@ - return NS_OK; + return; @@ -690 +690 @@ -NS_COM NS_METHOD +NS_COM NS_METHOD_(void) @@ -699,2 +699,2 @@ - return thunk->mFun(thunk->mStream, thunk->mClosure, buffer, offset, count, - countWritten); + return wrap_nsexception(thunk->mFun(thunk->mStream, thunk->mClosure, buffer, offset, count, + countWritten)); --- xpcom/io/nsStreamUtils.h +++ xpcom/io/nsStreamUtils.h @@ -59,2 +59 @@ -extern NS_COM nsresult -NS_NewInputStreamReadyEvent(nsIInputStreamCallback **aEvent, +extern NS_COM void NS_NewInputStreamReadyEvent(nsIInputStreamCallback **aEvent, @@ -74,2 +74 @@ -extern NS_COM nsresult -NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **aEvent, +extern NS_COM void NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **aEvent, @@ -102,2 +102 @@ -extern NS_COM nsresult -NS_AsyncCopy(nsIInputStream *aSource, +extern NS_COM void NS_AsyncCopy(nsIInputStream *aSource, @@ -134,2 +134 @@ -extern NS_COM nsresult -NS_ConsumeStream(nsIInputStream *aSource, PRUint32 aMaxCount, +extern NS_COM void NS_ConsumeStream(nsIInputStream *aSource, PRUint32 aMaxCount, @@ -177 +177 @@ -extern NS_COM NS_METHOD +extern NS_COM NS_METHOD_(void) @@ -190 +190 @@ -extern NS_COM NS_METHOD +extern NS_COM NS_METHOD_(void) @@ -202 +202 @@ -extern NS_COM NS_METHOD +extern NS_COM NS_METHOD_(void) @@ -218 +218 @@ -extern NS_COM NS_METHOD +extern NS_COM NS_METHOD_(void) --- xpcom/io/nsStringStream.cpp +++ xpcom/io/nsStringStream.cpp @@ -137 +137 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -141 +141 @@ - return NS_OK; + return; @@ -144 +144 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -153 +153 @@ - return NS_OK; + return; @@ -156 +156 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -161 +161 @@ - return SetData(iter.get(), iter.size_forward()); + return wrap_nsexception(SetData(iter.get(), iter.size_forward())); @@ -164 +164 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -168 +168 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -175 +175 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -187,2 +187 @@ - if (!copy) - return NS_ERROR_OUT_OF_MEMORY; + @@ -191 +191 @@ - return AdoptData(copy, dataLen); + return wrap_nsexception(AdoptData(copy, dataLen)); @@ -194 +194 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -207 +207 @@ - return NS_OK; + return; @@ -210 +210 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -223 +223 @@ - return NS_OK; + return; @@ -230 +230 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -237 +237 @@ - return NS_OK; + return; @@ -240 +240 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -246 +246 @@ - return NS_BASE_STREAM_CLOSED; + throw nsexception(NS_BASE_STREAM_CLOSED); @@ -249 +249 @@ - return NS_OK; + return; @@ -252 +252 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -256 +256 @@ - return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, aReadCount); + return wrap_nsexception(ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, aReadCount)); @@ -259 +259 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -270 +270 @@ - return NS_OK; + return; @@ -276 +276,3 @@ - nsresult rv = writer(this, closure, mData + mOffset, 0, aCount, result); + try { + writer(this, closure, mData + mOffset, 0, aCount, result); + } @@ -284 +284 @@ - return NS_OK; + return; @@ -287 +287 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -291 +291 @@ - return NS_OK; + return; @@ -298 +298 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -302 +302 @@ - return NS_BASE_STREAM_CLOSED; + throw nsexception(NS_BASE_STREAM_CLOSED); @@ -318 +318 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -327 +327 @@ - return NS_OK; + return; @@ -330 +330 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -334 +334 @@ - return NS_BASE_STREAM_CLOSED; + throw nsexception(NS_BASE_STREAM_CLOSED); @@ -337 +337 @@ - return NS_OK; + return; @@ -340 +340 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -344 +344 @@ - return NS_BASE_STREAM_CLOSED; + throw nsexception(NS_BASE_STREAM_CLOSED); @@ -347 +347 @@ - return NS_OK; + return; @@ -350,2 +350 @@ -NS_COM nsresult -NS_NewByteInputStream(nsIInputStream** aStreamResult, +NS_COM void NS_NewByteInputStream(nsIInputStream** aStreamResult, @@ -358,2 +358 @@ - if (! stream) - return NS_ERROR_OUT_OF_MEMORY; + @@ -366 +366,3 @@ - rv = stream->SetData(aStringToRead, aLength); + try { + stream->SetData(aStringToRead, aLength); + } @@ -369 +369,3 @@ - rv = stream->ShareData(aStringToRead, aLength); + try { + stream->ShareData(aStringToRead, aLength); + } @@ -372 +372,3 @@ - rv = stream->AdoptData(const_cast(aStringToRead), aLength); + try { + stream->AdoptData(const_cast(aStringToRead), aLength); + } @@ -379,4 +379,4 @@ - if (NS_FAILED(rv)) { - NS_RELEASE(stream); - return rv; - } + catch (nsexception &exc) { + NS_RELEASE(stream); + throw nsexception(rv); + } @@ -385 +385 @@ - return NS_OK; + return; @@ -388,2 +388 @@ -NS_COM nsresult -NS_NewStringInputStream(nsIInputStream** aStreamResult, +NS_COM void NS_NewStringInputStream(nsIInputStream** aStreamResult, @@ -393,2 +393 @@ - if (!data) - return NS_ERROR_OUT_OF_MEMORY; + @@ -396,6 +396,7 @@ - nsresult rv = NS_NewByteInputStream(aStreamResult, data, - aStringToRead.Length(), - NS_ASSIGNMENT_ADOPT); - if (NS_FAILED(rv)) - NS_Free(data); - return rv; + try { + NS_NewByteInputStream(aStreamResult, data, + aStringToRead.Length(), + NS_ASSIGNMENT_ADOPT); + } + catch (nsexception &exc) NS_Free(data); + throw nsexception(rv); @@ -404,2 +404 @@ -NS_COM nsresult -NS_NewCStringInputStream(nsIInputStream** aStreamResult, +NS_COM void NS_NewCStringInputStream(nsIInputStream** aStreamResult, @@ -411 +411 @@ - return NS_NewByteInputStream(aStreamResult, data.get(), data.size_forward(), + return /*thower*/ NS_NewByteInputStream(aStreamResult, data.get(), data.size_forward(), @@ -416 +416 @@ -NS_METHOD +NS_METHOD_(void) @@ -424,2 +424 @@ - if (!inst) - return NS_ERROR_OUT_OF_MEMORY; + @@ -428 +428,3 @@ - nsresult rv = inst->QueryInterface(iid, result); + try { + wrap_nsexception(inst->QueryInterface(iid, result)); + } @@ -431 +431 @@ - return rv; + throw nsexception(rv); --- xpcom/io/nsStringStream.h +++ xpcom/io/nsStringStream.h @@ -83,2 +83 @@ -extern NS_COM nsresult -NS_NewByteInputStream(nsIInputStream** aStreamResult, +extern NS_COM void NS_NewByteInputStream(nsIInputStream** aStreamResult, @@ -96,2 +96 @@ -extern NS_COM nsresult -NS_NewStringInputStream(nsIInputStream** aStreamResult, +extern NS_COM void NS_NewStringInputStream(nsIInputStream** aStreamResult, @@ -104,2 +104 @@ -extern NS_COM nsresult -NS_NewCStringInputStream(nsIInputStream** aStreamResult, +extern NS_COM void NS_NewCStringInputStream(nsIInputStream** aStreamResult, --- xpcom/io/nsUnicharInputStream.cpp +++ xpcom/io/nsUnicharInputStream.cpp @@ -72 +72 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -79 +79 @@ - return NS_OK; + return; @@ -91 +91 @@ - return NS_OK; + return; @@ -94 +94 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -109,2 +109,4 @@ - rv = aWriter(this, aClosure, iter.get() + mPos, - totalBytesWritten, aCount, &bytesWritten); + try { + aWriter(this, aClosure, iter.get() + mPos, + totalBytesWritten, aCount, &bytesWritten); + } @@ -112,4 +112,4 @@ - if (NS_FAILED(rv)) { - // don't propagate errors to the caller - break; - } + catch (nsexception &exc) { + // don't propagate errors to the caller + break; + } @@ -124 +124 @@ - return NS_OK; + return; @@ -127 +127 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -133 +133 @@ - return NS_OK; + return; @@ -142 +142 @@ - return NS_OK; + return; @@ -145 +145 @@ -nsresult StringUnicharInputStream::Close() +void StringUnicharInputStream::Close() @@ -148 +148 @@ - return NS_OK; + return; @@ -158 +158 @@ - nsresult Init(nsIInputStream* aStream); + void Init(nsIInputStream* aStream); @@ -187,2 +187 @@ -nsresult -UTF8InputStream::Init(nsIInputStream* aStream) +void UTF8InputStream::Init(nsIInputStream* aStream) @@ -190,6 +190,10 @@ - nsresult rv = NS_NewByteBuffer(getter_AddRefs(mByteData), nsnull, - STRING_BUFFER_SIZE); - if (NS_FAILED(rv)) return rv; - rv = NS_NewUnicharBuffer(getter_AddRefs(mUnicharData), nsnull, - STRING_BUFFER_SIZE); - if (NS_FAILED(rv)) return rv; + try { + NS_NewByteBuffer(getter_AddRefs(mByteData), nsnull, + STRING_BUFFER_SIZE); + } + catch (nsexception &exc) { throw; } + try { + NS_NewUnicharBuffer(getter_AddRefs(mUnicharData), nsnull, + STRING_BUFFER_SIZE); + } + catch (nsexception &exc) { throw; } @@ -199 +199 @@ - return NS_OK; + return; @@ -209 +209 @@ -nsresult UTF8InputStream::Close() +void UTF8InputStream::Close() @@ -215 +215 @@ - return NS_OK; + return; @@ -218 +218 @@ -nsresult UTF8InputStream::Read(PRUnichar* aBuf, +void UTF8InputStream::Read(PRUnichar* aBuf, @@ -230 +230 @@ - return errorCode; + throw nsexception(errorCode); @@ -240 +240 @@ - return NS_OK; + return; @@ -243 +243 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -256 +256 @@ - return rv; + throw nsexception(rv); @@ -267,3 +267,5 @@ - rv = aWriter(this, aClosure, - mUnicharData->GetBuffer() + mUnicharDataOffset, - totalBytesWritten, bytesToWrite, &bytesWritten); + try { + aWriter(this, aClosure, + mUnicharData->GetBuffer() + mUnicharDataOffset, + totalBytesWritten, bytesToWrite, &bytesWritten); + } @@ -271,4 +271,4 @@ - if (NS_FAILED(rv)) { - // don't propagate errors to the caller - break; - } + catch (nsexception &exc) { + // don't propagate errors to the caller + break; + } @@ -283 +283 @@ - return NS_OK; + return; @@ -286 +286 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -298 +298 @@ - return errorCode; + throw nsexception(errorCode); @@ -310 +310 @@ - return NS_OK; + return; @@ -409 +409 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -413 +413 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -416 +416 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -419 +419 @@ - return NS_OK; + return; @@ -422 +422 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -427,3 +427 @@ - if (!it) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -432 +432 @@ - return NS_OK; + return; @@ -435 +435 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -443,2 +443 @@ - if (!it) - return NS_ERROR_OUT_OF_MEMORY; + @@ -446,3 +446,4 @@ - nsresult rv = it->Init(aStreamToWrap); - if (NS_FAILED(rv)) - return rv; + try { + it->Init(aStreamToWrap); + } + catch (nsexception &exc) { throw; } @@ -451 +451 @@ - return NS_OK; + return; --- xpcom/proxy/src/nsProxyEvent.cpp +++ xpcom/proxy/src/nsProxyEvent.cpp @@ -87 +87 @@ - NS_IMETHOD QueryInterface(REFNSIID aIID, void **aResult); + NS_IMETHOD_(void) QueryInterface(REFNSIID aIID, void **aResult); @@ -93 +93 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -98 +98 @@ - return NS_OK; + return; @@ -103 +103 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -113 +113 @@ - return NS_OK; + return; @@ -115 +115 @@ - return nsRunnable::QueryInterface(aIID, aResult); + return wrap_nsexception(nsRunnable::QueryInterface(aIID, aResult)); @@ -120 +120 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -124 +124 @@ - return NS_OK; + return; @@ -162 +162 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -168 +168 @@ - return NS_OK; + return; @@ -170 +170 @@ - return nsRunnable::QueryInterface(aIID, aResult); + return wrap_nsexception(nsRunnable::QueryInterface(aIID, aResult)); @@ -173 +173 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -187 +187 @@ - return NS_OK; + return; @@ -362 +362 @@ - NS_ProxyRelease(mTarget, doomed); + IGNORE_NSEXCEPTION(NS_ProxyRelease(mTarget, doomed)); @@ -430,2 +430 @@ -nsresult -nsProxyObject::LockedFind(REFNSIID aIID, void **aResult) +void nsProxyObject::LockedFind(REFNSIID aIID, void **aResult) @@ -442 +442 @@ - return NS_OK; + return; @@ -454,3 +454,4 @@ - nsresult rv = pom->GetClass(aIID, &pec); - if (NS_FAILED(rv)) - return rv; + try { + pom->GetClass(aIID, &pec); + } + catch (nsexception &exc) { throw; } @@ -459,3 +459,4 @@ - rv = mRealObject->QueryInterface(aIID, (void**) &newInterface); - if (NS_FAILED(rv)) - return rv; + try { + mRealObject->QueryInterface(aIID, (void**) &newInterface); + } + catch (nsexception &exc) { throw; } @@ -467 +467 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -470,4 +470,4 @@ - if (NS_FAILED(rv)) { - delete newpeo; - return rv; - } + catch (nsexception &exc) { + delete newpeo; + throw nsexception(rv); + } @@ -483 +483 @@ - return NS_OK; + return; @@ -493 +493 @@ - return NS_OK; + return; --- xpcom/proxy/src/nsProxyEventObject.cpp +++ xpcom/proxy/src/nsProxyEventObject.cpp @@ -137,2 +137 @@ -nsresult -nsProxyEventObject::convertMiniVariantToVariant(const XPTMethodDescriptor *methodInfo, +void nsProxyEventObject::convertMiniVariantToVariant(const XPTMethodDescriptor *methodInfo, @@ -147 +147 @@ - if (!paramCount) return NS_OK; + if (!paramCount) return; @@ -152 +152 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -161 +161 @@ - return NS_ERROR_PROXY_INVALID_OUT_PARAMETER; + throw nsexception(NS_ERROR_PROXY_INVALID_OUT_PARAMETER); @@ -167 +167 @@ - return NS_OK; + return; @@ -192 +192 @@ - event->QueryInterface(kFilterIID, getter_AddRefs(poci)); + IGNORE_NSEXCEPTION(event->QueryInterface(kFilterIID, getter_AddRefs(poci))); @@ -196 +196 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -206 +206 @@ - return NS_ERROR_PROXY_INVALID_IN_PARAMETER; + throw nsexception(NS_ERROR_PROXY_INVALID_IN_PARAMETER); @@ -210,4 +210,5 @@ - rv = convertMiniVariantToVariant(methodInfo, params, - &fullParam, ¶mCount); - if (NS_FAILED(rv)) - return rv; + try { + convertMiniVariantToVariant(methodInfo, params, + &fullParam, ¶mCount); + } + catch (nsexception &exc) { throw; } @@ -221,2 +221,4 @@ - rv = NS_InvokeByIndex(mRealInterface, methodIndex, - paramCount, fullParam); + try { + NS_InvokeByIndex(mRealInterface, methodIndex, + paramCount, fullParam); + } @@ -227 +227 @@ - return rv; + throw nsexception(rv); @@ -233,2 +233 @@ - if (!proxyInfo) - return NS_ERROR_OUT_OF_MEMORY; + @@ -237 +237 @@ - return GetTarget()->Dispatch(proxyInfo, NS_DISPATCH_NORMAL); + return /*thower*/ GetTarget()->Dispatch(proxyInfo, NS_DISPATCH_NORMAL); @@ -249,3 +249,2 @@ - if (!filter) - return NS_ERROR_OUT_OF_MEMORY; - threadInt->PushEventQueue(filter); + + IGNORE_NSEXCEPTION(threadInt->PushEventQueue(filter)); @@ -256 +256,3 @@ - rv = GetTarget()->Dispatch(proxyInfo, NS_DISPATCH_NORMAL); + try { + GetTarget()->Dispatch(proxyInfo, NS_DISPATCH_NORMAL); + } @@ -264 +264,3 @@ - rv = proxyInfo->GetResult(); + try { + proxyInfo->GetResult(); + } @@ -269 +269 @@ - threadInt->PopEventQueue(); + IGNORE_NSEXCEPTION(threadInt->PopEventQueue()); @@ -272 +272 @@ - return rv; + throw nsexception(rv); --- xpcom/proxy/src/nsProxyEventPrivate.h +++ xpcom/proxy/src/nsProxyEventPrivate.h @@ -124 +124 @@ - nsresult LockedFind(REFNSIID iid, void **aResult); + void LockedFind(REFNSIID iid, void **aResult); @@ -168 +168 @@ - NS_IMETHOD CallMethod(PRUint16 methodIndex, + NS_IMETHOD_(void) CallMethod(PRUint16 methodIndex, @@ -177 +177 @@ - nsresult convertMiniVariantToVariant(const XPTMethodDescriptor *methodInfo, + void convertMiniVariantToVariant(const XPTMethodDescriptor *methodInfo, @@ -220 +220 @@ - NS_IMETHOD QueryInterface(REFNSIID aIID, void **aResult); + NS_IMETHOD_(void) QueryInterface(REFNSIID aIID, void **aResult); @@ -235 +235 @@ - nsresult GetResult() const { return mResult; } + void GetResult() const { return wrap_nsexception(); } @@ -252 +252 @@ - nsresult mResult; /* this is the return result of the called function */ + void mResult; /* this is the return result of the called function */ @@ -280 +280 @@ - static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); + static NS_METHOD_(void) Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr); @@ -289 +289 @@ - nsresult GetClass(REFNSIID aIID, nsProxyEventClass **aResult); + void GetClass(REFNSIID aIID, nsProxyEventClass **aResult); --- xpcom/proxy/src/nsProxyObjectManager.cpp +++ xpcom/proxy/src/nsProxyObjectManager.cpp @@ -140 +140 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -145,2 +145 @@ - if (!proxyObjectManager) - return NS_ERROR_OUT_OF_MEMORY; + @@ -148 +148 @@ - return proxyObjectManager->QueryInterface(aIID, aInstancePtr); + return wrap_nsexception(proxyObjectManager->QueryInterface(aIID, aInstancePtr)); @@ -181 +181 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -207 +207 @@ - aTarget->IsOnCurrentThread(&result); + IGNORE_NSEXCEPTION(aTarget->IsOnCurrentThread(&result)); @@ -210 +210 @@ - return aObj->QueryInterface(aIID, aProxyObject); + return /*thower*/ aObj->QueryInterface(aIID, aProxyObject); @@ -231 +231 @@ - return root->LockedFind(aIID, aProxyObject); + return /*thower*/ root->LockedFind(aIID, aProxyObject); @@ -236,2 +236 @@ - if (!newRoot) - return NS_ERROR_OUT_OF_MEMORY; + @@ -246 +246 @@ - return root->LockedFind(aIID, aProxyObject); + return /*thower*/ root->LockedFind(aIID, aProxyObject); @@ -252 +252 @@ - return newRoot->LockedFind(aIID, aProxyObject); + return /*thower*/ newRoot->LockedFind(aIID, aProxyObject); @@ -268,2 +268 @@ -nsresult -nsProxyObjectManager::GetClass(REFNSIID aIID, nsProxyEventClass **aResult) +void nsProxyObjectManager::GetClass(REFNSIID aIID, nsProxyEventClass **aResult) @@ -275 +275 @@ - return NS_OK; + return; @@ -282 +282 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -285,3 +285,4 @@ - nsresult rv = iim->GetInfoForIID(&aIID, getter_AddRefs(ii)); - if (NS_FAILED(rv)) - return rv; + try { + iim->GetInfoForIID(&aIID, getter_AddRefs(ii)); + } + catch (nsexception &exc) { throw; } @@ -290,2 +290 @@ - if (!pec) - return NS_ERROR_OUT_OF_MEMORY; + @@ -300 +300 @@ - return NS_OK; + return; @@ -305 +305 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -309 +309 @@ - return NS_OK; + return; @@ -319,2 +319 @@ -NS_COM nsresult -NS_GetProxyForObject(nsIEventTarget *target, +NS_COM void NS_GetProxyForObject(nsIEventTarget *target, @@ -334,2 +334 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -339 +339 @@ - return proxyObjMgr->GetProxyForObject(target, aIID, aObj, + return /*thower*/ proxyObjMgr->GetProxyForObject(target, aIID, aObj, --- xpcom/proxy/tests/proxytests.cpp +++ xpcom/proxy/tests/proxytests.cpp @@ -72,2 +72 @@ -static nsresult -GetThreadFromPRThread(PRThread *prthread, nsIThread **result) +static void GetThreadFromPRThread(PRThread *prthread, nsIThread **result) @@ -79 +79 @@ - return tm->GetThreadFromPRThread(prthread, result); + return /*thower*/ tm->GetThreadFromPRThread(prthread, result); @@ -88,3 +88,3 @@ - NS_IMETHOD Test(PRInt32 p1, PRInt32 p2, PRInt32* retval); - NS_IMETHOD Test2(); - NS_IMETHOD Test3(nsISupports *p1, nsISupports **p2); + NS_IMETHOD_(void) Test(PRInt32 p1, PRInt32 p2, PRInt32* retval); + NS_IMETHOD_(void) Test2(); + NS_IMETHOD_(void) Test3(nsISupports *p1, nsISupports **p2); @@ -102 +102 @@ -NS_IMETHODIMP nsTestXPCFoo::Test(PRInt32 p1, PRInt32 p2, PRInt32* retval) +NS_IMETHODIMP_(void) nsTestXPCFoo::Test(PRInt32 p1, PRInt32 p2, PRInt32* retval) @@ -106 +106 @@ - return NS_OK; + return; @@ -110 +110 @@ -NS_IMETHODIMP nsTestXPCFoo::Test2() +NS_IMETHODIMP_(void) nsTestXPCFoo::Test2() @@ -114 +114 @@ - return NS_OK; + return; @@ -117 +117 @@ -NS_IMETHODIMP nsTestXPCFoo::Test3(nsISupports *p1, nsISupports **p2) +NS_IMETHODIMP_(void) nsTestXPCFoo::Test3(nsISupports *p1, nsISupports **p2) @@ -123 +123 @@ - p1->QueryInterface(NS_GET_IID(nsITestProxy), (void**)&test); + IGNORE_NSEXCEPTION(p1->QueryInterface(NS_GET_IID(nsITestProxy), (void**)&test)); @@ -125 +125 @@ - test->Test2(); + IGNORE_NSEXCEPTION(test->Test2()); @@ -127 +127 @@ - test->Test( 1, 2, &a); + IGNORE_NSEXCEPTION(test->Test( 1, 2, &a)); @@ -133 +133 @@ - return NS_OK; + return; @@ -142,3 +142,3 @@ - NS_IMETHOD Test(PRInt32 p1, PRInt32 p2, PRInt32* retval); - NS_IMETHOD Test2(); - NS_IMETHOD Test3(nsISupports *p1, nsISupports **p2); + NS_IMETHOD_(void) Test(PRInt32 p1, PRInt32 p2, PRInt32* retval); + NS_IMETHOD_(void) Test2(); + NS_IMETHOD_(void) Test3(nsISupports *p1, nsISupports **p2); @@ -156 +156 @@ -NS_IMETHODIMP nsTestXPCFoo2::Test(PRInt32 p1, PRInt32 p2, PRInt32* retval) +NS_IMETHODIMP_(void) nsTestXPCFoo2::Test(PRInt32 p1, PRInt32 p2, PRInt32* retval) @@ -168 +168 @@ - GetThreadFromPRThread((PRThread *) p1, getter_AddRefs(thread)); + IGNORE_NSEXCEPTION(GetThreadFromPRThread((PRThread *) p1, getter_AddRefs(thread))); @@ -172,2 +172,2 @@ - manager->GetProxyForObject(thread, NS_GET_IID(nsITestProxy), this, NS_PROXY_SYNC, (void**)&proxyObject); - proxyObject->Test3(nsnull, nsnull); + IGNORE_NSEXCEPTION(manager->GetProxyForObject(thread, NS_GET_IID(nsITestProxy), this, NS_PROXY_SYNC, (void**)&proxyObject)); + IGNORE_NSEXCEPTION(proxyObject->Test3(nsnull, nsnull)); @@ -176 +176 @@ - return NS_OK; + return; @@ -180 +180 @@ -NS_IMETHODIMP nsTestXPCFoo2::Test2() +NS_IMETHODIMP_(void) nsTestXPCFoo2::Test2() @@ -184 +184 @@ - return NS_OK; + return; @@ -188 +188 @@ -NS_IMETHODIMP nsTestXPCFoo2::Test3(nsISupports *p1, nsISupports **p2) +NS_IMETHODIMP_(void) nsTestXPCFoo2::Test3(nsISupports *p1, nsISupports **p2) @@ -191 +191 @@ - return NS_OK; + return; @@ -289 +289 @@ - manager->GetProxyForObject(thread, NS_GET_IID(nsITestProxy), foo, NS_PROXY_SYNC, (void**)&proxyObject); + IGNORE_NSEXCEPTION(manager->GetProxyForObject(thread, NS_GET_IID(nsITestProxy), foo, NS_PROXY_SYNC, (void**)&proxyObject)); @@ -309 +309,3 @@ - rv = proxyObject->Test(NS_PTR_TO_INT32((void*)curThread), 0, &retval); // XXX broken on 64-bit arch + try { + proxyObject->Test(NS_PTR_TO_INT32((void*)curThread), 0, &retval); + } // XXX broken on 64-bit arch @@ -371 +371 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -376 +376 @@ - GetThreadFromPRThread(mEventLoopThread, getter_AddRefs(thread)); + IGNORE_NSEXCEPTION(GetThreadFromPRThread(mEventLoopThread, getter_AddRefs(thread))); @@ -379 +379 @@ - return NS_OK; + return; @@ -393 +393 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -406,3 +406,3 @@ - manager->GetProxyForObject(thread, - NS_GET_IID(nsITestProxy), foo, - NS_PROXY_SYNC, (void**)&proxyObject); + IGNORE_NSEXCEPTION(manager->GetProxyForObject(thread, + NS_GET_IID(nsITestProxy), foo, + NS_PROXY_SYNC, (void**)&proxyObject)); @@ -411,2 +411,2 @@ - proxyObject->Test(1, 2, &a); - proxyObject->Test2(); + IGNORE_NSEXCEPTION(proxyObject->Test(1, 2, &a)); + IGNORE_NSEXCEPTION(proxyObject->Test2()); @@ -419 +419 @@ - return NS_OK; + return; @@ -431 +431 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -434 +434 @@ - return NS_OK; + return; @@ -446,2 +446 @@ -static nsresult -RunApartmentTest() +static void RunApartmentTest() @@ -460,5 +460,5 @@ - manager->GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, - NS_GET_IID(nsIRunnable), - obj, - NS_PROXY_ASYNC, - getter_AddRefs(objProxy)); + IGNORE_NSEXCEPTION(manager->GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, + NS_GET_IID(nsIRunnable), + obj, + NS_PROXY_ASYNC, + getter_AddRefs(objProxy))); @@ -466 +466 @@ - NS_NewThread(getter_AddRefs(thread)); + IGNORE_NSEXCEPTION(NS_NewThread(getter_AddRefs(thread))); @@ -472 +472 @@ - pool->SetThreadLimit(8); + IGNORE_NSEXCEPTION(pool->SetThreadLimit(8)); @@ -474 +474 @@ - pool->Dispatch(objProxy, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(pool->Dispatch(objProxy, NS_DISPATCH_NORMAL)); @@ -483 +483 @@ - pool->Shutdown(); + IGNORE_NSEXCEPTION(pool->Shutdown()); @@ -486 +486 @@ - return NS_OK; + return; @@ -498 +498 @@ - NS_InitXPCOM2(nsnull, nsnull, nsnull); + IGNORE_NSEXCEPTION(NS_InitXPCOM2(nsnull, nsnull, nsnull)); @@ -503,2 +503,2 @@ - NS_GetComponentRegistrar(getter_AddRefs(registrar)); - registrar->AutoRegister(nsnull); + IGNORE_NSEXCEPTION(NS_GetComponentRegistrar(getter_AddRefs(registrar))); + IGNORE_NSEXCEPTION(registrar->AutoRegister(nsnull)); @@ -506 +506 @@ - RunApartmentTest(); + IGNORE_NSEXCEPTION(RunApartmentTest()); @@ -509 +509 @@ - NS_NewThread(getter_AddRefs(eventLoopThread)); + IGNORE_NSEXCEPTION(NS_NewThread(getter_AddRefs(eventLoopThread))); @@ -512 +512 @@ - eventLoopThread->Dispatch(test, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(eventLoopThread->Dispatch(test, NS_DISPATCH_NORMAL)); @@ -515 +515 @@ - eventLoopThread->GetPRThread(&eventLoopPRThread); + IGNORE_NSEXCEPTION(eventLoopThread->GetPRThread(&eventLoopPRThread)); @@ -525 +525 @@ - NS_NewThread(getter_AddRefs(thread), test); + IGNORE_NSEXCEPTION(NS_NewThread(getter_AddRefs(thread), test)); @@ -540 +540,3 @@ - nsresult rv = threads[i]->Shutdown(); + try { + threads[i]->Shutdown(); + } @@ -545 +545 @@ - eventLoopThread->Shutdown(); + IGNORE_NSEXCEPTION(eventLoopThread->Shutdown()); @@ -549 +549 @@ - NS_ShutdownXPCOM(nsnull); + IGNORE_NSEXCEPTION(NS_ShutdownXPCOM(nsnull)); --- xpcom/reflect/xptcall/public/xptcall.h +++ xpcom/reflect/xptcall/public/xptcall.h @@ -166 +166 @@ - NS_IMETHOD CallMethod(PRUint16 aMethodIndex, + NS_IMETHOD_(void) CallMethod(PRUint16 aMethodIndex, @@ -193 +193 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -203 +203 @@ -XPCOM_API(nsresult) +XPCOM_API(void) --- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp @@ -48,3 +48 @@ -static nsresult ATTRIBUTE_USED -__attribute__ ((regparm (3))) -PrepareAndDispatch(uint32 methodIndex, nsXPTCStubBase* self, PRUint32* args) +static void PrepareAndDispatch(uint32 methodIndex, nsXPTCStubBase* self, PRUint32* args) @@ -63 +63 @@ - self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); + IGNORE_NSEXCEPTION(self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info)); @@ -95 +95,3 @@ - result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams); + try { + self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams); + } @@ -100 +100 @@ - return result; + throw nsexception(result); --- xpcom/reflect/xptcall/src/xptcall.cpp +++ xpcom/reflect/xptcall/src/xptcall.cpp @@ -68 +68 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -80 +80 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -83,2 +83 @@ - if (!newbase) - return NS_ERROR_OUT_OF_MEMORY; + @@ -87 +87 @@ - return NS_OK; + return; --- xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp +++ xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp @@ -64,4 +64,4 @@ - NS_IMETHOD AddTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval) = 0; - NS_IMETHOD MultTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval) = 0; - NS_IMETHOD AddTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval) = 0; - NS_IMETHOD MultTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval) = 0; + NS_IMETHOD_(void) AddTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval) = 0; + NS_IMETHOD_(void) MultTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval) = 0; + NS_IMETHOD_(void) AddTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval) = 0; + NS_IMETHOD_(void) MultTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval) = 0; @@ -69 +69 @@ - NS_IMETHOD AddManyInts(PRInt32 p1, PRInt32 p2, PRInt32 p3, PRInt32 p4, + NS_IMETHOD_(void) AddManyInts(PRInt32 p1, PRInt32 p2, PRInt32 p3, PRInt32 p4, @@ -73 +73 @@ - NS_IMETHOD AddTwoFloats(float p1, float p2, float* retval) = 0; + NS_IMETHOD_(void) AddTwoFloats(float p1, float p2, float* retval) = 0; @@ -75 +75 @@ - NS_IMETHOD AddManyDoubles(double p1, double p2, double p3, double p4, + NS_IMETHOD_(void) AddManyDoubles(double p1, double p2, double p3, double p4, @@ -79 +79 @@ - NS_IMETHOD AddManyFloats(float p1, float p2, float p3, float p4, + NS_IMETHOD_(void) AddManyFloats(float p1, float p2, float p3, float p4, @@ -83 +83 @@ - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, + NS_IMETHOD_(void) AddManyManyFloats(float p1, float p2, float p3, float p4, @@ -90 +90 @@ - NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, + NS_IMETHOD_(void) AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, @@ -94 +94 @@ - NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, + NS_IMETHOD_(void) AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, @@ -98 +98 @@ - NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, + NS_IMETHOD_(void) AddMixedFloats(float p1, float p2, double p3, double p4, @@ -103 +103 @@ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; + NS_IMETHOD_(void) PassTwoStrings(const char* s1, const char* s2, char** retval) = 0; @@ -113,4 +113,4 @@ - NS_IMETHOD AddTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval); - NS_IMETHOD MultTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval); - NS_IMETHOD AddTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval); - NS_IMETHOD MultTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval); + NS_IMETHOD_(void) AddTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval); + NS_IMETHOD_(void) MultTwoInts(PRInt32 p1, PRInt32 p2, PRInt32* retval); + NS_IMETHOD_(void) AddTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval); + NS_IMETHOD_(void) MultTwoLLs(PRInt64 p1, PRInt64 p2, PRInt64* retval); @@ -118 +118 @@ - NS_IMETHOD AddManyInts(PRInt32 p1, PRInt32 p2, PRInt32 p3, PRInt32 p4, + NS_IMETHOD_(void) AddManyInts(PRInt32 p1, PRInt32 p2, PRInt32 p3, PRInt32 p4, @@ -122 +122 @@ - NS_IMETHOD AddTwoFloats(float p1, float p2, float* retval); + NS_IMETHOD_(void) AddTwoFloats(float p1, float p2, float* retval); @@ -124 +124 @@ - NS_IMETHOD AddManyDoubles(double p1, double p2, double p3, double p4, + NS_IMETHOD_(void) AddManyDoubles(double p1, double p2, double p3, double p4, @@ -128 +128 @@ - NS_IMETHOD AddManyFloats(float p1, float p2, float p3, float p4, + NS_IMETHOD_(void) AddManyFloats(float p1, float p2, float p3, float p4, @@ -132 +132 @@ - NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, + NS_IMETHOD_(void) AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4, @@ -136 +136 @@ - NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, + NS_IMETHOD_(void) AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4, @@ -140 +140 @@ - NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4, + NS_IMETHOD_(void) AddMixedFloats(float p1, float p2, double p3, double p4, @@ -145 +145 @@ - NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4, + NS_IMETHOD_(void) AddManyManyFloats(float p1, float p2, float p3, float p4, @@ -152 +152 @@ - NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval); + NS_IMETHOD_(void) PassTwoStrings(const char* s1, const char* s2, char** retval); @@ -164 +164 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -168 +168 @@ - return NS_OK; + return; @@ -171 +171 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -175 +175 @@ - return NS_OK; + return; @@ -178 +178 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -182 +182 @@ - return NS_OK; + return; @@ -185 +185 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -189 +189 @@ - return NS_OK; + return; @@ -192 +192 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -202 +202 @@ - return NS_OK; + return; @@ -205 +205 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -212 +212 @@ - return NS_OK; + return; @@ -215 +215 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -225 +225 @@ - return NS_OK; + return; @@ -228 +228 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -238 +238 @@ - return NS_OK; + return; @@ -241 +241 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -252 +252 @@ - return NS_OK; + return; @@ -255 +255 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -271 +271 @@ - return NS_OK; + return; @@ -274 +274 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -280 +280 @@ - return NS_OK; + return; @@ -283 +283 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -289 +289 @@ - return NS_OK; + return; @@ -292 +292 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -297,2 +297 @@ - if (!ret) - return NS_ERROR_OUT_OF_MEMORY; + @@ -302 +302 @@ - return NS_OK; + return; @@ -936,2 +936,2 @@ - NS_IMETHOD FooMethod1(PRInt32 i) = 0; - NS_IMETHOD FooMethod2(PRInt32 i) = 0; + NS_IMETHOD_(void) FooMethod1(PRInt32 i) = 0; + NS_IMETHOD_(void) FooMethod2(PRInt32 i) = 0; @@ -946,2 +946,2 @@ - NS_IMETHOD BarMethod1(PRInt32 i) = 0; - NS_IMETHOD BarMethod2(PRInt32 i) = 0; + NS_IMETHOD_(void) BarMethod1(PRInt32 i) = 0; + NS_IMETHOD_(void) BarMethod2(PRInt32 i) = 0; @@ -957,2 +957,2 @@ - NS_IMETHOD FooMethod1(PRInt32 i); - NS_IMETHOD FooMethod2(PRInt32 i); + NS_IMETHOD_(void) FooMethod1(PRInt32 i); + NS_IMETHOD_(void) FooMethod2(PRInt32 i); @@ -976,2 +976,2 @@ - NS_IMETHOD BarMethod1(PRInt32 i); - NS_IMETHOD BarMethod2(PRInt32 i); + NS_IMETHOD_(void) BarMethod1(PRInt32 i); + NS_IMETHOD_(void) BarMethod2(PRInt32 i); @@ -998 +998 @@ -NS_IMETHODIMP FooImpl::FooMethod1(PRInt32 i) +NS_IMETHODIMP_(void) FooImpl::FooMethod1(PRInt32 i) @@ -1002 +1002 @@ - return NS_OK; + return; @@ -1005 +1005 @@ -NS_IMETHODIMP FooImpl::FooMethod2(PRInt32 i) +NS_IMETHODIMP_(void) FooImpl::FooMethod2(PRInt32 i) @@ -1009 +1009 @@ - return NS_OK; + return; @@ -1018 +1018 @@ -NS_IMETHODIMP BarImpl::BarMethod1(PRInt32 i) +NS_IMETHODIMP_(void) BarImpl::BarMethod1(PRInt32 i) @@ -1022 +1022 @@ - return NS_OK; + return; @@ -1025 +1025 @@ -NS_IMETHODIMP BarImpl::BarMethod2(PRInt32 i) +NS_IMETHODIMP_(void) BarImpl::BarMethod2(PRInt32 i) @@ -1029 +1029 @@ - return NS_OK; + return; @@ -1115,2 +1115,2 @@ - foo->FooMethod1(1); - foo->FooMethod2(2); + IGNORE_NSEXCEPTION(foo->FooMethod1(1)); + IGNORE_NSEXCEPTION(foo->FooMethod2(2)); @@ -1122 +1122 @@ - NS_InvokeByIndex(foo, 3, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(foo, 3, 1, var)); @@ -1127 +1127 @@ - NS_InvokeByIndex(foo, 4, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(foo, 4, 1, var)); @@ -1133,2 +1133,2 @@ - bar->BarMethod1(1); - bar->BarMethod2(2); + IGNORE_NSEXCEPTION(bar->BarMethod1(1)); + IGNORE_NSEXCEPTION(bar->BarMethod2(2)); @@ -1140 +1140 @@ - NS_InvokeByIndex(bar, 3, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(bar, 3, 1, var)); @@ -1145 +1145 @@ - NS_InvokeByIndex(bar, 4, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(bar, 4, 1, var)); @@ -1165,2 +1165,2 @@ - NS_IMETHOD FooMethod1(PRInt32 i) = 0; - NS_IMETHOD FooMethod2(PRInt32 i) = 0; + NS_IMETHOD_(void) FooMethod1(PRInt32 i) = 0; + NS_IMETHOD_(void) FooMethod2(PRInt32 i) = 0; @@ -1172,2 +1172,2 @@ - NS_IMETHOD BarMethod1(PRInt32 i) = 0; - NS_IMETHOD BarMethod2(PRInt32 i) = 0; + NS_IMETHOD_(void) BarMethod1(PRInt32 i) = 0; + NS_IMETHOD_(void) BarMethod2(PRInt32 i) = 0; @@ -1180,2 +1180,2 @@ - NS_IMETHOD FooMethod1(PRInt32 i); - NS_IMETHOD FooMethod2(PRInt32 i); + NS_IMETHOD_(void) FooMethod1(PRInt32 i); + NS_IMETHOD_(void) FooMethod2(PRInt32 i); @@ -1184,2 +1184,2 @@ - NS_IMETHOD BarMethod1(PRInt32 i); - NS_IMETHOD BarMethod2(PRInt32 i); + NS_IMETHOD_(void) BarMethod1(PRInt32 i); + NS_IMETHOD_(void) BarMethod2(PRInt32 i); @@ -1203 +1203 @@ -NS_IMETHODIMP FooBarImpl2::FooMethod1(PRInt32 i) +NS_IMETHODIMP_(void) FooBarImpl2::FooMethod1(PRInt32 i) @@ -1207 +1207 @@ - return NS_OK; + return; @@ -1210 +1210 @@ -NS_IMETHODIMP FooBarImpl2::FooMethod2(PRInt32 i) +NS_IMETHODIMP_(void) FooBarImpl2::FooMethod2(PRInt32 i) @@ -1214 +1214 @@ - return NS_OK; + return; @@ -1217 +1217 @@ -NS_IMETHODIMP FooBarImpl2::BarMethod1(PRInt32 i) +NS_IMETHODIMP_(void) FooBarImpl2::BarMethod1(PRInt32 i) @@ -1221 +1221 @@ - return NS_OK; + return; @@ -1224 +1224 @@ -NS_IMETHODIMP FooBarImpl2::BarMethod2(PRInt32 i) +NS_IMETHODIMP_(void) FooBarImpl2::BarMethod2(PRInt32 i) @@ -1228 +1228 @@ - return NS_OK; + return; @@ -1285,2 +1285,2 @@ - foo->FooMethod1(1); - foo->FooMethod2(2); + IGNORE_NSEXCEPTION(foo->FooMethod1(1)); + IGNORE_NSEXCEPTION(foo->FooMethod2(2)); @@ -1292 +1292 @@ - NS_InvokeByIndex(foo, 3, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(foo, 3, 1, var)); @@ -1297 +1297 @@ - NS_InvokeByIndex(foo, 4, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(foo, 4, 1, var)); @@ -1303,2 +1303,2 @@ - bar->BarMethod1(1); - bar->BarMethod2(2); + IGNORE_NSEXCEPTION(bar->BarMethod1(1)); + IGNORE_NSEXCEPTION(bar->BarMethod2(2)); @@ -1310 +1310 @@ - NS_InvokeByIndex(bar, 3, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(bar, 3, 1, var)); @@ -1315 +1315 @@ - NS_InvokeByIndex(bar, 4, 1, var); + IGNORE_NSEXCEPTION(NS_InvokeByIndex(bar, 4, 1, var)); --- xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp +++ xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp @@ -257,2 +257 @@ -nsresult -xptiInterfaceEntry::GetName(char **name) +void xptiInterfaceEntry::GetName(char **name) @@ -262 +262 @@ - return *name ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*name ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -265,2 +265 @@ -nsresult -xptiInterfaceEntry::GetIID(nsIID **iid) +void xptiInterfaceEntry::GetIID(nsIID **iid) @@ -270 +270 @@ - return *iid ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + return wrap_nsexception(*iid ? NS_OK : NS_ERROR_OUT_OF_MEMORY); @@ -273,2 +273 @@ -nsresult -xptiInterfaceEntry::IsScriptable(PRBool* result) +void xptiInterfaceEntry::IsScriptable(PRBool* result) @@ -279 +279 @@ - return NS_OK; + return; @@ -282,2 +282 @@ -nsresult -xptiInterfaceEntry::IsFunction(PRBool* result) +void xptiInterfaceEntry::IsFunction(PRBool* result) @@ -286 +286 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -289 +289 @@ - return NS_OK; + return; @@ -292,2 +292 @@ -nsresult -xptiInterfaceEntry::GetMethodCount(uint16* count) +void xptiInterfaceEntry::GetMethodCount(uint16* count) @@ -296 +296 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -300 +300 @@ - return NS_OK; + return; @@ -303,2 +303 @@ -nsresult -xptiInterfaceEntry::GetConstantCount(uint16* count) +void xptiInterfaceEntry::GetConstantCount(uint16* count) @@ -307 +307 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -311 +311 @@ - return NS_OK; + return; @@ -314,2 +314 @@ -nsresult -xptiInterfaceEntry::GetMethodInfo(uint16 index, const nsXPTMethodInfo** info) +void xptiInterfaceEntry::GetMethodInfo(uint16 index, const nsXPTMethodInfo** info) @@ -318 +318 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -321 +321 @@ - return mInterface->mParent->GetMethodInfo(index, info); + return /*thower*/ mInterface->mParent->GetMethodInfo(index, info); @@ -328 +328 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -336 +336 @@ - return NS_OK; + return; @@ -339,2 +339 @@ -nsresult -xptiInterfaceEntry::GetMethodInfoForName(const char* methodName, uint16 *index, +void xptiInterfaceEntry::GetMethodInfoForName(const char* methodName, uint16 *index, @@ -344 +344 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -356 +356 @@ - return NS_OK; + return; @@ -361 +361 @@ - return mInterface->mParent->GetMethodInfoForName(methodName, index, result); + return /*thower*/ mInterface->mParent->GetMethodInfoForName(methodName, index, result); @@ -366 +366 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -370,2 +370 @@ -nsresult -xptiInterfaceEntry::GetConstant(uint16 index, const nsXPTConstant** constant) +void xptiInterfaceEntry::GetConstant(uint16 index, const nsXPTConstant** constant) @@ -374 +374 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -377 +377 @@ - return mInterface->mParent->GetConstant(index, constant); + return /*thower*/ mInterface->mParent->GetConstant(index, constant); @@ -384 +384 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -393 +393 @@ - return NS_OK; + return; @@ -398,2 +398 @@ -nsresult -xptiInterfaceEntry::GetEntryForParam(PRUint16 methodIndex, +void xptiInterfaceEntry::GetEntryForParam(PRUint16 methodIndex, @@ -404 +404 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -407 +407 @@ - return mInterface->mParent->GetEntryForParam(methodIndex, param, entry); + return /*thower*/ mInterface->mParent->GetEntryForParam(methodIndex, param, entry); @@ -413 +413 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -424 +424 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -436 +436 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -440 +440 @@ - return NS_OK; + return; @@ -443,2 +443 @@ -nsresult -xptiInterfaceEntry::GetInfoForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetInfoForParam(uint16 methodIndex, @@ -449,3 +449,4 @@ - nsresult rv = GetEntryForParam(methodIndex, param, &entry); - if(NS_FAILED(rv)) - return rv; + try { + GetEntryForParam(methodIndex, param, &entry); + } + catch (nsexception &exc) { throw; } @@ -454,3 +454,4 @@ - rv = entry->GetInterfaceInfo(&theInfo); - if(NS_FAILED(rv)) - return rv; + try { + entry->GetInterfaceInfo(&theInfo); + } + catch (nsexception &exc) { throw; } @@ -459 +459 @@ - return NS_OK; + return; @@ -462,2 +462 @@ -nsresult -xptiInterfaceEntry::GetIIDForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetIIDForParam(uint16 methodIndex, @@ -467,4 +467,5 @@ - nsresult rv = GetEntryForParam(methodIndex, param, &entry); - if(NS_FAILED(rv)) - return rv; - return entry->GetIID(iid); + try { + GetEntryForParam(methodIndex, param, &entry); + } + catch (nsexception &exc) { throw; } + return /*thower*/ entry->GetIID(iid); @@ -473,2 +473 @@ -nsresult -xptiInterfaceEntry::GetIIDForParamNoAlloc(PRUint16 methodIndex, +void xptiInterfaceEntry::GetIIDForParamNoAlloc(PRUint16 methodIndex, @@ -479,3 +479,4 @@ - nsresult rv = GetEntryForParam(methodIndex, param, &entry); - if(NS_FAILED(rv)) - return rv; + try { + GetEntryForParam(methodIndex, param, &entry); + } + catch (nsexception &exc) { throw; } @@ -483 +483 @@ - return NS_OK; + return; @@ -487,2 +487 @@ -nsresult -xptiInterfaceEntry::GetTypeInArray(const nsXPTParamInfo* param, +void xptiInterfaceEntry::GetTypeInArray(const nsXPTParamInfo* param, @@ -501 +501 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -507 +507 @@ - return NS_OK; + return; @@ -510,2 +510 @@ -nsresult -xptiInterfaceEntry::GetTypeForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetTypeForParam(uint16 methodIndex, @@ -517 +517 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -520 +520 @@ - return mInterface->mParent-> + return /*thower*/ mInterface->mParent-> @@ -527 +527 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -533,3 +533,4 @@ - nsresult rv = GetTypeInArray(param, dimension, &td); - if(NS_FAILED(rv)) - return rv; + try { + GetTypeInArray(param, dimension, &td); + } + catch (nsexception &exc) { throw; } @@ -541 +541 @@ - return NS_OK; + return; @@ -544,2 +544 @@ -nsresult -xptiInterfaceEntry::GetSizeIsArgNumberForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetSizeIsArgNumberForParam(uint16 methodIndex, @@ -551 +551 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -554 +554 @@ - return mInterface->mParent-> + return /*thower*/ mInterface->mParent-> @@ -561 +561 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -567,3 +567,4 @@ - nsresult rv = GetTypeInArray(param, dimension, &td); - if(NS_FAILED(rv)) - return rv; + try { + GetTypeInArray(param, dimension, &td); + } + catch (nsexception &exc) { throw; } @@ -582 +582 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -586 +586 @@ - return NS_OK; + return; @@ -589,2 +589 @@ -nsresult -xptiInterfaceEntry::GetLengthIsArgNumberForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetLengthIsArgNumberForParam(uint16 methodIndex, @@ -596 +596 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -599 +599 @@ - return mInterface->mParent-> + return /*thower*/ mInterface->mParent-> @@ -606 +606 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -612,4 +612,4 @@ - nsresult rv = GetTypeInArray(param, dimension, &td); - if(NS_FAILED(rv)) { - return rv; - } + try { + GetTypeInArray(param, dimension, &td); + } + catch (nsexception &exc) { throw; } @@ -628 +628 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -632 +632 @@ - return NS_OK; + return; @@ -635,2 +635 @@ -nsresult -xptiInterfaceEntry::GetInterfaceIsArgNumberForParam(uint16 methodIndex, +void xptiInterfaceEntry::GetInterfaceIsArgNumberForParam(uint16 methodIndex, @@ -641 +641 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -644 +644 @@ - return mInterface->mParent-> + return /*thower*/ mInterface->mParent-> @@ -651 +651 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -663 +663 @@ - return NS_ERROR_INVALID_ARG; + throw nsexception(NS_ERROR_INVALID_ARG); @@ -667 +667 @@ - return NS_OK; + return; @@ -671,2 +671 @@ -nsresult -xptiInterfaceEntry::IsIID(const nsIID * IID, PRBool *_retval) +void xptiInterfaceEntry::IsIID(const nsIID * IID, PRBool *_retval) @@ -676 +676 @@ - return NS_OK; + return; @@ -680,2 +680 @@ -nsresult -xptiInterfaceEntry::GetNameShared(const char **name) +void xptiInterfaceEntry::GetNameShared(const char **name) @@ -685 +685 @@ - return NS_OK; + return; @@ -689,2 +689 @@ -nsresult -xptiInterfaceEntry::GetIIDShared(const nsIID * *iid) +void xptiInterfaceEntry::GetIIDShared(const nsIID * *iid) @@ -694 +694 @@ - return NS_OK; + return; @@ -698,2 +698 @@ -nsresult -xptiInterfaceEntry::HasAncestor(const nsIID * iid, PRBool *_retval) +void xptiInterfaceEntry::HasAncestor(const nsIID * iid, PRBool *_retval) @@ -713 +713 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -716 +716 @@ - return NS_OK; + return; @@ -721,2 +721 @@ -nsresult -xptiInterfaceEntry::GetInterfaceInfo(xptiInterfaceInfo** info) +void xptiInterfaceEntry::GetInterfaceInfo(xptiInterfaceInfo** info) @@ -739 +739 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -744 +744 @@ - return NS_OK; + return; --- xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +++ xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp @@ -182,2 +182 @@ -static nsresult -GetDirectoryFromDirService(const char* codename, nsILocalFile** aDir) +static void GetDirectoryFromDirService(const char* codename, nsILocalFile** aDir) @@ -191 +191 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -193 +193 @@ - return dirService->Get(codename, NS_GET_IID(nsILocalFile), (void**) aDir); + return /*thower*/ dirService->Get(codename, NS_GET_IID(nsILocalFile), (void**) aDir); @@ -208,2 +208,2 @@ - dirService->Get(codename, NS_GET_IID(nsISimpleEnumerator), - getter_AddRefs(fileList)); + IGNORE_NSEXCEPTION(dirService->Get(codename, NS_GET_IID(nsISimpleEnumerator), + getter_AddRefs(fileList))); @@ -217 +217 @@ - fileList->GetNext(getter_AddRefs(dir)); + IGNORE_NSEXCEPTION(fileList->GetNext(getter_AddRefs(dir))); @@ -233 +233 @@ - NS_NewISupportsArray(getter_AddRefs(searchPath)); + IGNORE_NSEXCEPTION(NS_NewISupportsArray(getter_AddRefs(searchPath))); @@ -260,2 +260,4 @@ - nsresult rv = GetDirectoryFromDirService(NS_GRE_COMPONENT_DIR, - getter_AddRefs(greComponentDirectory)); + try { + GetDirectoryFromDirService(NS_GRE_COMPONENT_DIR, + getter_AddRefs(greComponentDirectory)); + } @@ -266 +266 @@ - greComponentDirectory->Equals(compDir, &equalsCompDir); + IGNORE_NSEXCEPTION(greComponentDirectory->Equals(compDir, &equalsCompDir)); @@ -269 +269 @@ - searchPath->AppendElement(greComponentDirectory); + IGNORE_NSEXCEPTION(searchPath->AppendElement(greComponentDirectory)); @@ -284,2 +284,4 @@ - nsresult rv = GetDirectoryFromDirService(NS_XPCOM_XPTI_REGISTRY_FILE, - getter_AddRefs(lf)); + try { + GetDirectoryFromDirService(NS_XPCOM_XPTI_REGISTRY_FILE, + getter_AddRefs(lf)); + } @@ -287 +287 @@ - if (NS_FAILED(rv)) return PR_FALSE; + catch (nsexception &exc) return PR_FALSE; @@ -289,2 +289,4 @@ - rv = xptiCloneLocalFile(lf, aFile); - if (NS_FAILED(rv)) return PR_FALSE; + try { + xptiCloneLocalFile(lf, aFile); + } + catch (nsexception &exc) return PR_FALSE; @@ -321 +321,3 @@ - rv = xptiCloneElementAsLocalFile(aSearchPath, i, getter_AddRefs(dir)); + try { + xptiCloneElementAsLocalFile(aSearchPath, i, getter_AddRefs(dir)); + } @@ -326 +326,3 @@ - rv = dir->GetDirectoryEntries(getter_AddRefs(entries)); + try { + dir->GetDirectoryEntries(getter_AddRefs(entries)); + } @@ -335 +335 @@ - entries->GetNext(getter_AddRefs(sup)); + IGNORE_NSEXCEPTION(entries->GetNext(getter_AddRefs(sup))); @@ -382,2 +382,2 @@ - aFile->GetFollowLinks(&saveFollowLinks); - aFile->SetFollowLinks(PR_TRUE); + IGNORE_NSEXCEPTION(aFile->GetFollowLinks(&saveFollowLinks)); + IGNORE_NSEXCEPTION(aFile->SetFollowLinks(PR_TRUE)); @@ -387 +387 @@ - aFile->SetFollowLinks(saveFollowLinks); + IGNORE_NSEXCEPTION(aFile->SetFollowLinks(saveFollowLinks)); @@ -394 +394 @@ - aFile->SetFollowLinks(saveFollowLinks); + IGNORE_NSEXCEPTION(aFile->SetFollowLinks(saveFollowLinks)); @@ -433 +433 @@ - aFile->SetFollowLinks(saveFollowLinks); + IGNORE_NSEXCEPTION(aFile->SetFollowLinks(saveFollowLinks)); @@ -484,2 +484,4 @@ - rv = loader->LoadEntry(file, zipItem->GetName(), - getter_AddRefs(stream)); + try { + loader->LoadEntry(file, zipItem->GetName(), + getter_AddRefs(stream)); + } @@ -487,2 +487 @@ - if (NS_FAILED(rv)) - return PR_FALSE; + catch (nsexception &exc) return PR_FALSE; @@ -615 +615 @@ - aFile->GetParent(getter_AddRefs(parent)); + IGNORE_NSEXCEPTION(aFile->GetParent(getter_AddRefs(parent))); @@ -619 +619 @@ - aSearchPath->Count(&count); + IGNORE_NSEXCEPTION(aSearchPath->Count(&count)); @@ -624,2 +624,2 @@ - aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), - getter_AddRefs(current)); + IGNORE_NSEXCEPTION(aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), + getter_AddRefs(current))); @@ -756 +756 @@ - aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file)); + IGNORE_NSEXCEPTION(aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file))); @@ -806 +806 @@ - aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file)); + IGNORE_NSEXCEPTION(aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file))); @@ -857 +857 @@ - aFileList->QueryElementAt(k, NS_GET_IID(nsILocalFile), getter_AddRefs(file)); + IGNORE_NSEXCEPTION(aFileList->QueryElementAt(k, NS_GET_IID(nsILocalFile), getter_AddRefs(file))); @@ -1015,3 +1015,4 @@ - rv = loader->EnumerateEntries(file, sink); - if (NS_FAILED(rv)) - return PR_FALSE; + try { + loader->EnumerateEntries(file, sink); + } + catch (nsexception &exc) return PR_FALSE; @@ -1162,3 +1162,4 @@ - rv = loader->EnumerateEntries(file, sink); - if (NS_FAILED(rv)) - return PR_FALSE; + try { + loader->EnumerateEntries(file, sink); + } + catch (nsexception &exc) return PR_FALSE; @@ -1179 +1179 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -1186,2 +1186 @@ - if (!header) - return NS_ERROR_OUT_OF_MEMORY; + @@ -1190 +1190 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1192 +1192 @@ - return NS_OK; + return; @@ -1563 +1563 @@ - aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file)); + IGNORE_NSEXCEPTION(aFileList->QueryElementAt(i, NS_GET_IID(nsILocalFile), getter_AddRefs(file))); @@ -1706,2 +1706 @@ -static nsresult -EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval) +static void EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval) @@ -1715 +1715 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1718,3 +1718,4 @@ - rv = entry->GetInterfaceInfo(&info); - if(NS_FAILED(rv)) - return rv; + try { + entry->GetInterfaceInfo(&info); + } + catch (nsexception &exc) { throw; } @@ -1724 +1724 @@ - return NS_OK; + return; @@ -1736 +1736 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_retval) @@ -1742 +1742 @@ - return EntryToInfo(entry, _retval); + return /*thower*/ EntryToInfo(entry, _retval); @@ -1746 +1746 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_retval) @@ -1757 +1757 @@ - return EntryToInfo(entry, _retval); + return /*thower*/ EntryToInfo(entry, _retval); @@ -1761 +1761 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval) @@ -1775 +1775 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1778 +1778 @@ - return entry->GetIID(_retval); + return /*thower*/ entry->GetIID(_retval); @@ -1782 +1782 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval) @@ -1796 +1796 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -1799 +1799 @@ - return entry->GetName(_retval); + return /*thower*/ entry->GetName(_retval); @@ -1811 +1811 @@ - array->AppendElement(ii); + IGNORE_NSEXCEPTION(array->AppendElement(ii)); @@ -1816 +1816 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::EnumerateInterfaces(nsIEnumerator **_retval) @@ -1824 +1824 @@ - NS_NewISupportsArray(getter_AddRefs(array)); + IGNORE_NSEXCEPTION(NS_NewISupportsArray(getter_AddRefs(array))); @@ -1826 +1826 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1830 +1830 @@ - return array->Enumerate(_retval); + return /*thower*/ array->Enumerate(_retval); @@ -1853 +1853 @@ - args->array->AppendElement(ii); + IGNORE_NSEXCEPTION(args->array->AppendElement(ii)); @@ -1858 +1858 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval) @@ -1861 +1861 @@ - NS_NewISupportsArray(getter_AddRefs(array)); + IGNORE_NSEXCEPTION(NS_NewISupportsArray(getter_AddRefs(array))); @@ -1863 +1863 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1868 +1868 @@ - return array->Enumerate(_retval); + return /*thower*/ array->Enumerate(_retval); @@ -1872 +1872 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::AutoRegisterInterfaces() +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::AutoRegisterInterfaces() @@ -1882 +1882 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1898 +1898 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1910 +1910 @@ - return NS_OK; + return; @@ -1916 +1916 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1924 +1924 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1929 +1929 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1946 +1946 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -1953 +1953 @@ - return NS_OK; + return; @@ -1993 +1993 @@ -NS_IMETHODIMP xptiAdditionalManagersEnumerator::HasMoreElements(PRBool *_retval) +NS_IMETHODIMP_(void) xptiAdditionalManagersEnumerator::HasMoreElements(PRBool *_retval) @@ -1996 +1996 @@ - return NS_OK; + return; @@ -2000 +2000 @@ -NS_IMETHODIMP xptiAdditionalManagersEnumerator::GetNext(nsISupports **_retval) +NS_IMETHODIMP_(void) xptiAdditionalManagersEnumerator::GetNext(nsISupports **_retval) @@ -2005 +2005 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2009 +2009 @@ - return *_retval ? NS_OK : NS_ERROR_FAILURE; + return wrap_nsexception(*_retval ? NS_OK : NS_ERROR_FAILURE); @@ -2015 +2015 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::AddAdditionalManager(nsIInterfaceInfoManager *manager) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::AddAdditionalManager(nsIInterfaceInfoManager *manager) @@ -2024 +2024,3 @@ - nsresult rv = mAdditionalManagers.GetIndexOf(ptrToAdd, &index); + try { + mAdditionalManagers.GetIndexOf(ptrToAdd, &index); + } @@ -2026 +2026 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2028 +2028 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -2030 +2030 @@ - return NS_OK; + return; @@ -2034 +2034 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::RemoveAdditionalManager(nsIInterfaceInfoManager *manager) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::RemoveAdditionalManager(nsIInterfaceInfoManager *manager) @@ -2043 +2043 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2045 +2045 @@ - return NS_OK; + return; @@ -2049 +2049 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::HasAdditionalManagers(PRBool *_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::HasAdditionalManagers(PRBool *_retval) @@ -2052 +2052,3 @@ - nsresult rv = mAdditionalManagers.Count(&count); + try { + mAdditionalManagers.Count(&count); + } @@ -2054 +2054 @@ - return rv; + throw nsexception(rv); @@ -2058 +2058 @@ -NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateAdditionalManagers(nsISimpleEnumerator **_retval) +NS_IMETHODIMP_(void) xptiInterfaceInfoManager::EnumerateAdditionalManagers(nsISimpleEnumerator **_retval) @@ -2063,3 +2063,4 @@ - nsresult rv = mAdditionalManagers.Count(&count); - if(NS_FAILED(rv)) - return rv; + try { + mAdditionalManagers.Count(&count); + } + catch (nsexception &exc) { throw; } @@ -2069,2 +2069 @@ - if(!enumerator) - return NS_ERROR_OUT_OF_MEMORY; + @@ -2079 +2079 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2088 +2088 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2094 +2094 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2105 +2105 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -2110 +2110 @@ - return NS_OK; + return; --- xpcom/reflect/xptinfo/src/xptiManifest.cpp +++ xpcom/reflect/xptinfo/src/xptiManifest.cpp @@ -79,3 +79,4 @@ - nsresult rv = NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); - if(NS_FAILED(rv)) - return PR_FALSE; + try { + NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); + } + catch (nsexception &exc) return PR_FALSE; @@ -83,3 +83,4 @@ - rv = descDir->SetPersistentDescriptor(nsDependentCString(inStr)); - if(NS_FAILED(rv)) - return PR_FALSE; + try { + descDir->SetPersistentDescriptor(nsDependentCString(inStr)); + } + catch (nsexception &exc) return PR_FALSE; @@ -88 +88,3 @@ - rv = appDir->Equals(descDir, &matches); + try { + appDir->Equals(descDir, &matches); + } @@ -137 +137 @@ - tempFile->GetNativeLeafName(originalLeafName); + IGNORE_NSEXCEPTION(tempFile->GetNativeLeafName(originalLeafName)); @@ -142 +142 @@ - tempFile->SetNativeLeafName(leafName); + IGNORE_NSEXCEPTION(tempFile->SetNativeLeafName(leafName)); @@ -186 +186 @@ - aWorkingSet->GetDirectoryAt(i, getter_AddRefs(dir)); + IGNORE_NSEXCEPTION(aWorkingSet->GetDirectoryAt(i, getter_AddRefs(dir))); @@ -190 +190 @@ - dir->GetPersistentDescriptor(str); + IGNORE_NSEXCEPTION(dir->GetPersistentDescriptor(str)); @@ -274 +274 @@ - mainFile->GetParent(getter_AddRefs(parent)); + IGNORE_NSEXCEPTION(mainFile->GetParent(getter_AddRefs(parent))); @@ -469 +469 @@ - searchPath->Count(&searchPathCount); + IGNORE_NSEXCEPTION(searchPath->Count(&searchPathCount)); --- xpcom/reflect/xptinfo/src/xptiMisc.cpp +++ xpcom/reflect/xptinfo/src/xptiMisc.cpp @@ -134,2 +134 @@ -nsresult -xptiCloneLocalFile(nsILocalFile* aLocalFile, +void xptiCloneLocalFile(nsILocalFile* aLocalFile, @@ -141,3 +141,4 @@ - rv = aLocalFile->Clone(getter_AddRefs(cloneRaw)); - if(NS_FAILED(rv)) - return rv; + try { + aLocalFile->Clone(getter_AddRefs(cloneRaw)); + } + catch (nsexception &exc) { throw; } @@ -145 +145 @@ - return CallQueryInterface(cloneRaw, aCloneLocalFile); + return wrap_nsexception(CallQueryInterface(cloneRaw, aCloneLocalFile)); @@ -149,2 +149 @@ -nsresult -xptiCloneElementAsLocalFile(nsISupportsArray* aArray, PRUint32 aIndex, +void xptiCloneElementAsLocalFile(nsISupportsArray* aArray, PRUint32 aIndex, @@ -156,4 +156,5 @@ - rv = aArray->QueryElementAt(aIndex, NS_GET_IID(nsILocalFile), - getter_AddRefs(original)); - if(NS_FAILED(rv)) - return rv; + try { + aArray->QueryElementAt(aIndex, NS_GET_IID(nsILocalFile), + getter_AddRefs(original)); + } + catch (nsexception &exc) { throw; } @@ -161 +161 @@ - return xptiCloneLocalFile(original, aLocalFile); + return /*thower*/ xptiCloneLocalFile(original, aLocalFile); --- xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp +++ xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp @@ -345 +345 @@ - mDirectories->Count(&count); + IGNORE_NSEXCEPTION(mDirectories->Count(&count)); @@ -349 +349 @@ -nsresult xptiWorkingSet::GetCloneOfDirectoryAt(PRUint32 i, nsILocalFile** dir) +void xptiWorkingSet::GetCloneOfDirectoryAt(PRUint32 i, nsILocalFile** dir) @@ -351 +351 @@ - return xptiCloneElementAsLocalFile(mDirectories, i, dir); + return /*thower*/ xptiCloneElementAsLocalFile(mDirectories, i, dir); @@ -354 +354 @@ -nsresult xptiWorkingSet::GetDirectoryAt(PRUint32 i, nsILocalFile** dir) +void xptiWorkingSet::GetDirectoryAt(PRUint32 i, nsILocalFile** dir) @@ -356 +356 @@ - return mDirectories->QueryElementAt(i, NS_GET_IID(nsILocalFile), (void**)dir); + return /*thower*/ mDirectories->QueryElementAt(i, NS_GET_IID(nsILocalFile), (void**)dir); @@ -362,3 +362,4 @@ - nsresult rv = mDirectories->Count(&count); - if(NS_FAILED(rv)) - return PR_FALSE; + try { + mDirectories->Count(&count); + } + catch (nsexception &exc) return PR_FALSE; @@ -370,2 +370,2 @@ - mDirectories->QueryElementAt(i, NS_GET_IID(nsILocalFile), - getter_AddRefs(current)); + IGNORE_NSEXCEPTION(mDirectories->QueryElementAt(i, NS_GET_IID(nsILocalFile), + getter_AddRefs(current))); @@ -386 +386 @@ - file->GetParent(getter_AddRefs(dirAbstract)); + IGNORE_NSEXCEPTION(file->GetParent(getter_AddRefs(dirAbstract))); @@ -399 +399 @@ - GetDirectoryAt(i, getter_AddRefs(dir)); + IGNORE_NSEXCEPTION(GetDirectoryAt(i, getter_AddRefs(dir))); @@ -404,3 +404,4 @@ - nsresult rv = NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); - if(NS_FAILED(rv)) - return PR_FALSE; + try { + NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); + } + catch (nsexception &exc) return PR_FALSE; @@ -408,3 +408,4 @@ - rv = descDir->SetPersistentDescriptor(nsDependentCString(inDesc)); - if(NS_FAILED(rv)) - return PR_FALSE; + try { + descDir->SetPersistentDescriptor(nsDependentCString(inDesc)); + } + catch (nsexception &exc) return PR_FALSE; @@ -413 +413,3 @@ - rv = dir->Equals(descDir, &matches); + try { + dir->Equals(descDir, &matches); + } --- xpcom/reflect/xptinfo/src/xptiZipLoader.cpp +++ xpcom/reflect/xptinfo/src/xptiZipLoader.cpp @@ -54 +54 @@ - stream->Available(&flen); + IGNORE_NSEXCEPTION(stream->Available(&flen)); --- xpcom/reflect/xptinfo/src/xptiprivate.h +++ xpcom/reflect/xptinfo/src/xptiprivate.h @@ -412,2 +412,2 @@ - nsresult GetCloneOfDirectoryAt(PRUint32 i, nsILocalFile** dir); - nsresult GetDirectoryAt(PRUint32 i, nsILocalFile** dir); + void GetCloneOfDirectoryAt(PRUint32 i, nsILocalFile** dir); + void GetDirectoryAt(PRUint32 i, nsILocalFile** dir); @@ -595 +595 @@ - nsresult GetInterfaceInfo(xptiInterfaceInfo** info); + void GetInterfaceInfo(xptiInterfaceInfo** info); @@ -605,3 +605,3 @@ - nsresult GetName(char * *aName); - nsresult GetIID(nsIID * *aIID); - nsresult IsScriptable(PRBool *_retval); + void GetName(char * *aName); + void GetIID(nsIID * *aIID); + void IsScriptable(PRBool *_retval); @@ -610,17 +610,17 @@ - nsresult GetMethodCount(PRUint16 *aMethodCount); - nsresult GetConstantCount(PRUint16 *aConstantCount); - nsresult GetMethodInfo(PRUint16 index, const nsXPTMethodInfo * *info); - nsresult GetMethodInfoForName(const char *methodName, PRUint16 *index, const nsXPTMethodInfo * *info); - nsresult GetConstant(PRUint16 index, const nsXPTConstant * *constant); - nsresult GetInfoForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIInterfaceInfo **_retval); - nsresult GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval); - nsresult GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval); - nsresult GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval); - nsresult GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval); - nsresult GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval); - nsresult IsIID(const nsIID * IID, PRBool *_retval); - nsresult GetNameShared(const char **name); - nsresult GetIIDShared(const nsIID * *iid); - nsresult IsFunction(PRBool *_retval); - nsresult HasAncestor(const nsIID * iid, PRBool *_retval); - nsresult GetIIDForParamNoAlloc(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID *iid); + void GetMethodCount(PRUint16 *aMethodCount); + void GetConstantCount(PRUint16 *aConstantCount); + void GetMethodInfo(PRUint16 index, const nsXPTMethodInfo * *info); + void GetMethodInfoForName(const char *methodName, PRUint16 *index, const nsXPTMethodInfo * *info); + void GetConstant(PRUint16 index, const nsXPTConstant * *constant); + void GetInfoForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIInterfaceInfo **_retval); + void GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval); + void GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval); + void GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval); + void GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval); + void GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval); + void IsIID(const nsIID * IID, PRBool *_retval); + void GetNameShared(const char **name); + void GetIIDShared(const nsIID * *iid); + void IsFunction(PRBool *_retval); + void HasAncestor(const nsIID * iid, PRBool *_retval); + void GetIIDForParamNoAlloc(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID *iid); @@ -662 +662 @@ - nsresult GetEntryForParam(PRUint16 methodIndex, + void GetEntryForParam(PRUint16 methodIndex, @@ -666 +666 @@ - nsresult GetTypeInArray(const nsXPTParamInfo* param, + void GetTypeInArray(const nsXPTParamInfo* param, @@ -693,3 +693,3 @@ - NS_IMETHOD GetName(char * *aName) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetName(aName); } - NS_IMETHOD GetInterfaceIID(nsIID * *aIID) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIID(aIID); } - NS_IMETHOD IsScriptable(PRBool *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsScriptable(_retval); } + NS_IMETHOD_(void) GetName(char * *aName) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetName(aName)); } + NS_IMETHOD_(void) GetInterfaceIID(nsIID * *aIID) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIID(aIID)); } + NS_IMETHOD_(void) IsScriptable(PRBool *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsScriptable(_retval)); } @@ -697 +697 @@ - NS_IMETHOD GetParent(nsIInterfaceInfo * *aParent) + NS_IMETHOD_(void) GetParent(nsIInterfaceInfo * *aParent) @@ -700 +700 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -702 +702 @@ - return NS_OK; + return; @@ -704,17 +704,17 @@ - NS_IMETHOD GetMethodCount(PRUint16 *aMethodCount) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodCount(aMethodCount); } - NS_IMETHOD GetConstantCount(PRUint16 *aConstantCount) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetConstantCount(aConstantCount); } - NS_IMETHOD GetMethodInfo(PRUint16 index, const nsXPTMethodInfo * *info) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodInfo(index, info); } - NS_IMETHOD GetMethodInfoForName(const char *methodName, PRUint16 *index, const nsXPTMethodInfo * *info) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodInfoForName(methodName, index, info); } - NS_IMETHOD GetConstant(PRUint16 index, const nsXPTConstant * *constant) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetConstant(index, constant); } - NS_IMETHOD GetInfoForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIInterfaceInfo **_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetInfoForParam(methodIndex, param, _retval); } - NS_IMETHOD GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDForParam(methodIndex, param, _retval); } - NS_IMETHOD GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetTypeForParam(methodIndex, param, dimension, _retval); } - NS_IMETHOD GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetSizeIsArgNumberForParam(methodIndex, param, dimension, _retval); } - NS_IMETHOD GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetLengthIsArgNumberForParam(methodIndex, param, dimension, _retval); } - NS_IMETHOD GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetInterfaceIsArgNumberForParam(methodIndex, param, _retval); } - NS_IMETHOD IsIID(const nsIID * IID, PRBool *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsIID(IID, _retval); } - NS_IMETHOD GetNameShared(const char **name) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetNameShared(name); } - NS_IMETHOD GetIIDShared(const nsIID * *iid) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDShared(iid); } - NS_IMETHOD IsFunction(PRBool *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsFunction(_retval); } - NS_IMETHOD HasAncestor(const nsIID * iid, PRBool *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->HasAncestor(iid, _retval); } - NS_IMETHOD GetIIDForParamNoAlloc(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID *iid) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDForParamNoAlloc(methodIndex, param, iid); } + NS_IMETHOD_(void) GetMethodCount(PRUint16 *aMethodCount) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodCount(aMethodCount)); } + NS_IMETHOD_(void) GetConstantCount(PRUint16 *aConstantCount) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetConstantCount(aConstantCount)); } + NS_IMETHOD_(void) GetMethodInfo(PRUint16 index, const nsXPTMethodInfo * *info) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodInfo(index, info)); } + NS_IMETHOD_(void) GetMethodInfoForName(const char *methodName, PRUint16 *index, const nsXPTMethodInfo * *info) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetMethodInfoForName(methodName, index, info)); } + NS_IMETHOD_(void) GetConstant(PRUint16 index, const nsXPTConstant * *constant) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetConstant(index, constant)); } + NS_IMETHOD_(void) GetInfoForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIInterfaceInfo **_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetInfoForParam(methodIndex, param, _retval)); } + NS_IMETHOD_(void) GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDForParam(methodIndex, param, _retval)); } + NS_IMETHOD_(void) GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetTypeForParam(methodIndex, param, dimension, _retval)); } + NS_IMETHOD_(void) GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetSizeIsArgNumberForParam(methodIndex, param, dimension, _retval)); } + NS_IMETHOD_(void) GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetLengthIsArgNumberForParam(methodIndex, param, dimension, _retval)); } + NS_IMETHOD_(void) GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetInterfaceIsArgNumberForParam(methodIndex, param, _retval)); } + NS_IMETHOD_(void) IsIID(const nsIID * IID, PRBool *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsIID(IID, _retval)); } + NS_IMETHOD_(void) GetNameShared(const char **name) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetNameShared(name)); } + NS_IMETHOD_(void) GetIIDShared(const nsIID * *iid) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDShared(iid)); } + NS_IMETHOD_(void) IsFunction(PRBool *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsFunction(_retval)); } + NS_IMETHOD_(void) HasAncestor(const nsIID * iid, PRBool *_retval) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->HasAncestor(iid, _retval)); } + NS_IMETHOD_(void) GetIIDForParamNoAlloc(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID *iid) { return wrap_nsexception(return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDForParamNoAlloc(methodIndex, param, iid)); } @@ -978 +978 @@ -nsresult xptiCloneLocalFile(nsILocalFile* aLocalFile, +void xptiCloneLocalFile(nsILocalFile* aLocalFile, @@ -981 +981 @@ -nsresult xptiCloneElementAsLocalFile(nsISupportsArray* aArray, PRUint32 aIndex, +void xptiCloneElementAsLocalFile(nsISupportsArray* aArray, PRUint32 aIndex, --- xpcom/reflect/xptinfo/tests/TestInterfaceInfo.cpp +++ xpcom/reflect/xptinfo/tests/TestInterfaceInfo.cpp @@ -65,2 +65,2 @@ - iim->GetIIDForName("nsISupports", &iid1); - iim->GetNameForIID(iid1, &name1); + IGNORE_NSEXCEPTION(iim->GetIIDForName("nsISupports", &iid1)); + IGNORE_NSEXCEPTION(iim->GetNameForIID(iid1, &name1)); @@ -70,2 +70,2 @@ - iim->GetIIDForName("nsIInputStream", &iid2); - iim->GetNameForIID(iid2, &name2); + IGNORE_NSEXCEPTION(iim->GetIIDForName("nsIInputStream", &iid2)); + IGNORE_NSEXCEPTION(iim->GetNameForIID(iid2, &name2)); @@ -78 +78 @@ - iim->GetInfoForIID(iid2, &info2); + IGNORE_NSEXCEPTION(iim->GetInfoForIID(iid2, &info2)); @@ -84,2 +84,2 @@ - iim->GetIIDForName("nsIInputStream", &iid3); - iim->GetNameForIID(iid3, &name3); + IGNORE_NSEXCEPTION(iim->GetIIDForName("nsIInputStream", &iid3)); + IGNORE_NSEXCEPTION(iim->GetNameForIID(iid3, &name3)); @@ -87 +87 @@ - iim->GetInfoForIID(iid3, &info3); + IGNORE_NSEXCEPTION(iim->GetInfoForIID(iid3, &info3)); @@ -93 +93 @@ - iim->GetInfoForName("nsIBidirectionalEnumerator", &info4); + IGNORE_NSEXCEPTION(iim->GetInfoForName("nsIBidirectionalEnumerator", &info4)); @@ -100 +100 @@ - iim->GetInfoForName("nsIServiceManager", &info5); + IGNORE_NSEXCEPTION(iim->GetInfoForName("nsIServiceManager", &info5)); @@ -112 +112 @@ - info5->GetMethodCount(&methodcount); + IGNORE_NSEXCEPTION(info5->GetMethodCount(&methodcount)); @@ -115 +115 @@ - info5->GetMethodInfo(i, &mi); + IGNORE_NSEXCEPTION(info5->GetMethodInfo(i, &mi)); @@ -120 +120 @@ - info5->GetMethodInfo(7, &mi); + IGNORE_NSEXCEPTION(info5->GetMethodInfo(7, &mi)); @@ -126 +126 @@ - info5->GetIIDForParam(7, ¶m2, &nsISL); + IGNORE_NSEXCEPTION(info5->GetIIDForParam(7, ¶m2, &nsISL)); @@ -131 +131 @@ - iim->GetNameForIID(nsISL, &nsISLname); + IGNORE_NSEXCEPTION(iim->GetNameForIID(nsISL, &nsISLname)); @@ -138 +138 @@ - info5->GetIIDForParam(7, ¶m3, &nsISS); + IGNORE_NSEXCEPTION(info5->GetIIDForParam(7, ¶m3, &nsISS)); @@ -143 +143 @@ - iim->GetNameForIID(nsISS, &nsISSname); + IGNORE_NSEXCEPTION(iim->GetNameForIID(nsISS, &nsISSname)); --- xpcom/sample/nsSample.cpp +++ xpcom/sample/nsSample.cpp @@ -87 +87 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -92 +92 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -110 +110 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -115 +115 @@ - return NS_OK; + return; @@ -118 +118 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -123 +123 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -136 +136 @@ - return NS_OK; + return; @@ -139 +139 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -142 +142 @@ - return SetValue((char*) aValue); + return /*thower*/ SetValue((char*) aValue); @@ -148 +148 @@ - NS_CStringSetData(aValue, "GetValue"); + IGNORE_NSEXCEPTION(NS_CStringSetData(aValue, "GetValue")); @@ -151 +151 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -156 +156 @@ - return NS_ERROR_NULL_POINTER; + throw nsexception(NS_ERROR_NULL_POINTER); @@ -181 +181 @@ - return NS_OK; + return; --- xpcom/sample/nsSampleModule.cpp +++ xpcom/sample/nsSampleModule.cpp @@ -76 +76 @@ -static NS_METHOD nsSampleRegistrationProc(nsIComponentManager *aCompMgr, +static NS_METHOD_(void) nsSampleRegistrationProc(nsIComponentManager *aCompMgr, @@ -89 +89 @@ - return NS_OK; + return; @@ -92 +92 @@ -static NS_METHOD nsSampleUnregistrationProc(nsIComponentManager *aCompMgr, +static NS_METHOD_(void) nsSampleUnregistrationProc(nsIComponentManager *aCompMgr, @@ -105 +105 @@ - return NS_OK; + return; --- xpcom/string/public/nsXPCOMStrings.h +++ xpcom/string/public/nsXPCOMStrings.h @@ -194 +194 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -218 +218 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -327 +327 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -360 +360 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -382 +382 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -402 +402 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -406 +406 @@ - return NS_StringSetDataRange(aStr, PR_UINT32_MAX, 0, aData, aDataLength); + return /*thower*/ NS_StringSetDataRange(aStr, PR_UINT32_MAX, 0, aData, aDataLength); @@ -427 +427 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -431 +431 @@ - return NS_StringSetDataRange(aStr, aOffset, 0, aData, aDataLength); + return /*thower*/ NS_StringSetDataRange(aStr, aOffset, 0, aData, aDataLength); @@ -445 +445 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -448 +448 @@ - return NS_StringSetDataRange(aStr, aCutOffset, aCutLength, nsnull, 0); + return /*thower*/ NS_StringSetDataRange(aStr, aCutOffset, aCutLength, nsnull, 0); @@ -517 +517 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -541 +541 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -650 +650 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -683 +683 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -705 +705 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -725 +725 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -729 +729 @@ - return NS_CStringSetDataRange(aStr, PR_UINT32_MAX, 0, aData, aDataLength); + return /*thower*/ NS_CStringSetDataRange(aStr, PR_UINT32_MAX, 0, aData, aDataLength); @@ -750 +750 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -754 +754 @@ - return NS_CStringSetDataRange(aStr, aOffset, 0, aData, aDataLength); + return /*thower*/ NS_CStringSetDataRange(aStr, aOffset, 0, aData, aDataLength); @@ -768 +768 @@ -inline NS_HIDDEN_(nsresult) +inline NS_HIDDEN_(void) @@ -771 +771 @@ - return NS_CStringSetDataRange(aStr, aCutOffset, aCutLength, nsnull, 0); + return /*thower*/ NS_CStringSetDataRange(aStr, aCutOffset, aCutLength, nsnull, 0); @@ -828 +828 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -847 +847 @@ -XPCOM_API(nsresult) +XPCOM_API(void) --- xpcom/stub/nsXPComStub.cpp +++ xpcom/stub/nsXPComStub.cpp @@ -53 +53 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -56 +56 @@ -XPCOM_API(nsresult) +XPCOM_API(void) @@ -126 +126 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -129,2 +129 @@ - if (!functions) - return NS_ERROR_OUT_OF_MEMORY; + @@ -133 +133 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -143 +143 @@ - return NS_OK; + return; @@ -151 +151 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -156 +156 @@ - return NS_InitXPCOM2_P(result, binDirectory, dirProvider); + return /*thower*/ NS_InitXPCOM2_P(result, binDirectory, dirProvider); @@ -160 +160 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -167 +167 @@ - return NS_InitXPCOM3_P(result, binDirectory, dirProvider, + return /*thower*/ NS_InitXPCOM3_P(result, binDirectory, dirProvider, @@ -172 +172 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -175 +175 @@ - return NS_ShutdownXPCOM_P(svcMgr); + return /*thower*/ NS_ShutdownXPCOM_P(svcMgr); @@ -179 +179 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -182 +182 @@ - return NS_GetServiceManager_P(result); + return /*thower*/ NS_GetServiceManager_P(result); @@ -186 +186 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -189 +189 @@ - return NS_GetComponentManager_P(result); + return /*thower*/ NS_GetComponentManager_P(result); @@ -193 +193 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -196 +196 @@ - return NS_GetComponentRegistrar_P(result); + return /*thower*/ NS_GetComponentRegistrar_P(result); @@ -200 +200 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -203 +203 @@ - return NS_GetMemoryManager_P(result); + return /*thower*/ NS_GetMemoryManager_P(result); @@ -207 +207 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -212 +212 @@ - return NS_NewLocalFile_P(path, followLinks, result); + return /*thower*/ NS_NewLocalFile_P(path, followLinks, result); @@ -216 +216 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -221 +221 @@ - return NS_NewNativeLocalFile_P(path, followLinks, result); + return /*thower*/ NS_NewNativeLocalFile_P(path, followLinks, result); @@ -225 +225 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -228 +228 @@ - return NS_GetDebug_P(result); + return /*thower*/ NS_GetDebug_P(result); @@ -232 +232 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -235 +235 @@ - return NS_GetTraceRefcnt_P(result); + return /*thower*/ NS_GetTraceRefcnt_P(result); @@ -325 +325 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -329 +329 @@ - return NS_GetXPTCallStub_P(aIID, aOuter, aStub); + return /*thower*/ NS_GetXPTCallStub_P(aIID, aOuter, aStub); @@ -340 +340 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -344 +344 @@ - return NS_InvokeByIndex_P(that, methodIndex, paramCount, params); + return /*thower*/ NS_InvokeByIndex_P(that, methodIndex, paramCount, params); @@ -351 +351 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -354 +354 @@ - return NS_OK; + return; @@ -357 +357 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -360 +360 @@ - return NS_OK; + return; @@ -368 +368 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -371 +371 @@ - return NS_StringContainerInit_P(aStr); + return /*thower*/ NS_StringContainerInit_P(aStr); @@ -375 +375 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -381 +381 @@ - return NS_StringContainerInit2_P(aStr, aData, aDataLength, aFlags); + return /*thower*/ NS_StringContainerInit2_P(aStr, aData, aDataLength, aFlags); @@ -413 +413 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -416 +416 @@ - return NS_StringSetData_P(aStr, aBuf, aCount); + return /*thower*/ NS_StringSetData_P(aStr, aBuf, aCount); @@ -420 +420 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -424 +424 @@ - return NS_StringSetDataRange_P(aStr, aCutStart, aCutLength, aBuf, aCount); + return /*thower*/ NS_StringSetDataRange_P(aStr, aCutStart, aCutLength, aBuf, aCount); @@ -428 +428 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -431 +431 @@ - return NS_StringCopy_P(aDest, aSrc); + return /*thower*/ NS_StringCopy_P(aDest, aSrc); @@ -449 +449 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -452 +452 @@ - return NS_CStringContainerInit_P(aStr); + return /*thower*/ NS_CStringContainerInit_P(aStr); @@ -456 +456 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -462 +462 @@ - return NS_CStringContainerInit2_P(aStr, aData, aDataLength, aFlags); + return /*thower*/ NS_CStringContainerInit2_P(aStr, aData, aDataLength, aFlags); @@ -494 +494 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -497 +497 @@ - return NS_CStringSetData_P(aStr, aBuf, aCount); + return /*thower*/ NS_CStringSetData_P(aStr, aBuf, aCount); @@ -501 +501 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -505 +505 @@ - return NS_CStringSetDataRange_P(aStr, aCutStart, aCutLength, aBuf, aCount); + return /*thower*/ NS_CStringSetDataRange_P(aStr, aCutStart, aCutLength, aBuf, aCount); @@ -509 +509 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -512 +512 @@ - return NS_CStringCopy_P(aDest, aSrc); + return /*thower*/ NS_CStringCopy_P(aDest, aSrc); @@ -530 +530 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -533 +533 @@ - return NS_CStringToUTF16_P(aSrc, aSrcEncoding, aDest); + return /*thower*/ NS_CStringToUTF16_P(aSrc, aSrcEncoding, aDest); @@ -537 +537 @@ -EXPORT_XPCOM_API(nsresult) +EXPORT_XPCOM_API(void) @@ -540 +540 @@ - return NS_UTF16ToCString_P(aSrc, aDestEncoding, aDest); + return /*thower*/ NS_UTF16ToCString_P(aSrc, aDestEncoding, aDest); --- xpcom/tests/TestArray.cpp +++ xpcom/tests/TestArray.cpp @@ -112 +112,3 @@ - nsresult rv = aArray->Count(&cnt); + try { + aArray->Count(&cnt); + } @@ -136 +136 @@ - aArray->AppendElement(foo); + IGNORE_NSEXCEPTION(aArray->AppendElement(foo)); @@ -163 +163 @@ - array->AppendElement(foo); + IGNORE_NSEXCEPTION(array->AppendElement(foo)); @@ -202 +202 @@ - array->RemoveElement(foo); + IGNORE_NSEXCEPTION(array->RemoveElement(foo)); @@ -212 +212 @@ - array->Clear(); + IGNORE_NSEXCEPTION(array->Clear()); @@ -220 +220 @@ - array->Compact(); + IGNORE_NSEXCEPTION(array->Compact()); --- xpcom/tests/TestAtoms.cpp +++ xpcom/tests/TestAtoms.cpp @@ -85 +85 @@ - ids[i]->GetUTF8String(&utf8String); + IGNORE_NSEXCEPTION(ids[i]->GetUTF8String(&utf8String)); @@ -88,2 +88,2 @@ - id->ToString(s1); - ids[i]->ToString(s2); + IGNORE_NSEXCEPTION(id->ToString(s1)); + IGNORE_NSEXCEPTION(ids[i]->ToString(s2)); --- xpcom/tests/TestCOMPtr.cpp +++ xpcom/tests/TestCOMPtr.cpp @@ -69 +69 @@ - NS_IMETHOD QueryInterface( const nsIID&, void** ); + NS_IMETHOD_(void) QueryInterface( const nsIID&, void** ); @@ -88,2 +88,2 @@ - nsresult CreateIFoo( void** ); - nsresult CreateIBar( void** result ); + void CreateIFoo( void** ); + void CreateIBar( void** result ); @@ -175,2 +175 @@ -nsresult -IFoo::QueryInterface( const nsIID& aIID, void** aResult ) +void IFoo::QueryInterface( const nsIID& aIID, void** aResult ) @@ -196 +196 @@ - return status; + throw nsexception(status); @@ -199,2 +199 @@ -nsresult -CreateIFoo( void** result ) +void CreateIFoo( void** result ) @@ -211 +211 @@ - return 0; + return wrap_nsexception(0); @@ -250 +250 @@ - NS_IMETHOD QueryInterface( const nsIID&, void** ); + NS_IMETHOD_(void) QueryInterface( const nsIID&, void** ); @@ -265,2 +265 @@ -nsresult -IBar::QueryInterface( const nsID& aIID, void** aResult ) +void IBar::QueryInterface( const nsID& aIID, void** aResult ) @@ -288 +288 @@ - return status; + throw nsexception(status); @@ -293,2 +293 @@ -nsresult -CreateIBar( void** result ) +void CreateIBar( void** result ) @@ -305 +305 @@ - return 0; + return wrap_nsexception(0); @@ -376,2 +376 @@ -nsresult -TestBloat_Raw_Unsafe() +void TestBloat_Raw_Unsafe() @@ -380 +380,3 @@ - nsresult result = CreateIBar(REINTERPRET_CAST(void**, &barP)); + try { + CreateIBar(REINTERPRET_CAST(void**, &barP)); + } @@ -394 +394 @@ - return result; + throw nsexception(result); @@ -399,2 +399 @@ -nsresult -TestBloat_Smart() +void TestBloat_Smart() @@ -403 +403,3 @@ - nsresult result = CreateIBar( getter_AddRefs(barP) ); + try { + CreateIBar( getter_AddRefs(barP) ); + } @@ -410 +410 @@ - return result; + throw nsexception(result); @@ -428,2 +428,2 @@ - TestBloat_Raw_Unsafe(); - TestBloat_Smart(); + IGNORE_NSEXCEPTION(TestBloat_Raw_Unsafe()); + IGNORE_NSEXCEPTION(TestBloat_Smart()); @@ -570 +570 @@ - CreateIFoo( nsGetterAddRefs(foop) ); + IGNORE_NSEXCEPTION(CreateIFoo( nsGetterAddRefs(foop) )); @@ -579 +579 @@ - CreateIFoo( getter_AddRefs(foop) ); + IGNORE_NSEXCEPTION(CreateIFoo( getter_AddRefs(foop) )); --- xpcom/tests/TestDeque.cpp +++ xpcom/tests/TestDeque.cpp @@ -51,3 +51,3 @@ - nsresult OriginalTest(); - nsresult OriginalFlaw(); - nsresult AssignFlaw(); + void OriginalTest(); + void OriginalFlaw(); + void AssignFlaw(); @@ -78 +78 @@ -nsresult _TestDeque::OriginalTest() { +void _TestDeque::OriginalTest() { @@ -106 +106 @@ - return NS_OK; + return; @@ -109 +109 @@ -nsresult _TestDeque::OriginalFlaw() { +void _TestDeque::OriginalFlaw() { @@ -144 +144 @@ - return NS_OK; + return; @@ -147 +147 @@ -nsresult _TestDeque::AssignFlaw() { +void _TestDeque::AssignFlaw() { @@ -149 +149 @@ - return NS_OK; + return; --- xpcom/tests/TestExpirationTracker.cpp +++ xpcom/tests/TestExpirationTracker.cpp @@ -227 +227 @@ - NS_ShutdownXPCOM(nsnull); + IGNORE_NSEXCEPTION(NS_ShutdownXPCOM(nsnull)); --- xpcom/tests/TestFactory.cpp +++ xpcom/tests/TestFactory.cpp @@ -84 +84 @@ - NS_IMETHOD CreateInstance(nsISupports *aDelegate, + NS_IMETHOD_(void) CreateInstance(nsISupports *aDelegate, @@ -88 +88 @@ - NS_IMETHOD LockFactory(PRBool aLock) { return NS_OK; } + NS_IMETHOD_(void) LockFactory(PRBool aLock) { return; } @@ -93 +93 @@ -nsresult TestFactory::CreateInstance(nsISupports *aDelegate, +void TestFactory::CreateInstance(nsISupports *aDelegate, @@ -97 +97 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -103 +103 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -106 +106,3 @@ - nsresult res = t->QueryInterface(aIID, aResult); + try { + wrap_nsexception(t->QueryInterface(aIID, aResult)); + } @@ -108,4 +108,4 @@ - if (NS_FAILED(res)) { - *aResult = NULL; - delete t; - } + catch (nsexception &exc) { + *aResult = NULL; + delete t; + } @@ -113 +113 @@ - return res; + throw nsexception(res); @@ -122,2 +122,4 @@ - rv = NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull); - if (NS_FAILED(rv)) return -1; + try { + NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull); + } + catch (nsexception &exc) return -1; @@ -127,4 +127,4 @@ - registrar->RegisterFactory(kTestFactoryCID, - nsnull, - nsnull, - new TestFactory()); + IGNORE_NSEXCEPTION(registrar->RegisterFactory(kTestFactoryCID, + nsnull, + nsnull, + new TestFactory())); @@ -154 +154,3 @@ - rv = NS_ShutdownXPCOM(nsnull); + try { + NS_ShutdownXPCOM(nsnull); + } --- xpcom/tests/TestHarness.h +++ xpcom/tests/TestHarness.h @@ -61,6 +61,7 @@ - nsresult rv = NS_InitXPCOM2(&mServMgr, NULL, NULL); - if (NS_FAILED(rv)) - { - printf("FAIL NS_InitXPCOM2 returned failure code %x\n", rv); - mServMgr = NULL; - } + try { + NS_InitXPCOM2(&mServMgr, NULL, NULL); + } + catch (nsexception &exc) { + printf("FAIL NS_InitXPCOM2 returned failure code %x\n", rv); + mServMgr = NULL; + } @@ -74,6 +74,7 @@ - nsresult rv = NS_ShutdownXPCOM(NULL); - if (NS_FAILED(rv)) - { - printf("FAIL XPCOM shutdown failed with code %x\n", rv); - exit(1); - } + try { + NS_ShutdownXPCOM(NULL); + } + catch (nsexception &exc) { + printf("FAIL XPCOM shutdown failed with code %x\n", rv); + exit(1); + } --- xpcom/tests/TestHashtables.cpp +++ xpcom/tests/TestHashtables.cpp @@ -234 +234 @@ - NS_IMETHOD QueryInterface( const nsIID&, void** ); + NS_IMETHOD_(void) QueryInterface( const nsIID&, void** ); @@ -236,2 +236,2 @@ - NS_IMETHOD SetString(const nsACString& /*in*/ aString); - NS_IMETHOD GetString(nsACString& /*out*/ aString); + NS_IMETHOD_(void) SetString(const nsACString& /*in*/ aString); + NS_IMETHOD_(void) GetString(nsACString& /*out*/ aString); @@ -307,2 +307 @@ -nsresult -IFoo::QueryInterface( const nsIID& aIID, void** aResult ) +void IFoo::QueryInterface( const nsIID& aIID, void** aResult ) @@ -328 +328 @@ - return status; + throw nsexception(status); @@ -331,2 +331 @@ -nsresult -IFoo::SetString(const nsACString& aString) +void IFoo::SetString(const nsACString& aString) @@ -335 +335 @@ - return NS_OK; + return; @@ -338,2 +338 @@ -nsresult -IFoo::GetString(nsACString& aString) +void IFoo::GetString(nsACString& aString) @@ -342 +342 @@ - return NS_OK; + return; @@ -345,2 +345 @@ -nsresult -CreateIFoo( IFoo** result ) +void CreateIFoo( IFoo** result ) @@ -357 +357 @@ - return 0; + return wrap_nsexception(0); @@ -363 +363 @@ - aFoo->GetString(str); + IGNORE_NSEXCEPTION(aFoo->GetString(str)); @@ -372 +372 @@ - aData->GetString(str); + IGNORE_NSEXCEPTION(aData->GetString(str)); @@ -382 +382 @@ - foo->GetString(str); + IGNORE_NSEXCEPTION(foo->GetString(str)); @@ -393 +393 @@ - foo->GetString(str); + IGNORE_NSEXCEPTION(foo->GetString(str)); @@ -734,2 +734,2 @@ - CreateIFoo(getter_AddRefs(foo)); - foo->SetString(nsDependentCString(gEntities[i].mStr)); + IGNORE_NSEXCEPTION(CreateIFoo(getter_AddRefs(foo))); + IGNORE_NSEXCEPTION(foo->SetString(nsDependentCString(gEntities[i].mStr))); @@ -808,2 +808,2 @@ - CreateIFoo(getter_AddRefs(foo)); - foo->SetString(nsDependentCString(gEntities[i].mStr)); + IGNORE_NSEXCEPTION(CreateIFoo(getter_AddRefs(foo))); + IGNORE_NSEXCEPTION(foo->SetString(nsDependentCString(gEntities[i].mStr))); @@ -830 +830 @@ - myEnt->GetString(str); + IGNORE_NSEXCEPTION(myEnt->GetString(str)); @@ -882,2 +882,2 @@ - CreateIFoo(getter_AddRefs(foo)); - foo->SetString(nsDependentCString(gEntities[i].mStr)); + IGNORE_NSEXCEPTION(CreateIFoo(getter_AddRefs(foo))); + IGNORE_NSEXCEPTION(foo->SetString(nsDependentCString(gEntities[i].mStr))); @@ -904 +904 @@ - myEnt->GetString(str); + IGNORE_NSEXCEPTION(myEnt->GetString(str)); --- xpcom/tests/TestINIParser.cpp +++ xpcom/tests/TestINIParser.cpp @@ -59 +59 @@ - ini->GetStrings(aSection, StringCB, nsnull); + IGNORE_NSEXCEPTION(ini->GetStrings(aSection, StringCB, nsnull)); @@ -75,7 +75,9 @@ - nsresult rv = NS_NewNativeLocalFile(nsDependentCString(argv[1]), - PR_TRUE, - getter_AddRefs(lf)); - if (NS_FAILED(rv)) { - fprintf(stderr, "Error: NS_NewNativeLocalFile failed\n"); - return 1; - } + try { + NS_NewNativeLocalFile(nsDependentCString(argv[1]), + PR_TRUE, + getter_AddRefs(lf)); + } + catch (nsexception &exc) { + fprintf(stderr, "Error: NS_NewNativeLocalFile failed\n"); + return 1; + } @@ -84,5 +84,7 @@ - rv = ini.Init(lf); - if (NS_FAILED(rv)) { - fprintf(stderr, "Error: Init failed."); - return 2; - } + try { + ini.Init(lf); + } + catch (nsexception &exc) { + fprintf(stderr, "Error: Init failed."); + return 2; + } @@ -90 +90 @@ - ini.GetSections(SectionCB, &ini); + IGNORE_NSEXCEPTION(ini.GetSections(SectionCB, &ini)); --- xpcom/tests/TestObserverService.cpp +++ xpcom/tests/TestObserverService.cpp @@ -81 +81 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -99 +99 @@ - return NS_OK; + return; @@ -108 +108,3 @@ - nsresult res = CallCreateInstance("@mozilla.org/observer-service;1", &anObserverService); + try { + wrap_nsexception(CallCreateInstance("@mozilla.org/observer-service;1", &anObserverService)); + } @@ -118 +118,3 @@ - rv = anObserverService->AddObserver(aObserver, topicA.get(), PR_FALSE); + try { + anObserverService->AddObserver(aObserver, topicA.get(), PR_FALSE); + } @@ -122 +122,3 @@ - rv = anObserverService->AddObserver(bObserver, topicA.get(), PR_FALSE); + try { + anObserverService->AddObserver(bObserver, topicA.get(), PR_FALSE); + } @@ -126 +126,3 @@ - rv = anObserverService->AddObserver(bObserver, topicB.get(), PR_FALSE); + try { + anObserverService->AddObserver(bObserver, topicB.get(), PR_FALSE); + } @@ -130,3 +130,5 @@ - rv = anObserverService->NotifyObservers( aObserver, - topicA.get(), - NS_LITERAL_STRING("Testing Notify(observer-A, topic-A)").get() ); + try { + anObserverService->NotifyObservers( aObserver, + topicA.get(), + NS_LITERAL_STRING("Testing Notify(observer-A, topic-A)").get() ); + } @@ -136,3 +136,5 @@ - rv = anObserverService->NotifyObservers( bObserver, - topicB.get(), - NS_LITERAL_STRING("Testing Notify(observer-B, topic-B)").get() ); + try { + anObserverService->NotifyObservers( bObserver, + topicB.get(), + NS_LITERAL_STRING("Testing Notify(observer-B, topic-B)").get() ); + } @@ -143 +143,3 @@ - rv = anObserverService->EnumerateObservers(topicA.get(), getter_AddRefs(e)); + try { + anObserverService->EnumerateObservers(topicA.get(), getter_AddRefs(e)); + } @@ -153 +153 @@ - e->GetNext(getter_AddRefs(observer)); + IGNORE_NSEXCEPTION(e->GetNext(getter_AddRefs(observer))); @@ -158,3 +158,5 @@ - rv = observer->Observe( observer, - topicA.get(), - NS_LITERAL_STRING("during enumeration").get() ); + try { + observer->Observe( observer, + topicA.get(), + NS_LITERAL_STRING("during enumeration").get() ); + } @@ -167 +167,3 @@ - rv = anObserverService->RemoveObserver(aObserver, topicA.get()); + try { + anObserverService->RemoveObserver(aObserver, topicA.get()); + } @@ -172 +172,3 @@ - rv = anObserverService->RemoveObserver(bObserver, topicB.get()); + try { + anObserverService->RemoveObserver(bObserver, topicB.get()); + } @@ -175 +175,3 @@ - rv = anObserverService->RemoveObserver(bObserver, topicA.get()); + try { + anObserverService->RemoveObserver(bObserver, topicA.get()); + } --- xpcom/tests/TestPipe.cpp +++ xpcom/tests/TestPipe.cpp @@ -44 +44 @@ -nsresult NS_NewPipe2(nsIAsyncInputStream** input, +void NS_NewPipe2(nsIAsyncInputStream** input, @@ -53,2 +53 @@ - if (!pipe) - return NS_ERROR_OUT_OF_MEMORY; + @@ -56,5 +56,7 @@ - nsresult rv = pipe->Init(nonBlockingInput, - nonBlockingOutput, - segmentSize, - segmentCount, - segmentAlloc); + try { + pipe->Init(nonBlockingInput, + nonBlockingOutput, + segmentSize, + segmentCount, + segmentAlloc); + } @@ -62,2 +62 @@ - if (NS_FAILED(rv)) - return rv; + catch (nsexception &exc) { throw; } @@ -65,3 +65,3 @@ - pipe->GetInputStream(input); - pipe->GetOutputStream(output); - return NS_OK; + IGNORE_NSEXCEPTION(pipe->GetInputStream(input)); + IGNORE_NSEXCEPTION(pipe->GetOutputStream(output)); + return; @@ -90 +90 @@ - nsresult Init(PRUint32 count, size_t size); + void Init(PRUint32 count, size_t size); @@ -112 +112 @@ -nsresult BackwardsAllocator::Init(PRUint32 count, size_t size) +void BackwardsAllocator::Init(PRUint32 count, size_t size) @@ -117 +117 @@ - return NS_ERROR_ALREADY_INITIALIZED; + throw nsexception(NS_ERROR_ALREADY_INITIALIZED); @@ -124 +124 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -132 +132 @@ - return NS_OK; + return; @@ -171 +171 @@ -NS_IMETHODIMP BackwardsAllocator::HeapMinimize(PRBool immediate) +NS_IMETHODIMP_(void) BackwardsAllocator::HeapMinimize(PRBool immediate) @@ -173 +173 @@ - return NS_OK; + return; @@ -176 +176 @@ -NS_IMETHODIMP BackwardsAllocator::IsLowMemory(PRBool* retval) +NS_IMETHODIMP_(void) BackwardsAllocator::IsLowMemory(PRBool* retval) @@ -179 +179 @@ - return NS_OK; + return; @@ -183 +183 @@ -nsresult TestBackwardsAllocator() +void TestBackwardsAllocator() @@ -192 +192 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -194,3 +194,4 @@ - nsresult rv = allocator->Init(SEGMENT_COUNT, SEGMENT_SIZE); - if (NS_FAILED(rv)) - return rv; + try { + allocator->Init(SEGMENT_COUNT, SEGMENT_SIZE); + } + catch (nsexception &exc) { throw; } @@ -200,10 +200,11 @@ - rv = NS_NewPipe2(getter_AddRefs(input), - getter_AddRefs(output), - PR_FALSE, - PR_FALSE, - SEGMENT_SIZE, SEGMENT_COUNT, allocator); - if (NS_FAILED(rv)) - { - printf("FAIL NS_NewPipe2 failed: %x\n", rv); - return rv; - } + try { + NS_NewPipe2(getter_AddRefs(input), + getter_AddRefs(output), + PR_FALSE, + PR_FALSE, + SEGMENT_SIZE, SEGMENT_COUNT, allocator); + } + catch (nsexception &exc) { + printf("FAIL NS_NewPipe2 failed: %x\n", rv); + throw nsexception(rv); + } @@ -226 +226 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -230 +230,3 @@ - rv = output->Write(written, BUFFER_LENGTH, &writeCount); + try { + output->Write(written, BUFFER_LENGTH, &writeCount); + } @@ -235 +235 @@ - return rv; + throw nsexception(rv); @@ -240 +240,3 @@ - rv = input->Read(read, BUFFER_LENGTH, &readCount); + try { + input->Read(read, BUFFER_LENGTH, &readCount); + } @@ -245 +245 @@ - return rv; + throw nsexception(rv); @@ -251 +251 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -255 +255 @@ - return NS_OK; + return; --- xpcom/tests/TestPipes.cpp +++ xpcom/tests/TestPipes.cpp @@ -61,2 +61 @@ -static nsresult -WriteAll(nsIOutputStream *os, const char *buf, PRUint32 bufLen, PRUint32 *lenWritten) +static void WriteAll(nsIOutputStream *os, const char *buf, PRUint32 bufLen, PRUint32 *lenWritten) @@ -68,2 +68,4 @@ - nsresult rv = os->Write(p, bufLen, &n); - if (NS_FAILED(rv)) return rv; + try { + os->Write(p, bufLen, &n); + } + catch (nsexception &exc) { throw; } @@ -74 +74 @@ - return NS_OK; + return; @@ -81 +81 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -87,5 +87,7 @@ - rv = mIn->Read(buf, 100, &count); - if (NS_FAILED(rv)) { - printf("read failed\n"); - break; - } + try { + mIn->Read(buf, 100, &count); + } + catch (nsexception &exc) { + printf("read failed\n"); + break; + } @@ -108 +108 @@ - return rv; + throw nsexception(rv); @@ -129,2 +129 @@ -nsresult -TestPipe(nsIInputStream* in, nsIOutputStream* out) +void TestPipe(nsIInputStream* in, nsIOutputStream* out) @@ -135 +135 @@ - if (receiver == nsnull) return NS_ERROR_OUT_OF_MEMORY; + if (receiver == nsnull) throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -138,2 +138,4 @@ - rv = NS_NewThread(&thread, receiver); - if (NS_FAILED(rv)) return rv; + try { + NS_NewThread(&thread, receiver); + } + catch (nsexception &exc) { throw; } @@ -147 +147,3 @@ - rv = WriteAll(out, buf, len, &writeCount); + try { + WriteAll(out, buf, len, &writeCount); + } @@ -156 +156 @@ - if (NS_FAILED(rv)) return rv; + catch (nsexception &exc) { throw; } @@ -159,2 +159,4 @@ - rv = out->Close(); - if (NS_FAILED(rv)) return rv; + try { + out->Close(); + } + catch (nsexception &exc) { throw; } @@ -164 +164 @@ - thread->Shutdown(); + IGNORE_NSEXCEPTION(thread->Shutdown()); @@ -173 +173 @@ - return NS_OK; + return; @@ -182 +182 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -190,5 +190,7 @@ - rv = mIn->Read(buf, 100, &count); - if (NS_FAILED(rv)) { - printf("read failed\n"); - break; - } + try { + mIn->Read(buf, 100, &count); + } + catch (nsexception &exc) { + printf("read failed\n"); + break; + } @@ -205 +205 @@ - return rv; + throw nsexception(rv); @@ -215 +215 @@ - mon.Notify(); + IGNORE_NSEXCEPTION(mon.Notify()); @@ -222 +222 @@ - mon.Wait(); + IGNORE_NSEXCEPTION(mon.Wait()); @@ -242,2 +242 @@ -nsresult -TestShortWrites(nsIInputStream* in, nsIOutputStream* out) +void TestShortWrites(nsIInputStream* in, nsIOutputStream* out) @@ -248 +248 @@ - if (receiver == nsnull) return NS_ERROR_OUT_OF_MEMORY; + if (receiver == nsnull) throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -251,2 +251,4 @@ - rv = NS_NewThread(&thread, receiver); - if (NS_FAILED(rv)) return rv; + try { + NS_NewThread(&thread, receiver); + } + catch (nsexception &exc) { throw; } @@ -261,2 +261,4 @@ - rv = WriteAll(out, buf, len, &writeCount); - if (NS_FAILED(rv)) return rv; + try { + WriteAll(out, buf, len, &writeCount); + } + catch (nsexception &exc) { throw; } @@ -270 +270 @@ - out->Flush(); + IGNORE_NSEXCEPTION(out->Flush()); @@ -275,2 +275,4 @@ - rv = out->Close(); - if (NS_FAILED(rv)) return rv; + try { + out->Close(); + } + catch (nsexception &exc) { throw; } @@ -278 +278 @@ - thread->Shutdown(); + IGNORE_NSEXCEPTION(thread->Shutdown()); @@ -284 +284 @@ - return NS_OK; + return; @@ -414 +414 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -419,5 +419,7 @@ - rv = mOut->WriteFrom(mIn, ~0U, &count); - if (NS_FAILED(rv)) { - printf("Write failed\n"); - break; - } + try { + mOut->WriteFrom(mIn, ~0U, &count); + } + catch (nsexception &exc) { + printf("Write failed\n"); + break; + } @@ -434,2 +434,2 @@ - mOut->Close(); - return rv; + IGNORE_NSEXCEPTION(mOut->Close()); + throw nsexception(rv); @@ -455,2 +455 @@ -nsresult -TestChainedPipes() +void TestChainedPipes() @@ -463,2 +463,4 @@ - rv = NS_NewPipe(&in1, &out1, 20, 1999); - if (NS_FAILED(rv)) return rv; + try { + NS_NewPipe(&in1, &out1, 20, 1999); + } + catch (nsexception &exc) { throw; } @@ -468,2 +468,4 @@ - rv = NS_NewPipe(&in2, &out2, 200, 401); - if (NS_FAILED(rv)) return rv; + try { + NS_NewPipe(&in2, &out2, 200, 401); + } + catch (nsexception &exc) { throw; } @@ -473 +473 @@ - if (pump == nsnull) return NS_ERROR_OUT_OF_MEMORY; + if (pump == nsnull) throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -476,2 +476,4 @@ - rv = NS_NewThread(&thread, pump); - if (NS_FAILED(rv)) return rv; + try { + NS_NewThread(&thread, pump); + } + catch (nsexception &exc) { throw; } @@ -481 +481 @@ - if (receiver == nsnull) return NS_ERROR_OUT_OF_MEMORY; + if (receiver == nsnull) throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -484,2 +484,4 @@ - rv = NS_NewThread(&receiverThread, receiver); - if (NS_FAILED(rv)) return rv; + try { + NS_NewThread(&receiverThread, receiver); + } + catch (nsexception &exc) { throw; } @@ -494,2 +494,4 @@ - rv = WriteAll(out1, buf, len, &writeCount); - if (NS_FAILED(rv)) return rv; + try { + WriteAll(out1, buf, len, &writeCount); + } + catch (nsexception &exc) { throw; } @@ -505,2 +505,4 @@ - rv = out1->Close(); - if (NS_FAILED(rv)) return rv; + try { + out1->Close(); + } + catch (nsexception &exc) { throw; } @@ -508,2 +508,2 @@ - thread->Shutdown(); - receiverThread->Shutdown(); + IGNORE_NSEXCEPTION(thread->Shutdown()); + IGNORE_NSEXCEPTION(receiverThread->Shutdown()); @@ -515 +515 @@ - return NS_OK; + return; @@ -532 +532,3 @@ - rv = NS_NewPipe(&in, &out, segSize, bufSize); + try { + NS_NewPipe(&in, &out, segSize, bufSize); + } @@ -534 +534,3 @@ - rv = TestPipe(in, out); + try { + TestPipe(in, out); + } @@ -540 +540,3 @@ - rv = NS_NewPipe(&in, &out, segSize, bufSize); + try { + NS_NewPipe(&in, &out, segSize, bufSize); + } @@ -542 +542,3 @@ - rv = TestShortWrites(in, out); + try { + TestShortWrites(in, out); + } @@ -611,2 +611,4 @@ - rv = NS_InitXPCOM2(&servMgr, NULL, NULL); - if (NS_FAILED(rv)) return rv; + try { + NS_InitXPCOM2(&servMgr, NULL, NULL); + } + catch (nsexception &exc) { throw; } @@ -642 +642,3 @@ - rv = TestChainedPipes(); + try { + TestChainedPipes(); + } @@ -647 +647,3 @@ - rv = NS_ShutdownXPCOM( NULL ); + try { + NS_ShutdownXPCOM( NULL ); + } --- xpcom/tests/TestServMgr.cpp +++ xpcom/tests/TestServMgr.cpp @@ -52,2 +52 @@ -nsresult -BeginTest(int testNumber) +void BeginTest(int testNumber) @@ -57,2 +57,4 @@ - err = CallGetService(kIMyServiceCID, &myServ); - return err; + try { + wrap_nsexception(CallGetService(kIMyServiceCID, &myServ)); + } + throw nsexception(err); @@ -61,2 +61 @@ -nsresult -EndTest(int testNumber) +void EndTest(int testNumber) @@ -67,2 +67,4 @@ - err = myServ->Doit(); - if (err != NS_OK) return err; + try { + myServ->Doit(); + } + if (err != NS_OK) throw nsexception(err); @@ -74 +74 @@ - return NS_OK; + return; @@ -77,2 +77 @@ -nsresult -SimpleTest(int testNumber) +void SimpleTest(int testNumber) @@ -83,4 +83,8 @@ - err = BeginTest(testNumber); - if (err != NS_OK) return err; - err = EndTest(testNumber); - return err; + try { + BeginTest(testNumber); + } + if (err != NS_OK) throw nsexception(err); + try { + EndTest(testNumber); + } + throw nsexception(err); @@ -91,2 +91 @@ -nsresult -AsyncShutdown(int testNumber) +void AsyncShutdown(int testNumber) @@ -110 +110 @@ - return err; + throw nsexception(err); @@ -113,2 +113 @@ -nsresult -AsyncNoShutdownTest(int testNumber) +void AsyncNoShutdownTest(int testNumber) @@ -125,2 +125,4 @@ - err = BeginTest(testNumber); - if (err != NS_OK) return err; + try { + BeginTest(testNumber); + } + if (err != NS_OK) throw nsexception(err); @@ -131,2 +131,4 @@ - err = CallGetService(kIMyServiceCID, &otherClient); - if (err != NS_OK) return err; + try { + wrap_nsexception(CallGetService(kIMyServiceCID, &otherClient)); + } + if (err != NS_OK) throw nsexception(err); @@ -134,3 +134,7 @@ - err = AsyncShutdown(testNumber); - if (err != NS_OK) return err; - err = EndTest(testNumber); + try { + AsyncShutdown(testNumber); + } + if (err != NS_OK) throw nsexception(err); + try { + EndTest(testNumber); + } @@ -141 +141 @@ - return err; + throw nsexception(err); @@ -151,5 +151,7 @@ - err = NS_InitXPCOM2(nsnull, nsnull, nsnull); - if (NS_FAILED(err)) { - printf("NS_InitXPCOM2 failed\n"); - return -1; - } + try { + NS_InitXPCOM2(nsnull, nsnull, nsnull); + } + catch (nsexception &exc) { + printf("NS_InitXPCOM2 failed\n"); + return -1; + } @@ -157 +157,3 @@ - err = SimpleTest(++testNumber); + try { + SimpleTest(++testNumber); + } @@ -161 +161,3 @@ - err = AsyncNoShutdownTest(++testNumber); + try { + AsyncNoShutdownTest(++testNumber); + } @@ -165 +165 @@ - AsyncShutdown(++testNumber); + IGNORE_NSEXCEPTION(AsyncShutdown(++testNumber)); --- xpcom/tests/TestStorageStream.cpp +++ xpcom/tests/TestStorageStream.cpp @@ -51,3 +51,4 @@ - rv = NS_NewStorageStream(4096, PR_UINT32_MAX, getter_AddRefs(stor)); - if (NS_FAILED(rv)) - return -1; + try { + NS_NewStorageStream(4096, PR_UINT32_MAX, getter_AddRefs(stor)); + } + catch (nsexception &exc) return -1; @@ -56,3 +56,4 @@ - rv = stor->GetOutputStream(0, getter_AddRefs(out)); - if (NS_FAILED(rv)) - return -1; + try { + stor->GetOutputStream(0, getter_AddRefs(out)); + } + catch (nsexception &exc) return -1; @@ -62,3 +62,4 @@ - rv = out->Write(kData, sizeof(kData), &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, sizeof(kData), &n); + } + catch (nsexception &exc) return -1; @@ -66,3 +66,4 @@ - rv = out->Write(kData, sizeof(kData), &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, sizeof(kData), &n); + } + catch (nsexception &exc) return -1; @@ -70,3 +70,4 @@ - rv = out->Close(); - if (NS_FAILED(rv)) - return -1; + try { + out->Close(); + } + catch (nsexception &exc) return -1; @@ -77,3 +77,4 @@ - rv = stor->NewInputStream(0, getter_AddRefs(in)); - if (NS_FAILED(rv)) - return -1; + try { + stor->NewInputStream(0, getter_AddRefs(in)); + } + catch (nsexception &exc) return -1; @@ -85,3 +85,4 @@ - rv = in->Read(buf, sizeof(buf), &n); - if (NS_FAILED(rv)) - return -1; + try { + in->Read(buf, sizeof(buf), &n); + } + catch (nsexception &exc) return -1; @@ -90,3 +90,4 @@ - rv = in->Close(); - if (NS_FAILED(rv)) - return -1; + try { + in->Close(); + } + catch (nsexception &exc) return -1; @@ -98,3 +98,4 @@ - rv = stor->GetOutputStream(8192, getter_AddRefs(out)); - if (NS_FAILED(rv)) - return -1; + try { + stor->GetOutputStream(8192, getter_AddRefs(out)); + } + catch (nsexception &exc) return -1; @@ -102,3 +102,4 @@ - rv = out->Write(kData, sizeof(kData), &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, sizeof(kData), &n); + } + catch (nsexception &exc) return -1; @@ -106,3 +106,4 @@ - rv = out->Write(kData, sizeof(kData), &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, sizeof(kData), &n); + } + catch (nsexception &exc) return -1; @@ -110,3 +110,4 @@ - rv = out->Write(kData, sizeof(kData), &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, sizeof(kData), &n); + } + catch (nsexception &exc) return -1; @@ -114,3 +114,4 @@ - rv = out->Write(kData, 11, &n); - if (NS_FAILED(rv)) - return -1; + try { + out->Write(kData, 11, &n); + } + catch (nsexception &exc) return -1; @@ -118,3 +118,4 @@ - rv = out->Close(); - if (NS_FAILED(rv)) - return -1; + try { + out->Close(); + } + catch (nsexception &exc) return -1; @@ -125,3 +125,4 @@ - rv = stor->NewInputStream(0, getter_AddRefs(in)); - if (NS_FAILED(rv)) - return -1; + try { + stor->NewInputStream(0, getter_AddRefs(in)); + } + catch (nsexception &exc) return -1; @@ -131,3 +131,4 @@ - rv = in->Read(buf, sizeof(buf), &n); - if (NS_FAILED(rv)) - return -1; + try { + in->Read(buf, sizeof(buf), &n); + } + catch (nsexception &exc) return -1; @@ -136,3 +136,4 @@ - rv = in->Close(); - if (NS_FAILED(rv)) - return -1; + try { + in->Close(); + } + catch (nsexception &exc) return -1; --- xpcom/tests/TestTArray.cpp +++ xpcom/tests/TestTArray.cpp @@ -308 +308 @@ - a->GetNativeLeafName(name); + IGNORE_NSEXCEPTION(a->GetNativeLeafName(name)); @@ -315 +315 @@ - NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(tmpDir)); + IGNORE_NSEXCEPTION(NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(tmpDir))); @@ -325 +325 @@ - tmpDir->Clone(getter_AddRefs(f)); + IGNORE_NSEXCEPTION(tmpDir->Clone(getter_AddRefs(f))); @@ -519 +519 @@ - NS_ShutdownXPCOM(nsnull); + IGNORE_NSEXCEPTION(NS_ShutdownXPCOM(nsnull)); --- xpcom/tests/TestThreadPool.cpp +++ xpcom/tests/TestThreadPool.cpp @@ -55 +55 @@ - NS_IMETHOD Run() + NS_IMETHOD_(void) Run() @@ -61 +61 @@ - return NS_OK; + return; @@ -69,2 +69 @@ -static nsresult -RunTests() +static void RunTests() @@ -79 +79 @@ - pool->Dispatch(task, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(pool->Dispatch(task, NS_DISPATCH_NORMAL)); @@ -82,2 +82,2 @@ - pool->Shutdown(); - return NS_OK; + IGNORE_NSEXCEPTION(pool->Shutdown()); + return; @@ -91,2 +91,2 @@ - RunTests(); - NS_ShutdownXPCOM(nsnull); + IGNORE_NSEXCEPTION(RunTests()); + IGNORE_NSEXCEPTION(NS_ShutdownXPCOM(nsnull)); --- xpcom/tests/TestThreads.cpp +++ xpcom/tests/TestThreads.cpp @@ -51 +51 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -53,5 +53,7 @@ - nsresult rv = NS_GetCurrentThread(getter_AddRefs(thread)); - if (NS_FAILED(rv)) { - printf("failed to get current thread\n"); - return rv; - } + try { + NS_GetCurrentThread(getter_AddRefs(thread)); + } + catch (nsexception &exc) { + printf("failed to get current thread\n"); + throw nsexception(rv); + } @@ -64 +64 @@ - return rv; + throw nsexception(rv); @@ -76,2 +76 @@ -nsresult -TestThreads() +void TestThreads() @@ -82,2 +82 @@ - if (!event) - return NS_ERROR_OUT_OF_MEMORY; + @@ -86,5 +86,7 @@ - rv = NS_NewThread(getter_AddRefs(runner), event); - if (NS_FAILED(rv)) { - printf("failed to create thread\n"); - return rv; - } + try { + NS_NewThread(getter_AddRefs(runner), event); + } + catch (nsexception &exc) { + printf("failed to create thread\n"); + throw nsexception(rv); + } @@ -93,5 +93,7 @@ - rv = NS_GetCurrentThread(getter_AddRefs(thread)); - if (NS_FAILED(rv)) { - printf("failed to get current thread\n"); - return rv; - } + try { + NS_GetCurrentThread(getter_AddRefs(thread)); + } + catch (nsexception &exc) { + printf("failed to get current thread\n"); + throw nsexception(rv); + } @@ -99,4 +99,6 @@ - rv = runner->Shutdown(); // wait for the runner to die before quitting - if (NS_FAILED(rv)) { - printf("join failed\n"); - } + try { + runner->Shutdown(); + } // wait for the runner to die before quitting + catch (nsexception &exc) { + printf("join failed\n"); + } @@ -106 +106 @@ - return NS_OK; + return; @@ -113 +113 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -120 +120 @@ - return NS_OK; + return; @@ -158,5 +158,7 @@ - nsresult rv = NS_NewThread(getter_AddRefs(t), new nsStressRunner(k)); - if (NS_FAILED(rv)) { - NS_ERROR("can't create thread"); - return -1; - } + try { + NS_NewThread(getter_AddRefs(t), new nsStressRunner(k)); + } + catch (nsexception &exc) { + NS_ERROR("can't create thread"); + return -1; + } @@ -167 +167 @@ - array[k]->Shutdown(); + IGNORE_NSEXCEPTION(array[k]->Shutdown()); @@ -221,2 +221,4 @@ - rv = NS_InitXPCOM2(nsnull, nsnull, nsnull); - if (NS_FAILED(rv)) return -1; + try { + NS_InitXPCOM2(nsnull, nsnull, nsnull); + } + catch (nsexception &exc) return -1; @@ -249,2 +249,4 @@ - rv = TestThreads(); - if (NS_FAILED(rv)) return -1; + try { + TestThreads(); + } + catch (nsexception &exc) return -1; @@ -253,2 +253,4 @@ - rv = NS_ShutdownXPCOM(nsnull); - if (NS_FAILED(rv)) return -1; + try { + NS_ShutdownXPCOM(nsnull); + } + catch (nsexception &exc) return -1; --- xpcom/tests/external/TestMinStringAPI.cpp +++ xpcom/tests/external/TestMinStringAPI.cpp @@ -54 +54 @@ - NS_CStringContainerInit(s); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(s)); @@ -67 +67 @@ - NS_CStringSetData(s, kAsciiData, PR_UINT32_MAX); + IGNORE_NSEXCEPTION(NS_CStringSetData(s, kAsciiData, PR_UINT32_MAX)); @@ -89,2 +89,2 @@ - NS_CStringContainerInit(temp); - NS_CStringCopy(temp, s); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(temp)); + IGNORE_NSEXCEPTION(NS_CStringCopy(temp, s)); @@ -113 +113 @@ - NS_StringContainerInit(s); + IGNORE_NSEXCEPTION(NS_StringContainerInit(s)); @@ -126 +126 @@ - NS_StringSetData(s, kUnicodeData, PR_UINT32_MAX); + IGNORE_NSEXCEPTION(NS_StringSetData(s, kUnicodeData, PR_UINT32_MAX)); @@ -148,2 +148,2 @@ - NS_StringContainerInit(temp); - NS_StringCopy(temp, s); + IGNORE_NSEXCEPTION(NS_StringContainerInit(temp)); + IGNORE_NSEXCEPTION(NS_StringCopy(temp, s)); @@ -173,2 +173,2 @@ - NS_StringContainerInit(s); - NS_StringSetData(s, kUnicodeData, sizeof(kUnicodeData)/2 - 1); + IGNORE_NSEXCEPTION(NS_StringContainerInit(s)); + IGNORE_NSEXCEPTION(NS_StringSetData(s, kUnicodeData, sizeof(kUnicodeData)/2 - 1)); @@ -177 +177 @@ - NS_CStringContainerInit(temp); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(temp)); @@ -181 +181 @@ - NS_UTF16ToCString(s, NS_CSTRING_ENCODING_ASCII, temp); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(s, NS_CSTRING_ENCODING_ASCII, temp)); @@ -186 +186 @@ - NS_UTF16ToCString(s, NS_CSTRING_ENCODING_UTF8, temp); + IGNORE_NSEXCEPTION(NS_UTF16ToCString(s, NS_CSTRING_ENCODING_UTF8, temp)); @@ -200 +200 @@ - NS_CStringContainerInit(s); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(s)); @@ -202,2 +202,2 @@ - NS_CStringSetData(s, "foo"); - NS_CStringAppendData(s, "bar"); + IGNORE_NSEXCEPTION(NS_CStringSetData(s, "foo")); + IGNORE_NSEXCEPTION(NS_CStringAppendData(s, "bar")); @@ -227 +227 @@ - NS_CStringSetDataRange(str, offset, ml, np, nl); + IGNORE_NSEXCEPTION(NS_CStringSetDataRange(str, offset, ml, np, nl)); @@ -242,2 +242,2 @@ - NS_CStringContainerInit(a); - NS_CStringSetData(a, strVal); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(a)); + IGNORE_NSEXCEPTION(NS_CStringSetData(a, strVal)); @@ -246,2 +246,2 @@ - NS_CStringContainerInit(b); - NS_CStringSetData(b, matchVal); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(b)); + IGNORE_NSEXCEPTION(NS_CStringSetData(b, matchVal)); @@ -250,2 +250,2 @@ - NS_CStringContainerInit(c); - NS_CStringSetData(c, newVal); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(c)); + IGNORE_NSEXCEPTION(NS_CStringSetData(c, newVal)); @@ -319 +319 @@ - NS_CStringCutData(str, 0, i); + IGNORE_NSEXCEPTION(NS_CStringCutData(str, 0, i)); @@ -332 +332 @@ - NS_CStringCutData(str, i, len - i); + IGNORE_NSEXCEPTION(NS_CStringCutData(str, i, len - i)); @@ -338,2 +338,2 @@ - NS_CStringContainerInit(s); - NS_CStringSetData(s, " \thello world\r \n"); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(s)); + IGNORE_NSEXCEPTION(NS_CStringSetData(s, " \thello world\r \n")); @@ -437 +437 @@ - NS_CStringContainerInit(s); + IGNORE_NSEXCEPTION(NS_CStringContainerInit(s)); --- xpcom/tests/nsIFileEnumerator.cpp +++ xpcom/tests/nsIFileEnumerator.cpp @@ -16 +16,3 @@ - rv = file->GetDirectoryEntries(getter_AddRefs(entries)); + try { + file->GetDirectoryEntries(getter_AddRefs(entries)); + } @@ -24 +24 @@ - entries->GetNext(getter_AddRefs(sup)); + IGNORE_NSEXCEPTION(entries->GetNext(getter_AddRefs(sup))); @@ -38,6 +38,7 @@ - rv = file->IsDirectory(&isDir); - if (NS_FAILED(rv)) - { - printf("IsDirectory Failed!!!\n"); - return PR_FALSE; - } + try { + file->IsDirectory(&isDir); + } + catch (nsexception &exc) { + printf("IsDirectory Failed!!!\n"); + return PR_FALSE; + } @@ -63,2 +63,4 @@ - rv = NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull); - if (NS_FAILED(rv)) return -1; + try { + NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull); + } + catch (nsexception &exc) return -1; @@ -68 +68 @@ - registrar->AutoRegister(nsnull); + IGNORE_NSEXCEPTION(registrar->AutoRegister(nsnull)); @@ -73 +73 @@ - NS_NewNativeLocalFile(nsDependentCString(pathStr), PR_FALSE, getter_AddRefs(topDir)); + IGNORE_NSEXCEPTION(NS_NewNativeLocalFile(nsDependentCString(pathStr), PR_FALSE, getter_AddRefs(topDir))); @@ -90 +90,3 @@ - rv = NS_ShutdownXPCOM(nsnull); + try { + NS_ShutdownXPCOM(nsnull); + } --- xpcom/tests/nsIFileTest.cpp +++ xpcom/tests/nsIFileTest.cpp @@ -65 +65,3 @@ - rv = file->GetNativePath(pathName); + try { + file->GetNativePath(pathName); + } @@ -74 +74,3 @@ - nsresult rv = CallCreateInstance(NS_LOCAL_FILE_CONTRACTID, &file); + try { + wrap_nsexception(CallCreateInstance(NS_LOCAL_FILE_CONTRACTID, &file)); + } @@ -87 +87,3 @@ - rv = file->InitWithNativePath(nsDependentCString(creationPath)); + try { + file->InitWithNativePath(nsDependentCString(creationPath)); + } @@ -91 +91,3 @@ - rv = file->GetNativeLeafName(leafName); + try { + file->GetNativeLeafName(leafName); + } @@ -96 +96,3 @@ - rv = file->AppendNative(nsDependentCString(appendPath)); + try { + file->AppendNative(nsDependentCString(appendPath)); + } @@ -100 +100,3 @@ - rv = file->GetNativeLeafName(leafName); + try { + file->GetNativeLeafName(leafName); + } @@ -110 +110 @@ - file->Exists(&exists); + IGNORE_NSEXCEPTION(file->Exists(&exists)); @@ -135 +135,3 @@ - rv = file->InitWithNativePath(nsDependentCString(creationPath)); + try { + file->InitWithNativePath(nsDependentCString(creationPath)); + } @@ -139 +139,3 @@ - rv = file->AppendRelativeNativePath(nsDependentCString(appendPath)); + try { + file->AppendRelativeNativePath(nsDependentCString(appendPath)); + } @@ -145 +145 @@ - file->Exists(&exists); + IGNORE_NSEXCEPTION(file->Exists(&exists)); @@ -153 +153,3 @@ - rv = file->Create(whatToCreate, perm); + try { + file->Create(whatToCreate, perm); + } @@ -156 +156,3 @@ - rv = file->Exists(&exists); + try { + file->Exists(&exists); + } @@ -184 +184,3 @@ - rv = file->InitWithNativePath(nsDependentCString(creationPath)); + try { + file->InitWithNativePath(nsDependentCString(creationPath)); + } @@ -188 +188,3 @@ - rv = file->AppendNative(nsDependentCString(appendPath)); + try { + file->AppendNative(nsDependentCString(appendPath)); + } @@ -194 +194 @@ - file->Exists(&exists); + IGNORE_NSEXCEPTION(file->Exists(&exists)); @@ -202 +202,3 @@ - rv = file->CreateUnique(whatToCreate, perm); + try { + file->CreateUnique(whatToCreate, perm); + } @@ -205 +205,3 @@ - rv = file->Exists(&exists); + try { + file->Exists(&exists); + } @@ -233 +233,3 @@ - rv = file->InitWithNativePath(nsDependentCString(testFile)); + try { + file->InitWithNativePath(nsDependentCString(testFile)); + } @@ -245 +245,3 @@ - rv = dir->InitWithNativePath(nsDependentCString(targetDir)); + try { + dir->InitWithNativePath(nsDependentCString(targetDir)); + } @@ -248 +248,3 @@ - rv = file->CopyTo(dir, EmptyString()); + try { + file->CopyTo(dir, EmptyString()); + } @@ -270 +270,3 @@ - rv = file->InitWithNativePath(nsDependentCString(creationPath)); + try { + file->InitWithNativePath(nsDependentCString(creationPath)); + } @@ -274 +274,3 @@ - rv = file->AppendNative(nsDependentCString(appendPath)); + try { + file->AppendNative(nsDependentCString(appendPath)); + } @@ -280 +280 @@ - file->Exists(&exists); + IGNORE_NSEXCEPTION(file->Exists(&exists)); @@ -287 +287,3 @@ - rv = file->Remove(recursive); + try { + file->Remove(recursive); + } @@ -290 +290,3 @@ - rv = file->Exists(&exists); + try { + file->Exists(&exists); + } @@ -317 +317,3 @@ - rv = file->InitWithNativePath(nsDependentCString(testFile)); + try { + file->InitWithNativePath(nsDependentCString(testFile)); + } @@ -328 +328,3 @@ - rv = dir->InitWithNativePath(nsDependentCString(targetDir)); + try { + dir->InitWithNativePath(nsDependentCString(targetDir)); + } @@ -331 +331,3 @@ - rv = file->MoveToNative(dir, NS_LITERAL_CSTRING("newtemp")); + try { + file->MoveToNative(dir, NS_LITERAL_CSTRING("newtemp")); + } @@ -333,4 +333,3 @@ - if (NS_FAILED(rv)) - { - printf("MoveToNative() test Failed.\n"); - } + catch (nsexception &exc) { + printf("MoveToNative() test Failed.\n"); + } @@ -356 +356,3 @@ - rv = file->InitWithNativePath(nsDependentCString(testPath)); + try { + file->InitWithNativePath(nsDependentCString(testPath)); + } @@ -363 +363,3 @@ - rv = file->GetParent(getter_AddRefs(parent)); + try { + file->GetParent(getter_AddRefs(parent)); + } @@ -365 +365,3 @@ - rv = parent->GetPath(path); + try { + parent->GetPath(path); + } @@ -367 +367,3 @@ - rv = file->InitWithPath(path); + try { + file->InitWithPath(path); + } @@ -376 +376,3 @@ - rv = parent->Append(NS_LITERAL_STRING("foo")); + try { + parent->Append(NS_LITERAL_STRING("foo")); + } @@ -378 +378,3 @@ - rv = parent->Append(NS_LITERAL_STRING("bar")); + try { + parent->Append(NS_LITERAL_STRING("bar")); + } @@ -381 +381,3 @@ - rv = parent->Normalize(); + try { + parent->Normalize(); + } @@ -385 +385,3 @@ - rv = parent->GetNativePath(newPath); + try { + parent->GetNativePath(newPath); + } @@ -396 +396,3 @@ - rv = expectedFile->InitWithNativePath(nsDependentCString(expected)); + try { + expectedFile->InitWithNativePath(nsDependentCString(expected)); + } @@ -399 +399,3 @@ - rv = expectedFile->Normalize(); + try { + expectedFile->Normalize(); + } @@ -403 +403,3 @@ - rv = expectedFile->GetNativePath(expectedPath); + try { + expectedFile->GetNativePath(expectedPath); + } @@ -418 +418 @@ - NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull); + IGNORE_NSEXCEPTION(NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull)); @@ -421 +421 @@ - registrar->AutoRegister(nsnull); + IGNORE_NSEXCEPTION(registrar->AutoRegister(nsnull)); --- xpcom/tests/services/MyService.cpp +++ xpcom/tests/services/MyService.cpp @@ -49 +49 @@ - NS_IMETHOD + NS_IMETHOD_(void) @@ -74,2 +74 @@ -nsresult -MyService::Doit(void) +void MyService::Doit(void) @@ -78 +78 @@ - return NS_OK; + return; --- xpcom/tests/services/MyService.h +++ xpcom/tests/services/MyService.h @@ -56 +56 @@ - NS_IMETHOD + NS_IMETHOD_(void) --- xpcom/threads/TimerThread.cpp +++ xpcom/threads/TimerThread.cpp @@ -80,2 +80 @@ -nsresult -TimerThread::InitLocks() +void TimerThread::InitLocks() @@ -85,2 +85 @@ - if (!mLock) - return NS_ERROR_OUT_OF_MEMORY; + @@ -89,2 +89 @@ - if (!mCondVar) - return NS_ERROR_OUT_OF_MEMORY; + @@ -92 +92 @@ - return NS_OK; + return; @@ -95 +95 @@ -nsresult TimerThread::Init() +void TimerThread::Init() @@ -101 +101 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -103 +103 @@ - return NS_OK; + return; @@ -108,22 +108,6 @@ - nsresult rv = NS_NewThread(getter_AddRefs(mThread), this); - if (NS_FAILED(rv)) { - mThread = nsnull; - } - else { - nsCOMPtr observerService = - do_GetService("@mozilla.org/observer-service;1"); - // We must not use the observer service from a background thread! - if (observerService && !NS_IsMainThread()) { - nsCOMPtr result = nsnull; - NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD, - NS_GET_IID(nsIObserverService), - observerService, NS_PROXY_ASYNC, - getter_AddRefs(result)); - observerService.swap(result); - } - // We'll be released at xpcom shutdown - if (observerService) { - observerService->AddObserver(this, "sleep_notification", PR_FALSE); - observerService->AddObserver(this, "wake_notification", PR_FALSE); - } - } + try { + NS_NewThread(getter_AddRefs(mThread), this); + } + catch (nsexception &exc) { + mThread = nsnull; + } @@ -145 +145 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -147 +147 @@ - return NS_OK; + return; @@ -150 +150 @@ -nsresult TimerThread::Shutdown() +void TimerThread::Shutdown() @@ -155 +155 @@ - return NS_ERROR_NOT_INITIALIZED; + throw nsexception(NS_ERROR_NOT_INITIALIZED); @@ -173 +173 @@ - mThread->Shutdown(); // wait for the thread to die + IGNORE_NSEXCEPTION(mThread->Shutdown()); // wait for the thread to die @@ -176 +176 @@ - return NS_OK; + return; @@ -233 +233 @@ -NS_IMETHODIMP TimerThread::Run() +NS_IMETHODIMP_(void) TimerThread::Run() @@ -321 +321 @@ - return NS_OK; + return; @@ -324 +324 @@ -nsresult TimerThread::AddTimer(nsTimerImpl *aTimer) +void TimerThread::AddTimer(nsTimerImpl *aTimer) @@ -331 +331 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -337 +337 @@ - return NS_OK; + return; @@ -340 +340 @@ -nsresult TimerThread::TimerDelayChanged(nsTimerImpl *aTimer) +void TimerThread::TimerDelayChanged(nsTimerImpl *aTimer) @@ -350 +350 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -356 +356 @@ - return NS_OK; + return; @@ -359 +359 @@ -nsresult TimerThread::RemoveTimer(nsTimerImpl *aTimer) +void TimerThread::RemoveTimer(nsTimerImpl *aTimer) @@ -371 +371 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -377 +377 @@ - return NS_OK; + return; @@ -450 +450 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -458 +458 @@ - return NS_OK; + return; --- xpcom/threads/TimerThread.h +++ xpcom/threads/TimerThread.h @@ -61 +61 @@ - NS_HIDDEN_(nsresult) InitLocks(); + NS_HIDDEN_(void) InitLocks(); @@ -67,2 +67,2 @@ - NS_HIDDEN_(nsresult) Init(); - NS_HIDDEN_(nsresult) Shutdown(); + NS_HIDDEN_(void) Init(); + NS_HIDDEN_(void) Shutdown(); @@ -70,3 +70,3 @@ - nsresult AddTimer(nsTimerImpl *aTimer); - nsresult TimerDelayChanged(nsTimerImpl *aTimer); - nsresult RemoveTimer(nsTimerImpl *aTimer); + void AddTimer(nsTimerImpl *aTimer); + void TimerDelayChanged(nsTimerImpl *aTimer); + void RemoveTimer(nsTimerImpl *aTimer); --- xpcom/threads/nsEnvironment.cpp +++ xpcom/threads/nsEnvironment.cpp @@ -52 +52 @@ -NS_METHOD +NS_METHOD_(void) @@ -60 +60 @@ - return NS_ERROR_NO_AGGREGATION; + throw nsexception(NS_ERROR_NO_AGGREGATION); @@ -64,3 +64 @@ - if (!obj) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -71 +71 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -74,5 +74,7 @@ - rv = obj->QueryInterface(aIID, aResult); - if (NS_FAILED(rv)) { - delete obj; - } - return rv; + try { + wrap_nsexception(obj->QueryInterface(aIID, aResult)); + } + catch (nsexception &exc) { + delete obj; + } + throw nsexception(rv); @@ -87 +87 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -91 +91,3 @@ - nsresult rv = NS_CopyUnicodeToNative(aName, nativeName); + try { + NS_CopyUnicodeToNative(aName, nativeName); + } @@ -113 +113 @@ - return NS_OK; + return; @@ -116 +116 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -120 +120,3 @@ - nsresult rv = NS_CopyUnicodeToNative(aName, nativeName); + try { + NS_CopyUnicodeToNative(aName, nativeName); + } @@ -126 +126,3 @@ - rv = NS_CopyNativeToUnicode(nsDependentCString(value), aOutValue); + try { + NS_CopyNativeToUnicode(nsDependentCString(value), aOutValue); + } @@ -132 +132 @@ - return rv; + throw nsexception(rv); @@ -163 +163 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -169 +169,3 @@ - nsresult rv = NS_CopyUnicodeToNative(aName, nativeName); + try { + NS_CopyUnicodeToNative(aName, nativeName); + } @@ -172 +172,3 @@ - rv = NS_CopyUnicodeToNative(aValue, nativeVal); + try { + NS_CopyUnicodeToNative(aValue, nativeVal); + } @@ -178 +178 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -182,3 +182 @@ - if (!entry) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -189,3 +189 @@ - if (!newData) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -198 +198 @@ - return NS_OK; + return; --- xpcom/threads/nsEnvironment.h +++ xpcom/threads/nsEnvironment.h @@ -57 +57 @@ - static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, + static NS_METHOD_(void) Create(nsISupports *aOuter, REFNSIID aIID, --- xpcom/threads/nsEventQueue.cpp +++ xpcom/threads/nsEventQueue.cpp @@ -85 +85 @@ - mon.Wait(); + IGNORE_NSEXCEPTION(mon.Wait()); @@ -137 +137 @@ - mon.NotifyAll(); + IGNORE_NSEXCEPTION(mon.NotifyAll()); --- xpcom/threads/nsProcessCommon.cpp +++ xpcom/threads/nsProcessCommon.cpp @@ -83 +83 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -90,2 +90,4 @@ - nsresult rv = executable->IsFile(&isFile); - if (NS_FAILED(rv)) return rv; + try { + executable->IsFile(&isFile); + } + catch (nsexception &exc) { throw; } @@ -93 +93 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -102 +102,3 @@ - rv = mExecutable->GetNativePath(mTargetPath); + try { + mExecutable->GetNativePath(mTargetPath); + } @@ -104 +104 @@ - return rv; + throw nsexception(rv); @@ -213 +213 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -225,3 +225 @@ - if (!my_argv) { - return NS_ERROR_OUT_OF_MEMORY; - } + @@ -380 +380 @@ - return NS_ERROR_FILE_EXECUTION_FAILED; + throw nsexception(NS_ERROR_FILE_EXECUTION_FAILED); @@ -382 +382 @@ - return NS_OK; + return; @@ -385 +385 @@ -NS_IMETHODIMP nsProcess::InitWithPid(PRUint32 pid) +NS_IMETHODIMP_(void) nsProcess::InitWithPid(PRUint32 pid) @@ -387 +387 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -390 +390 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -393 +393 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -396 +396 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -399 +399 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -402 +402 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -405 +405 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -408 +408 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -411 +411 @@ - return NS_ERROR_NOT_IMPLEMENTED; + throw nsexception(NS_ERROR_NOT_IMPLEMENTED); @@ -414 +414 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -421 +421 @@ - return rv; + throw nsexception(rv); @@ -424 +424 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -429 +429 @@ - return NS_OK; + return; --- xpcom/threads/nsThread.cpp +++ xpcom/threads/nsThread.cpp @@ -76 +76 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -79 +79 @@ - return NS_CI_INTERFACE_GETTER_NAME(nsThread)(count, array); + return wrap_nsexception(NS_CI_INTERFACE_GETTER_NAME(nsThread)(count, array)); @@ -82 +82 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -86 +86 @@ - return NS_OK; + return; @@ -89 +89 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -93 +93 @@ - return NS_OK; + return; @@ -96 +96 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -100 +100 @@ - return NS_OK; + return; @@ -103 +103 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -107 +107 @@ - return NS_OK; + return; @@ -110 +110 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -114 +114 @@ - return NS_OK; + return; @@ -117 +117 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -121 +121 @@ - return NS_OK; + return; @@ -124 +124 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -127 +127 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -168 +168 @@ - mon.Wait(); + IGNORE_NSEXCEPTION(mon.Wait()); @@ -179 +179 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -182,2 +182,2 @@ - mon.Notify(); - return NS_OK; + IGNORE_NSEXCEPTION(mon.Notify()); + return; @@ -209 +209 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -211 +211 @@ - return NS_OK; + return; @@ -223 +223 @@ - NS_IMETHOD Run() { + NS_IMETHOD_(void) Run() { @@ -225 +225 @@ - return NS_OK; + return; @@ -249 +249 @@ - event->Run(); // unblocks nsThread::Init + IGNORE_NSEXCEPTION(event->Run()); // unblocks nsThread::Init @@ -256 +256 @@ - NS_ProcessPendingEvents(self); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(self)); @@ -287,2 +287 @@ -nsresult -nsThread::Init() +void nsThread::Init() @@ -306 +306 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -320 +320 @@ - return NS_OK; + return; @@ -323,2 +323 @@ -nsresult -nsThread::InitCurrentThread() +void nsThread::InitCurrentThread() @@ -331 +331 @@ - return NS_OK; + return; @@ -347 +347 @@ - obs->OnDispatchedEvent(this); + IGNORE_NSEXCEPTION(obs->OnDispatchedEvent(this)); @@ -355 +355 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -373,2 +373 @@ - if (!wrapper) - return NS_ERROR_OUT_OF_MEMORY; + @@ -385 +385 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -387 +387 @@ - return NS_OK; + return; @@ -390 +390 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -394 +394 @@ - return NS_OK; + return; @@ -400 +400 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -404 +404 @@ - return NS_OK; + return; @@ -407 +407 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -416 +416 @@ - return NS_OK; + return; @@ -424 +424 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -435,2 +435 @@ - if (!event) - return NS_ERROR_OUT_OF_MEMORY; + @@ -451 +451 @@ - return NS_OK; + return; @@ -454 +454 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -460 +460 @@ - return NS_OK; + return; @@ -463 +463 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -472,2 +472,2 @@ - sGlobalObserver->OnProcessNextEvent(this, mayWait && !ShuttingDown(), - mRunningEvent); + IGNORE_NSEXCEPTION(sGlobalObserver->OnProcessNextEvent(this, mayWait && !ShuttingDown(), + mRunningEvent)); @@ -477 +477 @@ - obs->OnProcessNextEvent(this, mayWait && !ShuttingDown(), mRunningEvent); + IGNORE_NSEXCEPTION(obs->OnProcessNextEvent(this, mayWait && !ShuttingDown(), mRunningEvent)); @@ -490 +490 @@ - event->Run(); + IGNORE_NSEXCEPTION(event->Run()); @@ -498 +498 @@ - obs->AfterProcessNextEvent(this, mRunningEvent); + IGNORE_NSEXCEPTION(obs->AfterProcessNextEvent(this, mRunningEvent)); @@ -501 +501 @@ - sGlobalObserver->AfterProcessNextEvent(this, mRunningEvent); + IGNORE_NSEXCEPTION(sGlobalObserver->AfterProcessNextEvent(this, mRunningEvent)); @@ -503 +503 @@ - return rv; + throw nsexception(rv); @@ -509 +509 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -513 +513 @@ - return NS_OK; + return; @@ -516 +516 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -542 +542 @@ - return NS_OK; + return; @@ -545 +545 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -548 +548 @@ - return SetPriority(mPriority + delta); + return /*thower*/ SetPriority(mPriority + delta); @@ -554 +554 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -559 +559 @@ - return NS_OK; + return; @@ -562 +562 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -569 +569 @@ - return NS_OK; + return; @@ -572 +572 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -578 +578 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -584 +584 @@ - return NS_OK; + return; @@ -587 +587 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -604 +604 @@ - return NS_OK; + return; @@ -621 +621 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -625 +625 @@ - mSyncTask->Run(); + IGNORE_NSEXCEPTION(mSyncTask->Run()); @@ -628 +628 @@ - mOrigin->Dispatch(this, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(mOrigin->Dispatch(this, NS_DISPATCH_NORMAL)); @@ -630 +630 @@ - return NS_OK; + return; @@ -633,2 +633 @@ -nsresult -NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver) +void NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver) @@ -637 +637 @@ - return NS_ERROR_NOT_AVAILABLE; + throw nsexception(NS_ERROR_NOT_AVAILABLE); @@ -641 +641 @@ - return NS_ERROR_UNEXPECTED; + throw nsexception(NS_ERROR_UNEXPECTED); @@ -645 +645 @@ - return NS_OK; + return; --- xpcom/threads/nsThread.h +++ xpcom/threads/nsThread.h @@ -63 +63 @@ - nsresult Init(); + void Init(); @@ -66 +66 @@ - nsresult InitCurrentThread(); + void InitCurrentThread(); --- xpcom/threads/nsThreadManager.cpp +++ xpcom/threads/nsThreadManager.cpp @@ -76,2 +76 @@ -nsresult -nsThreadManager::Init() +void nsThreadManager::Init() @@ -80,2 +80 @@ - if (!mLock) - return NS_ERROR_OUT_OF_MEMORY; + @@ -84 +84 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -87 +87 @@ - return NS_ERROR_FAILURE; + throw nsexception(NS_ERROR_FAILURE); @@ -91,2 +91 @@ - if (!mMainThread) - return NS_ERROR_OUT_OF_MEMORY; + @@ -94,5 +94,7 @@ - nsresult rv = mMainThread->InitCurrentThread(); - if (NS_FAILED(rv)) { - mMainThread = nsnull; - return rv; - } + try { + mMainThread->InitCurrentThread(); + } + catch (nsexception &exc) { + mMainThread = nsnull; + throw nsexception(rv); + } @@ -105 +105 @@ - return NS_OK; + return; @@ -121 +121 @@ - NS_ProcessPendingEvents(mMainThread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(mMainThread)); @@ -148 +148 @@ - NS_ProcessPendingEvents(mMainThread); + IGNORE_NSEXCEPTION(NS_ProcessPendingEvents(mMainThread)); @@ -211 +211 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -218,2 +218 @@ - if (!thr) - return NS_ERROR_OUT_OF_MEMORY; + @@ -222,5 +222,7 @@ - nsresult rv = thr->Init(); - if (NS_FAILED(rv)) { - NS_RELEASE(thr); - return rv; - } + try { + thr->Init(); + } + catch (nsexception &exc) { + NS_RELEASE(thr); + throw nsexception(rv); + } @@ -233 +233 @@ - return NS_OK; + return; @@ -236 +236 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -250 +250 @@ - return NS_OK; + return; @@ -253 +253 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -259 +259 @@ - return NS_OK; + return; @@ -262 +262 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -269 +269 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -271 +271 @@ - return NS_OK; + return; @@ -274 +274 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -280 +280 @@ - return NS_OK; + return; --- xpcom/threads/nsThreadManager.h +++ xpcom/threads/nsThreadManager.h @@ -58 +58 @@ - nsresult Init(); + void Init(); --- xpcom/threads/nsThreadPool.cpp +++ xpcom/threads/nsThreadPool.cpp @@ -85,2 +85 @@ -nsresult -nsThreadPool::PutEvent(nsIRunnable *event) +void nsThreadPool::PutEvent(nsIRunnable *event) @@ -107 +107 @@ - return NS_OK; + return; @@ -124 +124 @@ - thread->Shutdown(); + IGNORE_NSEXCEPTION(thread->Shutdown()); @@ -126 +126 @@ - thread->Dispatch(this, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(thread->Dispatch(this, NS_DISPATCH_NORMAL)); @@ -129 +129 @@ - return NS_OK; + return; @@ -143,2 +143,2 @@ - NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD, NS_GET_IID(nsIThread), thread, - NS_PROXY_ASYNC, getter_AddRefs(doomed)); + IGNORE_NSEXCEPTION(NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD, NS_GET_IID(nsIThread), thread, + NS_PROXY_ASYNC, getter_AddRefs(doomed))); @@ -146 +146 @@ - doomed->Shutdown(); + IGNORE_NSEXCEPTION(doomed->Shutdown()); @@ -152 +152 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -200 +200 @@ - mon.Wait(delta); + IGNORE_NSEXCEPTION(mon.Wait(delta)); @@ -209 +209 @@ - event->Run(); + IGNORE_NSEXCEPTION(event->Run()); @@ -217 +217 @@ - return NS_OK; + return; @@ -220 +220 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -234 +234 @@ - PutEvent(wrapper); + IGNORE_NSEXCEPTION(PutEvent(wrapper)); @@ -240 +240 @@ - PutEvent(event); + IGNORE_NSEXCEPTION(PutEvent(event)); @@ -242 +242 @@ - return NS_OK; + return; @@ -245 +245 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -253 +253 @@ - return NS_OK; + return; @@ -256 +256 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -263 +263 @@ - mon.NotifyAll(); + IGNORE_NSEXCEPTION(mon.NotifyAll()); @@ -273 +273 @@ - threads[i]->Shutdown(); + IGNORE_NSEXCEPTION(threads[i]->Shutdown()); @@ -275 +275 @@ - return NS_OK; + return; @@ -278 +278 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -282 +282 @@ - return NS_OK; + return; @@ -285 +285 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -292,2 +292,2 @@ - mon.NotifyAll(); // wake up threads so they observe this change - return NS_OK; + IGNORE_NSEXCEPTION(mon.NotifyAll()); // wake up threads so they observe this change + return; @@ -296 +296 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -300 +300 @@ - return NS_OK; + return; @@ -303 +303 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -310,2 +310,2 @@ - mon.NotifyAll(); // wake up threads so they observe this change - return NS_OK; + IGNORE_NSEXCEPTION(mon.NotifyAll()); // wake up threads so they observe this change + return; @@ -314 +314 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -318 +318 @@ - return NS_OK; + return; @@ -321 +321 @@ -NS_IMETHODIMP +NS_IMETHODIMP_(void) @@ -326,2 +326,2 @@ - mon.NotifyAll(); // wake up threads so they observe this change - return NS_OK; + IGNORE_NSEXCEPTION(mon.NotifyAll()); // wake up threads so they observe this change + return; --- xpcom/threads/nsThreadPool.h +++ xpcom/threads/nsThreadPool.h @@ -62 +62 @@ - nsresult PutEvent(nsIRunnable *event); + void PutEvent(nsIRunnable *event); --- xpcom/threads/nsThreadUtilsInternal.h +++ xpcom/threads/nsThreadUtilsInternal.h @@ -56,2 +56 @@ -extern nsresult -NS_COM NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver); +extern void NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver); --- xpcom/threads/nsTimerImpl.cpp +++ xpcom/threads/nsTimerImpl.cpp @@ -166,2 +166 @@ -nsresult -nsTimerImpl::Startup() +void nsTimerImpl::Startup() @@ -172 +172 @@ - if (!gThread) return NS_ERROR_OUT_OF_MEMORY; + @@ -175 +175,3 @@ - rv = gThread->InitLocks(); + try { + gThread->InitLocks(); + } @@ -177,3 +177,3 @@ - if (NS_FAILED(rv)) { - NS_RELEASE(gThread); - } + catch (nsexception &exc) { + NS_RELEASE(gThread); + } @@ -181 +181 @@ - return rv; + throw nsexception(rv); @@ -199 +199 @@ - gThread->Shutdown(); + IGNORE_NSEXCEPTION(gThread->Shutdown()); @@ -204 +204 @@ -nsresult nsTimerImpl::InitCommon(PRUint32 aType, PRUint32 aDelay) +void nsTimerImpl::InitCommon(PRUint32 aType, PRUint32 aDelay) @@ -210 +210,3 @@ - rv = gThread->Init(); + try { + gThread->Init(); + } @@ -228 +228 @@ - gThread->RemoveTimer(this); + IGNORE_NSEXCEPTION(gThread->RemoveTimer(this)); @@ -235 +235 @@ - return gThread->AddTimer(this); + return /*thower*/ gThread->AddTimer(this); @@ -238 +238 @@ -NS_IMETHODIMP nsTimerImpl::InitWithFuncCallback(nsTimerCallbackFunc aFunc, +NS_IMETHODIMP_(void) nsTimerImpl::InitWithFuncCallback(nsTimerCallbackFunc aFunc, @@ -250 +250 @@ - return InitCommon(aType, aDelay); + return /*thower*/ InitCommon(aType, aDelay); @@ -253 +253 @@ -NS_IMETHODIMP nsTimerImpl::InitWithCallback(nsITimerCallback *aCallback, +NS_IMETHODIMP_(void) nsTimerImpl::InitWithCallback(nsITimerCallback *aCallback, @@ -264 +264 @@ - return InitCommon(aType, aDelay); + return /*thower*/ InitCommon(aType, aDelay); @@ -267 +267 @@ -NS_IMETHODIMP nsTimerImpl::Init(nsIObserver *aObserver, +NS_IMETHODIMP_(void) nsTimerImpl::Init(nsIObserver *aObserver, @@ -278 +278 @@ - return InitCommon(aType, aDelay); + return /*thower*/ InitCommon(aType, aDelay); @@ -281 +281 @@ -NS_IMETHODIMP nsTimerImpl::Cancel() +NS_IMETHODIMP_(void) nsTimerImpl::Cancel() @@ -286 +286 @@ - gThread->RemoveTimer(this); + IGNORE_NSEXCEPTION(gThread->RemoveTimer(this)); @@ -288 +288 @@ - return NS_OK; + return; @@ -291 +291 @@ -NS_IMETHODIMP nsTimerImpl::SetDelay(PRUint32 aDelay) +NS_IMETHODIMP_(void) nsTimerImpl::SetDelay(PRUint32 aDelay) @@ -301 +301 @@ - gThread->TimerDelayChanged(this); + IGNORE_NSEXCEPTION(gThread->TimerDelayChanged(this)); @@ -303 +303 @@ - return NS_OK; + return; @@ -306 +306 @@ -NS_IMETHODIMP nsTimerImpl::GetDelay(PRUint32* aDelay) +NS_IMETHODIMP_(void) nsTimerImpl::GetDelay(PRUint32* aDelay) @@ -309 +309 @@ - return NS_OK; + return; @@ -312 +312 @@ -NS_IMETHODIMP nsTimerImpl::SetType(PRUint32 aType) +NS_IMETHODIMP_(void) nsTimerImpl::SetType(PRUint32 aType) @@ -318 +318 @@ - return NS_OK; + return; @@ -321 +321 @@ -NS_IMETHODIMP nsTimerImpl::GetType(PRUint32* aType) +NS_IMETHODIMP_(void) nsTimerImpl::GetType(PRUint32* aType) @@ -324 +324 @@ - return NS_OK; + return; @@ -328 +328 @@ -NS_IMETHODIMP nsTimerImpl::GetClosure(void** aClosure) +NS_IMETHODIMP_(void) nsTimerImpl::GetClosure(void** aClosure) @@ -331 +331 @@ - return NS_OK; + return; @@ -335 +335 @@ -NS_IMETHODIMP nsTimerImpl::GetCallback(nsITimerCallback **aCallback) +NS_IMETHODIMP_(void) nsTimerImpl::GetCallback(nsITimerCallback **aCallback) @@ -342 +342 @@ - return NS_OK; + return; @@ -387 +387 @@ - mCallback.i->Notify(this); + IGNORE_NSEXCEPTION(mCallback.i->Notify(this)); @@ -390,3 +390,3 @@ - mCallback.o->Observe(static_cast(this), - NS_TIMER_CALLBACK_TOPIC, - nsnull); + IGNORE_NSEXCEPTION(mCallback.o->Observe(static_cast(this), + NS_TIMER_CALLBACK_TOPIC, + nsnull)); @@ -410 +410 @@ - gThread->AddTimer(this); + IGNORE_NSEXCEPTION(gThread->AddTimer(this)); @@ -417 +417 @@ - NS_IMETHOD Run(); + NS_IMETHOD_(void) Run(); @@ -440 +440 @@ -NS_IMETHODIMP nsTimerEvent::Run() +NS_IMETHODIMP_(void) nsTimerEvent::Run() @@ -446 +446 @@ - return NS_OK; + return; @@ -459 +459 @@ - return NS_OK; + return; @@ -486 +486 @@ - gThread->AddTimer(this); + IGNORE_NSEXCEPTION(gThread->AddTimer(this)); @@ -489 +489 @@ - mCallingThread->Dispatch(event, NS_DISPATCH_NORMAL); + IGNORE_NSEXCEPTION(mCallingThread->Dispatch(event, NS_DISPATCH_NORMAL)); @@ -519,2 +519 @@ -nsresult -NS_NewTimer(nsITimer* *aResult, nsTimerCallbackFunc aCallback, void *aClosure, +void NS_NewTimer(nsITimer* *aResult, nsTimerCallbackFunc aCallback, void *aClosure, @@ -525 +525 @@ - return NS_ERROR_OUT_OF_MEMORY; + throw nsexception(NS_ERROR_OUT_OF_MEMORY); @@ -528,6 +528,8 @@ - nsresult rv = timer->InitWithFuncCallback(aCallback, aClosure, - aDelay, aType); - if (NS_FAILED(rv)) { - NS_RELEASE(timer); - return rv; - } + try { + timer->InitWithFuncCallback(aCallback, aClosure, + aDelay, aType); + } + catch (nsexception &exc) { + NS_RELEASE(timer); + throw nsexception(rv); + } @@ -536 +536 @@ - return NS_OK; + return; --- xpcom/threads/nsTimerImpl.h +++ xpcom/threads/nsTimerImpl.h @@ -93 +93 @@ - static NS_HIDDEN_(nsresult) Startup(); + static NS_HIDDEN_(void) Startup(); @@ -109 +109 @@ - nsresult InitCommon(PRUint32 aType, PRUint32 aDelay); + void InitCommon(PRUint32 aType, PRUint32 aDelay);