From 78230e652ccf90f8cbb041ac709523eefccb896f Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Wed, 14 Apr 1999 23:06:22 +0000 Subject: [PATCH] Backed out change to nsISupportsArray::AppendElement() and RemoveElement(); they now return PRBool's like they used to. git-svn-id: svn://10.0.0.236/trunk@27474 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/src/nsThread.cpp | 5 +++-- mozilla/content/xul/document/src/nsXULDocument.cpp | 2 +- mozilla/rdf/content/src/nsXULDocument.cpp | 2 +- mozilla/uriloader/base/nsDocLoader.cpp | 5 ++--- mozilla/webshell/src/nsDocLoader.cpp | 5 ++--- mozilla/xpcom/ds/nsSupportsArray.h | 6 ++++-- mozilla/xpcom/src/nsSupportsArray.h | 6 ++++-- mozilla/xpcom/threads/nsThread.cpp | 5 +++-- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/mozilla/base/src/nsThread.cpp b/mozilla/base/src/nsThread.cpp index f9a5630fe9a..f8c4d1683af 100644 --- a/mozilla/base/src/nsThread.cpp +++ b/mozilla/base/src/nsThread.cpp @@ -280,7 +280,7 @@ nsThreadPool::Init(PRUint32 stackSize, NS_RELEASE(runnable); if (NS_FAILED(rv)) goto exit; - rv = mThreads->AppendElement(thread); + rv = mThreads->AppendElement(thread) ? NS_OK : NS_ERROR_FAILURE; NS_RELEASE(thread); if (NS_FAILED(rv)) goto exit; } @@ -318,7 +318,8 @@ nsThreadPool::DispatchRequest(nsIRunnable* runnable) rv = NS_ERROR_FAILURE; } else { - rv = mRequests->AppendElement(runnable); + // XXX for now AppendElement returns a PRBool + rv = ((PRBool) mRequests->AppendElement(runnable)) ? NS_OK : NS_ERROR_FAILURE; if (NS_SUCCEEDED(rv)) PR_Notify(mRequestMonitor); } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 7a93abb0d72..0b962676326 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -2178,7 +2178,7 @@ XULDocumentImpl::AddContentModelBuilder(nsIRDFContentModelBuilder* aBuilder) return rv; } - return mBuilders->AppendElement(aBuilder); + return mBuilders->AppendElement(aBuilder) ? NS_OK : NS_ERROR_FAILURE; } NS_IMETHODIMP diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp index 7a93abb0d72..0b962676326 100644 --- a/mozilla/rdf/content/src/nsXULDocument.cpp +++ b/mozilla/rdf/content/src/nsXULDocument.cpp @@ -2178,7 +2178,7 @@ XULDocumentImpl::AddContentModelBuilder(nsIRDFContentModelBuilder* aBuilder) return rv; } - return mBuilders->AppendElement(aBuilder); + return mBuilders->AppendElement(aBuilder) ? NS_OK : NS_ERROR_FAILURE; } NS_IMETHODIMP diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 687a8fdb088..9a6b2aa0ff5 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -1392,9 +1392,8 @@ void nsDocLoaderImpl::LoadURLComplete(nsIURL* aURL, nsISupports* aBindInfo, PRIn * If the entry is not found in the list, then it must have been cancelled * via Stop(...). So ignore just it... */ - nsresult res; - res = m_LoadingDocsList->RemoveElement(aBindInfo); - if (NS_SUCCEEDED(res)) { + rv = m_LoadingDocsList->RemoveElement(aBindInfo); + if (PR_FALSE != rv) { nsILoadAttribs* loadAttributes; nsURLLoadType loadType = nsURLLoadNormal; diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 687a8fdb088..9a6b2aa0ff5 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -1392,9 +1392,8 @@ void nsDocLoaderImpl::LoadURLComplete(nsIURL* aURL, nsISupports* aBindInfo, PRIn * If the entry is not found in the list, then it must have been cancelled * via Stop(...). So ignore just it... */ - nsresult res; - res = m_LoadingDocsList->RemoveElement(aBindInfo); - if (NS_SUCCEEDED(res)) { + rv = m_LoadingDocsList->RemoveElement(aBindInfo); + if (PR_FALSE != rv) { nsILoadAttribs* loadAttributes; nsURLLoadType loadType = nsURLLoadNormal; diff --git a/mozilla/xpcom/ds/nsSupportsArray.h b/mozilla/xpcom/ds/nsSupportsArray.h index 18c1dd24302..cdb9ff015ec 100644 --- a/mozilla/xpcom/ds/nsSupportsArray.h +++ b/mozilla/xpcom/ds/nsSupportsArray.h @@ -33,10 +33,12 @@ public: // nsICollection methods: NS_IMETHOD_(PRUint32) Count(void) const { return mCount; } NS_IMETHOD AppendElement(nsISupports *aElement) { - return InsertElementAt(aElement, mCount) ? NS_OK : NS_ERROR_FAILURE; + // XXX This incorrectly returns a PRBool instead of an nsresult. + return InsertElementAt(aElement, mCount); } NS_IMETHOD RemoveElement(nsISupports *aElement) { - return RemoveElement(aElement, 0) ? NS_OK : NS_ERROR_FAILURE; + // XXX This incorrectly returns a PRBool instead of an nsresult. + return RemoveElement(aElement, 0); } NS_IMETHOD Enumerate(nsIEnumerator* *result); NS_IMETHOD Clear(void); diff --git a/mozilla/xpcom/src/nsSupportsArray.h b/mozilla/xpcom/src/nsSupportsArray.h index 18c1dd24302..cdb9ff015ec 100644 --- a/mozilla/xpcom/src/nsSupportsArray.h +++ b/mozilla/xpcom/src/nsSupportsArray.h @@ -33,10 +33,12 @@ public: // nsICollection methods: NS_IMETHOD_(PRUint32) Count(void) const { return mCount; } NS_IMETHOD AppendElement(nsISupports *aElement) { - return InsertElementAt(aElement, mCount) ? NS_OK : NS_ERROR_FAILURE; + // XXX This incorrectly returns a PRBool instead of an nsresult. + return InsertElementAt(aElement, mCount); } NS_IMETHOD RemoveElement(nsISupports *aElement) { - return RemoveElement(aElement, 0) ? NS_OK : NS_ERROR_FAILURE; + // XXX This incorrectly returns a PRBool instead of an nsresult. + return RemoveElement(aElement, 0); } NS_IMETHOD Enumerate(nsIEnumerator* *result); NS_IMETHOD Clear(void); diff --git a/mozilla/xpcom/threads/nsThread.cpp b/mozilla/xpcom/threads/nsThread.cpp index f9a5630fe9a..f8c4d1683af 100644 --- a/mozilla/xpcom/threads/nsThread.cpp +++ b/mozilla/xpcom/threads/nsThread.cpp @@ -280,7 +280,7 @@ nsThreadPool::Init(PRUint32 stackSize, NS_RELEASE(runnable); if (NS_FAILED(rv)) goto exit; - rv = mThreads->AppendElement(thread); + rv = mThreads->AppendElement(thread) ? NS_OK : NS_ERROR_FAILURE; NS_RELEASE(thread); if (NS_FAILED(rv)) goto exit; } @@ -318,7 +318,8 @@ nsThreadPool::DispatchRequest(nsIRunnable* runnable) rv = NS_ERROR_FAILURE; } else { - rv = mRequests->AppendElement(runnable); + // XXX for now AppendElement returns a PRBool + rv = ((PRBool) mRequests->AppendElement(runnable)) ? NS_OK : NS_ERROR_FAILURE; if (NS_SUCCEEDED(rv)) PR_Notify(mRequestMonitor); }