From ecac83d9d2d4ff343d1dff3f374bf3a13f145700 Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Tue, 21 Sep 1999 01:28:18 +0000 Subject: [PATCH] Fix backwards return values on nsIEnumerator::IsDone(). git-svn-id: svn://10.0.0.236/trunk@48471 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/src/nsCharsetConverterManager.cpp | 2 +- mozilla/mailnews/import/src/nsImportService.cpp | 2 +- .../mailnews/mime/emitters/src/nsMimeXULEmitter.cpp | 2 +- mozilla/modules/libreg/xpcom/nsRegistry.cpp | 2 +- .../streamconv/src/nsStreamConverterService.cpp | 2 +- mozilla/profile/src/nsProfile.cpp | 12 ++++++------ mozilla/xpcom/components/nsComponentManager.cpp | 6 +++--- mozilla/xpcom/components/nsNativeComponentLoader.cpp | 2 +- mozilla/xpcom/components/nsRegistry.cpp | 2 +- mozilla/xpcom/tools/registry/regExport.cpp | 4 ++-- mozilla/xpfe/appshell/src/nsAppShellService.cpp | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp index 7fa1434f652..bf6d7d3c53a 100644 --- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp @@ -248,7 +248,7 @@ nsresult nsCharsetConverterManager::CreateMapping() // XXX take these KONSTANTS out of here // XXX check return values, free stuff // XXX bit hacky, clean me up - while (!components -> IsDone()) { + while (NS_OK != components -> IsDone()) { nsISupports * base; res = components -> CurrentItem(&base); if (NS_SUCCEEDED(res)) { diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp index 29f16cba483..86de9a53f22 100644 --- a/mozilla/mailnews/import/src/nsImportService.cpp +++ b/mozilla/mailnews/import/src/nsImportService.cpp @@ -452,7 +452,7 @@ nsresult nsImportService::DoDiscover( void) char *pNodeName; nsIID nodeIID = NS_IREGISTRYNODE_IID; rv = enumerator->First(); - while ( NS_SUCCEEDED(rv) && !enumerator->IsDone()) { + while ( NS_SUCCEEDED(rv) && (NS_OK != enumerator->IsDone())) { nsISupports *base; rv = enumerator->CurrentItem( &base ); if (NS_SUCCEEDED( rv)) { diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp index 7e7e570fa67..9b794fc7620 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp @@ -1232,7 +1232,7 @@ nsMimeXULEmitter::BuildListOfStatusProviders() // go ahead and enumerate through. nsCAutoString actualProgID; rv = components->First(); - while (NS_SUCCEEDED(rv) && !components->IsDone()) + while (NS_SUCCEEDED(rv) && (NS_OK != components->IsDone())) { nsISupports *base = nsnull; diff --git a/mozilla/modules/libreg/xpcom/nsRegistry.cpp b/mozilla/modules/libreg/xpcom/nsRegistry.cpp index 451579ab4a6..c5139a008ba 100644 --- a/mozilla/modules/libreg/xpcom/nsRegistry.cpp +++ b/mozilla/modules/libreg/xpcom/nsRegistry.cpp @@ -1145,7 +1145,7 @@ nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { ------------------------------------------------------------------------------*/ NS_IMETHODIMP nsRegSubtreeEnumerator::IsDone() { - nsresult rv = mDone; + nsresult rv = mDone ? NS_OK : NS_COMFALSE; return rv; } diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp index 6987f7be1f6..ccc92ce61e0 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp +++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp @@ -116,7 +116,7 @@ nsStreamConverterService::BuildGraph() { // go ahead and enumerate through. rv = components->First(); - while (NS_SUCCEEDED(rv) && !components->IsDone()) { + while (NS_SUCCEEDED(rv) && (NS_OK != components->IsDone())) { nsISupports *base = nsnull; rv = components->CurrentItem(&base); diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 479750297f6..25c728f332d 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -764,7 +764,7 @@ NS_IMETHODIMP nsProfile::GetProfileCount(int *numProfiles) int numKeys=0; rv = enumKeys->First(); - while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() ) + while( NS_SUCCEEDED( rv ) && (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; @@ -891,7 +891,7 @@ NS_IMETHODIMP nsProfile::GetSingleProfile(char **profileName) // Go to beginning. rv = enumKeys->First(); - while(NS_SUCCEEDED(rv)&& !enumKeys->IsDone() ) + while(NS_SUCCEEDED(rv)&& (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; rv = enumKeys->CurrentItem(getter_AddRefs(base)); @@ -1612,7 +1612,7 @@ nsresult nsProfile::CopyRegKey(const char *oldProfile, const char *newProfile) rv = enumKeys->First(); // Enumerate subkeys till done. - while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() ) + while( NS_SUCCEEDED( rv ) && (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; rv = enumKeys->CurrentItem(getter_AddRefs(base)); @@ -1820,7 +1820,7 @@ void nsProfile::GetAllProfiles() rv = enumKeys->First(); // Enumerate subkeys till done. - while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() ) + while( NS_SUCCEEDED( rv ) && (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; rv = enumKeys->CurrentItem(getter_AddRefs(base)); @@ -2078,7 +2078,7 @@ NS_IMETHODIMP nsProfile::MigrateProfileInfo() rv = enumKeys->First(); // Enumerate subkeys till done. - while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() ) + while( NS_SUCCEEDED( rv ) && (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; rv = enumKeys->CurrentItem(getter_AddRefs(base)); @@ -2776,7 +2776,7 @@ NS_IMETHODIMP nsProfile::Get4xProfileCount(int *numProfiles) int numKeys=0; rv = enumKeys->First(); - while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() ) + while( NS_SUCCEEDED( rv ) && (NS_OK != enumKeys->IsDone()) ) { nsCOMPtr base; diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index 1c9fefc9570..3b6e3bef2e5 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -751,7 +751,7 @@ nsresult nsComponentManagerImpl::PlatformPrePopulateRegistry() if (NS_FAILED(rv)) return rv; rv = cidEnum->First(); - for (; NS_SUCCEEDED(rv) && !cidEnum->IsDone(); (rv = cidEnum->Next())) + for (; NS_SUCCEEDED(rv) && (cidEnum->IsDone() != NS_OK); (rv = cidEnum->Next())) { nsCOMPtr base; rv = cidEnum->CurrentItem(getter_AddRefs(base)); @@ -804,7 +804,7 @@ nsresult nsComponentManagerImpl::PlatformPrePopulateRegistry() if (NS_FAILED(rv)) return rv; rv = progidEnum->First(); - for (; NS_SUCCEEDED(rv) && !progidEnum->IsDone(); (rv = progidEnum->Next())) + for (; NS_SUCCEEDED(rv) && (progidEnum->IsDone() != NS_OK); (rv = progidEnum->Next())) { nsCOMPtr base; rv = progidEnum->CurrentItem(getter_AddRefs(base)); @@ -1968,7 +1968,7 @@ nsComponentManagerImpl::AutoRegister(PRInt32 when, nsIFileSpec *inDirSpec) if (NS_FAILED(rv)) return rv; - for (; NS_SUCCEEDED(rv) && !loaderEnum->IsDone(); + for (; NS_SUCCEEDED(rv) && (loaderEnum->IsDone() != NS_OK); (rv = loaderEnum->Next())) { nsCOMPtr base; rv = loaderEnum->CurrentItem(getter_AddRefs(base)); diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 41575ecea9b..7cd4ace4624 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -213,7 +213,7 @@ nsNativeComponentLoader::Init(nsIComponentManager *aCompMgr, nsISupports *aReg) if (NS_FAILED(rv)) return rv; rv = dllEnum->First(); - for (; NS_SUCCEEDED(rv) && !dllEnum->IsDone(); (rv = dllEnum->Next())) + for (; NS_SUCCEEDED(rv) && (dllEnum->IsDone() != NS_OK); (rv = dllEnum->Next())) { nsCOMPtr base; rv = dllEnum->CurrentItem(getter_AddRefs(base)); diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp index 451579ab4a6..c5139a008ba 100644 --- a/mozilla/xpcom/components/nsRegistry.cpp +++ b/mozilla/xpcom/components/nsRegistry.cpp @@ -1145,7 +1145,7 @@ nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { ------------------------------------------------------------------------------*/ NS_IMETHODIMP nsRegSubtreeEnumerator::IsDone() { - nsresult rv = mDone; + nsresult rv = mDone ? NS_OK : NS_COMFALSE; return rv; } diff --git a/mozilla/xpcom/tools/registry/regExport.cpp b/mozilla/xpcom/tools/registry/regExport.cpp index 0f5b42f9698..381a9f97dc9 100644 --- a/mozilla/xpcom/tools/registry/regExport.cpp +++ b/mozilla/xpcom/tools/registry/regExport.cpp @@ -138,7 +138,7 @@ void display( nsIRegistry *reg, nsIRegistry::Key root, const char *rootName ) { // Set enumerator to beginning. rv = keys->First(); // Enumerate subkeys till done. - while( NS_SUCCEEDED( rv ) && !keys->IsDone() ) { + while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) { nsISupports *base; rv = keys->CurrentItem( &base ); // Test result. @@ -211,7 +211,7 @@ static void displayValues( nsIRegistry *reg, nsIRegistry::Key root ) { rv = values->First(); // Enumerate values till done. - while( rv == NS_OK && !values->IsDone() ) { + while( rv == NS_OK && (NS_OK != values->IsDone()) ) { nsISupports *base; rv = values->CurrentItem( &base ); // Test result. diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 323647fc28e..3a1a5d052c4 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -327,7 +327,7 @@ nsAppShellService::EnumerateComponents( EnumeratorMemberFunction function ) { && NS_SUCCEEDED( ( rv = components->First() ) ) ) { // Enumerate all subtrees - while ( NS_SUCCEEDED( rv ) && !components->IsDone() ) { + while ( NS_SUCCEEDED( rv ) && (NS_OK != components->IsDone()) ) { nsISupports *base; rv = components->CurrentItem( &base );