Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out change to nsISupportsArray::AppendElement() and RemoveElement(); they now return PRBool's like they used to.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@27474 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com 1999-04-14 23:06:22 +00:00
parent a6ef6e380e
commit 78230e652c
8 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/base/src/nsThread.cpp
View File

@ -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);
}

2
mozilla/content/xul/document/src/nsXULDocument.cpp
View File

@ -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

2
mozilla/rdf/content/src/nsXULDocument.cpp
View File

@ -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

5
mozilla/uriloader/base/nsDocLoader.cpp
View File

@ -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;

5
mozilla/webshell/src/nsDocLoader.cpp
View File

@ -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;

6
mozilla/xpcom/ds/nsSupportsArray.h
View File

@ -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);

6
mozilla/xpcom/src/nsSupportsArray.h
View File

@ -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);

5
mozilla/xpcom/threads/nsThread.cpp
View File

@ -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);
}