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

equal deleted inserted replaced

-:667e88a979d7
+:31a8f755b7fe
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ReadFilesFromDirL( KZFeaturesDir );
 //check that there is at least one DSR
 if (!iRangeList.Count())
 	{
-	_LIT( KPanicCategory, "FeatMgrServer" );
+	_LIT(KPanicCategory, "FeatMgrServer");
 	ERROR_LOG( "CFeatMgrFeatureRegistry::ReadFilesFromDirL() - no DSR found in ROM; this indicates a system integration error  - going to panic" );
-	User::Panic( KPanicCategory, EPanicNoDSR );
+	::FmgrFatalErrorL(KErrNotFound, KPanicCategory, EPanicNoDSR);
 	}
 }
 // -----------------------------------------------------------------------------
 // CFeatMgrFeatureRegistry::ReadFilesFromDirL
 // -----------------------------------------------------------------------------
 //
 void CFeatMgrFeatureRegistry::ReadFilesFromDirL( const TDesC& aDirName )
 {
-	_LIT( KPanicCategory, "FEATMGR-READFILE" );
+_LIT(KPanicCategory, "FEATMGR-READFILE");
 CDir* dir = NULL;
 TInt err( KErrNone );
 err = iFs.GetDir( aDirName, KEntryAttNormal, ESortByName, dir );
 User::Leave( err );
 }
 }
 else if( err == KErrPathNotFound )
 	{
-	__ASSERT_ALWAYS( EFalse, User::Panic( KPanicCategory, EPanicNoFeatureFiles) );
+	::FmgrFatalErrorL(err, KPanicCategory, EPanicNoFeatureFiles);
 	}
 	else
 {
 ERROR_LOG1( "CFeatMgrFeatureRegistry::ReadFilesFromDirL() - err %d ", err );
 User::Leave( err );
 		}
 	}
 else //File is not as runtime file.
 	{
-	err = ValidateFeatureFlag(flags);
+	ValidateFeatureFlagL(flags);
 	}
 //If a feature flag defined in system drive (c:) is invalid, it will not be added to Feature Manager
 if ( (err != KErrNone) && flags.IsSet(EFeatureRuntime) )
 	{
 TInt count = aList.Count();
 for ( TInt i = 0; i < count; i++ )
 {
 //Check for feature flag errors
-ValidateFeatureFlag(aList[i].FeatureFlags()) ;
+ValidateFeatureFlagL(aList[i].FeatureFlags()) ;
 const TUid uid( aList[i].FeatureUid() );
 TInt index = SearchFeature( uid );
 if( index != KErrNotFound )
 {
 // Rule 1) If a feature flag is blacklisted then setting any of modifiable, persisted, Un-initialised bit will be an error
 // Rule 2) If a feature flag is non blacklisted, non modifiable  setting any of Un-initialised, Persisted bit will be an error
 // -----------------------------------------------------------------------------
 //
-TInt CFeatMgrFeatureRegistry::ValidateFeatureFlag(TBitFlags32 aFlags)
+void CFeatMgrFeatureRegistry::ValidateFeatureFlagL(TBitFlags32 aFlags)
 	{
-	_LIT( KPanicCategory, "FEATMGR-FLAGS" );
+	_LIT(KPanicCategory, "FEATMGR-FLAGS");
 	if(!aFlags.IsSet(EFeatureRuntime)) //ROM defined feature flag error check
 		{
 		//Rule 1
 		if(aFlags.IsSet(EFeatureBlackListed) )
 	    	{
 	    	 if(aFlags.IsSet(EFeatureModifiable) || aFlags.IsSet(EFeaturePersisted) || aFlags.IsSet(EFeatureUninitialized) )
 	    	 	{
 	    	 	//error
-	    	 	__ASSERT_ALWAYS(EFalse, User::Panic( KPanicCategory, EFmpInvalidFeatureBitFlagsRule1));
+	    	 	::FmgrFatalErrorL(KErrArgument, KPanicCategory, EFmpInvalidFeatureBitFlagsRule1);
-return KErrArgument;
 	    	  	}
 	    	}
 	    //Rule 2
 	    if (!aFlags.IsSet(EFeatureModifiable))
 	       	{
 	       	if (aFlags.IsSet(EFeaturePersisted) || aFlags.IsSet(EFeatureUninitialized) )
 	       	 	{
 	        	//error
-	        	__ASSERT_ALWAYS(EFalse, User::Panic( KPanicCategory, EFmpInvalidFeatureBitFlagsRule2));
+	       	 	::FmgrFatalErrorL(KErrArgument, KPanicCategory, EFmpInvalidFeatureBitFlagsRule2);
-return KErrArgument;
 	        	}
 	        }
 		}
 	else // Runtime feature this should not be in the rom
 		{
-		__ASSERT_ALWAYS(EFalse, User::Panic( KPanicCategory, EPanicInvalidFeatureInfo));
+		::FmgrFatalErrorL(KErrArgument, KPanicCategory, EPanicInvalidFeatureInfo);
-		return KErrArgument;
 		}
-	return KErrNone;
 	}
 /**
 * This function is used to validate feature flags that are read from the features file on the ffs.
 * This function is also used to validate feature flags that are modified or added with the execption of MergePluginFeatures.

branch	RCL_3
changeset 10	31a8f755b7fe
parent 9	667e88a979d7
child 21	28839de615b4