summaryrefslogtreecommitdiffstats
path: root/parameter/Subsystem.cpp
diff options
context:
space:
mode:
authorKevin Rocard <kevinx.rocard@intel.com>2013-04-02 19:49:40 +0200
committerDavid Wagner <david.wagner@intel.com>2014-02-12 17:03:49 +0100
commit3414f994f9d2bf971caa4abd03932529619a81ec (patch)
treeede2de5fb606125898eacff2fc0bf6b8def51694 /parameter/Subsystem.cpp
parent084cafba76fa5c987cdffeaaa7401202473554cb (diff)
downloadexternal_parameter-framework-3414f994f9d2bf971caa4abd03932529619a81ec.zip
external_parameter-framework-3414f994f9d2bf971caa4abd03932529619a81ec.tar.gz
external_parameter-framework-3414f994f9d2bf971caa4abd03932529619a81ec.tar.bz2
PFW: Coding style violation correction
BZ: 98166 Some code is not following the coding style. Wrap too long lines according to coding style, add doxygen annotations. Change-Id: I1c160c5f2b4bedab159baadc034042ec9956cd0e Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com> Reviewed-on: http://android.intel.com:8080/99545 Reviewed-by: Gonzalve, Sebastien <sebastien.gonzalve@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com> Reviewed-by: buildbot <buildbot@intel.com> Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/Subsystem.cpp')
-rw-r--r--parameter/Subsystem.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/parameter/Subsystem.cpp b/parameter/Subsystem.cpp
index f49ba64..feac79d 100644
--- a/parameter/Subsystem.cpp
+++ b/parameter/Subsystem.cpp
@@ -243,7 +243,8 @@ bool CSubsystem::handleSubsystemObjectCreation(
for (uiItem = 0; uiItem < _subsystemObjectCreatorArray.size(); uiItem++) {
- const CSubsystemObjectCreator* pSubsystemObjectCreator = _subsystemObjectCreatorArray[uiItem];
+ const CSubsystemObjectCreator* pSubsystemObjectCreator =
+ _subsystemObjectCreatorArray[uiItem];
// Mapping key
string strKey = pSubsystemObjectCreator->getMappingKey();
@@ -252,7 +253,8 @@ bool CSubsystem::handleSubsystemObjectCreation(
if (pInstanceConfigurableElement->getMappingData(strKey, pStrValue)) {
- // First check context consistency (required ancestors must have been set prior to object creation)
+ // First check context consistency
+ // (required ancestors must have been set prior to object creation)
uint32_t uiAncestorKey;
uint32_t uiAncestorMask = pSubsystemObjectCreator->getAncestorMask();
@@ -265,16 +267,19 @@ bool CSubsystem::handleSubsystemObjectCreation(
// Check ancestor was provided
if (!context.iSet(uiAncestorKey)) {
- getMappingError(strError, strKey, _contextMappingKeyArray[uiAncestorKey] + " not set", pInstanceConfigurableElement);
+ getMappingError(strError, strKey, _contextMappingKeyArray[uiAncestorKey] +
+ " not set", pInstanceConfigurableElement);
return false;
}
}
// Then check configurable element size is correct
- if (pInstanceConfigurableElement->getFootPrint() > pSubsystemObjectCreator->getMaxConfigurableElementSize()) {
+ if (pInstanceConfigurableElement->getFootPrint() >
+ pSubsystemObjectCreator->getMaxConfigurableElementSize()) {
- string strSizeError = "Size should not exceed " + pSubsystemObjectCreator->getMaxConfigurableElementSize();
+ string strSizeError = "Size should not exceed " +
+ pSubsystemObjectCreator->getMaxConfigurableElementSize();
getMappingError(strError, strKey, strSizeError, pInstanceConfigurableElement);
@@ -282,7 +287,8 @@ bool CSubsystem::handleSubsystemObjectCreation(
}
// Do create object and keep its track
- _subsystemObjectList.push_back(pSubsystemObjectCreator->objectCreate(*pStrValue, pInstanceConfigurableElement, context));
+ _subsystemObjectList.push_back(pSubsystemObjectCreator->objectCreate(
+ *pStrValue, pInstanceConfigurableElement, context));
// Indicate subsytem creation to caller
bHasCreatedSubsystemObject = true;
@@ -297,9 +303,13 @@ bool CSubsystem::handleSubsystemObjectCreation(
}
// Generic error handling from derived subsystem classes
-void CSubsystem::getMappingError(string& strError, const string& strKey, const string& strMessage, const CInstanceConfigurableElement* pInstanceConfigurableElement)
+void CSubsystem::getMappingError(string& strError, const string& strKey, const string& strMessage,
+ const CInstanceConfigurableElement* pInstanceConfigurableElement)
{
- strError = getName() + " " + getKind() + " mapping:\n" + strKey + " error: \"" + strMessage + "\" for element " + pInstanceConfigurableElement->getPath();
+ strError = getName() + " " + getKind() + " "
+ "mapping:\n" + strKey + " "
+ "error: \"" + strMessage + "\" "
+ "for element " + pInstanceConfigurableElement->getPath();
}
// From IMapper