diff options
| -rw-r--r-- | parameter/Subsystem.cpp | 4 | ||||
| -rw-r--r-- | parameter/Subsystem.h | 4 | ||||
| -rw-r--r-- | parameter/SystemClass.cpp | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/parameter/Subsystem.cpp b/parameter/Subsystem.cpp index 5ae04d2..c776065 100644 --- a/parameter/Subsystem.cpp +++ b/parameter/Subsystem.cpp @@ -213,7 +213,7 @@ const CSubsystemObject* CSubsystem::findSubsystemObjectFromConfigurableElement( return pSubsystemObject; } -void CSubsystem::findSusbystemLevelMappingKeyValue( +void CSubsystem::findSubsystemLevelMappingKeyValue( const CInstanceConfigurableElement* pInstanceConfigurableElement, string& strMappingKey, string& strMappingValue) const @@ -255,7 +255,7 @@ string CSubsystem::getFormattedSubsystemMappingData( // Find SubsystemCreator mapping key string strMappingKey; string strMappingValue; // mapping value where amends are not replaced by their value - findSusbystemLevelMappingKeyValue(pInstanceConfigurableElement, strMappingKey, strMappingValue); + findSubsystemLevelMappingKeyValue(pInstanceConfigurableElement, strMappingKey, strMappingValue); // Find SubSystemObject mapping value (with amends replaced by their value) return strMappingKey + ":" + pSubsystemObject->getFormattedMappingValue(); diff --git a/parameter/Subsystem.h b/parameter/Subsystem.h index 277ff25..abd6c39 100644 --- a/parameter/Subsystem.h +++ b/parameter/Subsystem.h @@ -160,7 +160,7 @@ private: /** * Find the mapping data defined for the CInstanceConfigurableElement given in parameter, that - * corresponds to Susbystem level mapping (Susbystem level mapping keys are defined in + * corresponds to Subsystem level mapping (Subsystem level mapping keys are defined in * CSubsystemObjectCreator classes). * The CInstanceConfigurableElement might as well contain local mapping data. * @@ -169,7 +169,7 @@ private: * @param[out] strMappingKey Mapping key defined at the Subsystem level * @param[out] strMappingValue Mapping value contained in pInstanceConfigurableElement */ - void findSusbystemLevelMappingKeyValue( + void findSubsystemLevelMappingKeyValue( const CInstanceConfigurableElement* pInstanceConfigurableElement, string& strMappingKey, string& strMappingValue) const; diff --git a/parameter/SystemClass.cpp b/parameter/SystemClass.cpp index ae0c25f..56bc489 100644 --- a/parameter/SystemClass.cpp +++ b/parameter/SystemClass.cpp @@ -39,7 +39,7 @@ // A plugin file name is of the form: // lib<type>-subsystem.so // The plugin symbol is of the form: -// get<TYPE>SusbystemBuilder +// get<TYPE>SubsystemBuilder // Plugin file naming const char* gpcPluginPattern = "-subsystem.so"; @@ -47,10 +47,10 @@ const char* gpcLibraryPrefix = "lib"; // Plugin symbol naming const char* gpcPluginSymbolPrefix = "get"; -const char* gpcPluginSymbolSuffix = "SusbystemBuilder"; +const char* gpcPluginSymbolSuffix = "SubsystemBuilder"; // Used by subsystem plugins -typedef void (*GetSusbystemBuilder)(CSubsystemLibrary*); +typedef void (*GetSubsystemBuilder)(CSubsystemLibrary*); CSystemClass::CSystemClass() : _pSubsystemLibrary(new CSubsystemLibrary) { @@ -191,9 +191,9 @@ bool CSystemClass::loadPlugins(list<string>& lstrPluginFiles, string& strError) string strPluginSymbol = getPluginSymbol(strPluginFileName); // Load symbol from library - GetSusbystemBuilder pfnGetSusbystemBuilder = (GetSusbystemBuilder)dlsym(lib_handle, strPluginSymbol.c_str()); + GetSubsystemBuilder pfnGetSubsystemBuilder = (GetSubsystemBuilder)dlsym(lib_handle, strPluginSymbol.c_str()); - if (!pfnGetSusbystemBuilder) { + if (!pfnGetSubsystemBuilder) { strError = "Subsystem plugin " + strPluginFileName + " does not contain " + strPluginSymbol + " symbol."; @@ -201,7 +201,7 @@ bool CSystemClass::loadPlugins(list<string>& lstrPluginFiles, string& strError) } // Fill library - pfnGetSusbystemBuilder(_pSubsystemLibrary); + pfnGetSubsystemBuilder(_pSubsystemLibrary); // Account for this success bAtLeastOneSybsystemPluginSuccessfullyLoaded = true; |