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

Use new enumerator.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ENUMERATOR_19990424_BRANCH@32503 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-05-23 21:33:54 +00:00
parent a74cb92bf7
commit 87d6231b3d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/profile/src/nsProfile.cpp
View File

@@ -281,11 +281,13 @@ NS_IMETHODIMP nsProfile::GetProfileCount(int *numProfiles)
if (NS_SUCCEEDED(rv)) {
int numKeys=0;
rv = enumKeys->First();
// Enumerate subkeys till done.
while( NS_SUCCEEDED( rv ) && !enumKeys->IsDone() )
PRBool hasMore;
while( NS_SUCCEEDED( rv = enumKeys->HasMoreElements(&hasMore) ) && hasMore )
{
rv = enumKeys->Next();
nsCOMPtr<nsISupports> next;
rv = enumKeys->GetNext(getter_AddRefs(next));
numKeys++;
}
*numProfiles = numKeys;
@@ -326,10 +328,10 @@ NS_IMETHODIMP nsProfile::GetSingleProfile(char **profileName)
rv = reg->EnumerateSubtrees( key, &enumKeys );
// Go to beginning.
rv = enumKeys->First();
if(NS_SUCCEEDED(rv)&& !enumKeys->IsDone() ) {
PRBool hasMore;
if(NS_SUCCEEDED(rv = enumKeys->HasMoreElements(&hasMore)) && hasMore) {
nsISupports *base;
rv = enumKeys->CurrentItem( &base );
rv = enumKeys->GetNext( &base );
// Test result.
if (NS_SUCCEEDED(rv)) {
@@ -350,7 +352,9 @@ NS_IMETHODIMP nsProfile::GetSingleProfile(char **profileName)
// Print name:
printf( "\t\t%s", *profileName);
}
NS_RELEASE(node);
}
NS_RELEASE(base);
}
}
}