FCL/sf/os/persistentdata: comparison featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.cpp

equal deleted inserted replaced

-:b8bdbc8f59c7
+:7d4490026038
 return countSupported;
 }
 // -----------------------------------------------------------------------------
-TInt CFeatMgrFeatureRegistry::ResetFeatures()
+void CFeatMgrFeatureRegistry::ResetFeaturesL()
 {
 FUNC_LOG
 // backup the feature list before it is destroyed
 iFeatureListBackup.Reset();
-TInt count = iFeatureList.Count();
+const TInt KCount = iFeatureList.Count();
+	iFeatureListBackup.ReserveL(KCount);
-for( TInt i=0; i < count; i++ )
+	for(TInt i(0); i < KCount; i++)
-{
+		{
-iFeatureListBackup.Append( iFeatureList[i] );
+		// The main error here would be KErrNoMemory which should not happen as
-}
+		// we have already reserved the space. However, we should still check.
+		iFeatureListBackup.AppendL(iFeatureList[i]);
+		}
 // destroy the feature list
 iFeatureList.Reset();
 iFeatureList.Close();
 iRangeList.Reset();
 iRangeList.Close();
-return( 0 );
 }
 /**
 * Get the fully qualified path and filename to the features.dat
 * data file.
 if ( (err != KErrNone) && flags.IsSet(EFeatureRuntime) )
 	{
 	continue;
 		}
-tempFeatureArray.Insert( entry, i);
+		tempFeatureArray.InsertL( entry, i);
 }
 // Reserve memory if list still empty
 if( !iFeatureList.Count() )
 {
 TInt index = SearchFeature( entry.FeatureUid() );
 if( index == KErrNotFound)
 {
-User::LeaveIfError( iFeatureList.InsertInOrder( entry, FindByUid ) );
+iFeatureList.InsertInOrderL( entry, FindByUid );
 }
 else
 {
 INFO_LOG1( "CFeatMgrFeatureRegistry::ReadFileL - replacing uid 0x%08x",
 iFeatureList[index].FeatureUid().iUid );

changeset 51	7d4490026038
parent 40	b8bdbc8f59c7