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

equal deleted inserted replaced

-:fa9941cf3867
+:667e88a979d7
 	        {
 	        TBitFlags32 flags( aFeature.FeatureFlags() );
 	        flags.Set( EFeatureRuntime );
 	        //Check the feature falg is valid
-	        TRAP(err, err = ValidateRuntimeFeatureFlagL(flags));
+	        TRAP(err,ValidateRuntimeFeatureFlagL(flags));
 	        if (err != KErrNone)
 	            return err;
 	        TFeatureServerEntry entry( aFeature.FeatureUid(), flags, aFeature.FeatureData() );
 			err = iFeatureList.InsertInOrder( entry, FindByUid );
 TInt err( KErrNone );
 TRAP( err, ReadFileL( path ) );
 if ((err == KErrCorrupt) || (err == KErrArgument))
 	{
-	iFs.Delete(path);
+	User::LeaveIfError(iFs.Delete(path));
 	aFeaturesReady = ETrue;
 	}
 else if ( err != KErrNone && err != KErrNotFound && err != KErrPathNotFound )
 {
 ERROR_LOG1( "CFeatMgrFeatureRegistry::ReadRuntimeFeatures - ReadFileL returned err %d", err );
 User::LeaveIfError( writeStream.Create( iFs, path, EFileWrite ) );
 // Write header and entry
 RFeatureServerArray temp(1);
 CleanupClosePushL( temp );
-temp.Append( aFeature );
+temp.AppendL( aFeature );
 WriteHeaderAndEntriesL( writeStream, temp );
 CleanupStack::PopAndDestroy( &temp );
 CleanupStack::PopAndDestroy( &writeStream );
 }
 else if( err == KErrNone )
 aStream.WriteUint32L( 0 );
 for(TInt i = 0; i < count; i++)
 {
 aArray[i].ExternalizeL( aStream );
 }
+aStream.CommitL();
 }
 // -----------------------------------------------------------------------------
 // CFeatMgrFeatureRegistry::MergePluginFeatures
 // -----------------------------------------------------------------------------
 //
-void CFeatMgrFeatureRegistry::MergePluginFeatures(
+void CFeatMgrFeatureRegistry::MergePluginFeaturesL(
 RArray<FeatureInfoCommand::TFeature>& aList )
 {
 FUNC_LOG
 TInt count = aList.Count();
 // Insert new entry in array
 TFeatureServerEntry newFeature( uid, flags, KDefaultData );
 TInt err = iFeatureList.InsertInOrder( newFeature, FindByUid );
 INFO_LOG2( "CFeatMgrFeatureRegistry::MergePluginFeatures - 0x%08x insert result %d",
 newFeature.FeatureUid().iUid, err );
+User::LeaveIfError(err);
 }
 }
 }
 // -----------------------------------------------------------------------------
 // CFeatMgrFeatureRegistry::MergePluginFeatures
 // -----------------------------------------------------------------------------
 //
-void CFeatMgrFeatureRegistry::MergePluginFeatures( RFeatureArray& aList )
+void CFeatMgrFeatureRegistry::MergePluginFeaturesL( RFeatureArray& aList )
 {
 FUNC_LOG
 TInt count = aList.Count();
 // Insert new entry in array
 TFeatureServerEntry newFeature( uid, aList[i].FeatureFlags(), aList[i].FeatureData() );
 TInt err = iFeatureList.InsertInOrder( newFeature, FindByUid );
 INFO_LOG2( "CFeatMgrFeatureRegistry::MergePluginFeatures - 0x%08x insert result %d",
 newFeature.FeatureUid().iUid, err );
+User::LeaveIfError(err);
 }
 }
 }
 // -----------------------------------------------------------------------------
 * for the ffs.
 * This does not validate the dsr ranges.
 * The following are the rules to check for errors in the run time defined feature flags
 * Rule 1)Blacklisting of a run-time defined feature flag is an error
 * Rule 2)Un-initialised feature flag should be modifiable.
-* Funtion returns KErrArgument if a rule is broken otherwise KErrNone
 */
-TInt CFeatMgrFeatureRegistry::ValidateRuntimeFeatureFlagL(TBitFlags32 aFlags)
+void CFeatMgrFeatureRegistry::ValidateRuntimeFeatureFlagL(TBitFlags32 aFlags)
 	{
 	//Rule 1 (Blacklisting of run-time defined feature aFlags is not allowed)
 	if(aFlags.IsSet(EFeatureBlackListed) )
 	{
 	if(!aFlags.IsSet(EFeatureModifiable) && aFlags.IsSet(EFeatureUninitialized) )
 	 	{
 	 	//error
 	 	User::Leave( KErrArgument );
 	 	}
-	return KErrNone;
 	}
 /**
 * After restore, some features might have changed. This function will examine
 * the differences between the old feature set and the newly restored feature set
 * to discover if any changes have taken place: then it will handle the required
 * notifications for new, deleted and changed featuers.
 */
-TInt CFeatMgrFeatureRegistry::HandleRestoredFeatureNotificationsL( void )
+void CFeatMgrFeatureRegistry::HandleRestoredFeatureNotificationsL()
 	{
 	// All comparisons are between the new list iFeatureList and the old list iFeatureListBackup
 	TInt new_count = iFeatureList.Count();
 	TInt old_count = iFeatureListBackup.Count();
 			// KErrNotFound, if no matching object can be found
 			if( KErrNotFound == index )
 				{
 				// Recently added feature
-				added.Append( iFeatureList[i] );
+				added.AppendL( iFeatureList[i] );
 				}
 			else
 				{
 				// Get the features in iFeatureList that have recently been altered
 		        TFeatureServerEntry old_item = iFeatureListBackup[index];
 	        	// if any thing has changed, then add it to our list.
 		        // there is no != overload for TBitFlags32
 				if( !( old_flags == new_flags) || !( old_data == new_data) )
 					{
 					// changed in the "new" iFeatureList array
-					changed.Append( iFeatureList[i] );
+					changed.AppendL( iFeatureList[i] );
 					}
 				}
 	        } // end if ! EFeatureRuntime
 		} // end loop
 			// KErrNotFound, if no matching object can be found
 			if( KErrNotFound == index )
 				{
 				// Recently removed feature
-				removed.Append( iFeatureListBackup[i] );
+				removed.AppendL( iFeatureListBackup[i] );
 				}
 			// the else has already been completed in previous loop
 	        } // end if ! EFeatureRuntime
 		} // end loop
 {
 TFeatureServerEntry entry( removed[i].FeatureUid(), removed[i].FeatureFlags(), removed[i].FeatureData() );
 TFeatureChangeType changeType( EFeatureFeatureDeleted );
 iObserver.HandleFeatureChange( entry, changeType );
 }
-	return( 0 );
 	}
 // -----------------------------------------------------------------------------
 // CFeatMgrFeatureRegistry::SWIStart
 // -----------------------------------------------------------------------------

branch	RCL_3
changeset 9	667e88a979d7
parent 0	08ec8eefde2f
child 10	31a8f755b7fe