From 0a0b15da60dc99788502fe677f3a24833bc91a46 Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Wed, 14 Apr 1999 20:42:48 +0000 Subject: [PATCH] nsISupportsArray::RemoveElement() returns an nsresult, not a PRBool. --- uriloader/base/nsDocLoader.cpp | 7 ++++--- webshell/src/nsDocLoader.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 95b097794a28..687a8fdb088f 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -1392,8 +1392,9 @@ 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... */ - rv = m_LoadingDocsList->RemoveElement(aBindInfo); - if (PR_FALSE != rv) { + nsresult res; + res = m_LoadingDocsList->RemoveElement(aBindInfo); + if (NS_SUCCEEDED(res)) { nsILoadAttribs* loadAttributes; nsURLLoadType loadType = nsURLLoadNormal; @@ -1432,7 +1433,7 @@ void nsDocLoaderImpl::LoadURLComplete(nsIURL* aURL, nsISupports* aBindInfo, PRIn */ IsBusy(bIsBusy); - if ((PR_FALSE != bIsForegroundURL) && (!bIsBusy)) { + if (bIsForegroundURL && !bIsBusy) { #if defined(DEBUG) const char* buffer; diff --git a/webshell/src/nsDocLoader.cpp b/webshell/src/nsDocLoader.cpp index 95b097794a28..687a8fdb088f 100644 --- a/webshell/src/nsDocLoader.cpp +++ b/webshell/src/nsDocLoader.cpp @@ -1392,8 +1392,9 @@ 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... */ - rv = m_LoadingDocsList->RemoveElement(aBindInfo); - if (PR_FALSE != rv) { + nsresult res; + res = m_LoadingDocsList->RemoveElement(aBindInfo); + if (NS_SUCCEEDED(res)) { nsILoadAttribs* loadAttributes; nsURLLoadType loadType = nsURLLoadNormal; @@ -1432,7 +1433,7 @@ void nsDocLoaderImpl::LoadURLComplete(nsIURL* aURL, nsISupports* aBindInfo, PRIn */ IsBusy(bIsBusy); - if ((PR_FALSE != bIsForegroundURL) && (!bIsBusy)) { + if (bIsForegroundURL && !bIsBusy) { #if defined(DEBUG) const char* buffer;