Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix backwards return values on nsIEnumerator::IsDone().

Browse Source
This commit is contained in:
waterson%netscape.com 1999-09-21 01:28:18 +00:00
parent 45ee8d45da
commit 06b78978e9
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intl/uconv/src/nsCharsetConverterManager.cpp
View File

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

2
mailnews/import/src/nsImportService.cpp
View File

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

2
mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
View File

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

2
modules/libreg/xpcom/nsRegistry.cpp
View File

@ -1145,7 +1145,7 @@ nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) {
------------------------------------------------------------------------------*/
NS_IMETHODIMP
nsRegSubtreeEnumerator::IsDone() {
nsresult rv = mDone;
nsresult rv = mDone ? NS_OK : NS_COMFALSE;
return rv;
}

2
netwerk/streamconv/src/nsStreamConverterService.cpp
View File

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

12
profile/src/nsProfile.cpp
View File

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

6
xpcom/components/nsComponentManager.cpp
View File

@ -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<nsISupports> 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<nsISupports> 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<nsISupports> base;
rv = loaderEnum->CurrentItem(getter_AddRefs(base));

2
xpcom/components/nsNativeComponentLoader.cpp
View File

@ -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<nsISupports> base;
rv = dllEnum->CurrentItem(getter_AddRefs(base));

2
xpcom/components/nsRegistry.cpp
View File

@ -1145,7 +1145,7 @@ nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) {
------------------------------------------------------------------------------*/
NS_IMETHODIMP
nsRegSubtreeEnumerator::IsDone() {
nsresult rv = mDone;
nsresult rv = mDone ? NS_OK : NS_COMFALSE;
return rv;
}

4
xpcom/tools/registry/regExport.cpp
View File

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

2
xpfe/appshell/src/nsAppShellService.cpp
View File

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