Formatting skeleton-subsystem code with clang-format

Signed-off-by: Thomas Cahuzac <[email protected]>

Author: tcahuzax

skeleton-subsystem/SkeletonMappingKeys.h

@@ -30,7 +30,8 @@
 #pragma once
 
 // Mapping item types
-enum SkeletonItemType {
+enum SkeletonItemType
+{
     ESkeletonOwner,
     EAmend1,
     EAmend2,

skeleton-subsystem/SkeletonSubsystem.cpp

@@ -35,7 +35,7 @@
 #define base CSubsystem
 
 // Implementation
-CSkeletonSubsystem::CSkeletonSubsystem(const std::string& strName, core::log::Logger& logger)
+CSkeletonSubsystem::CSkeletonSubsystem(const std::string &strName, core::log::Logger &logger)
     : base(strName, logger)
 {
     // Provide mapping keys to upper layer
@@ -44,5 +44,6 @@ CSkeletonSubsystem::CSkeletonSubsystem(const std::string& strName, core::log::Lo
     addContextMappingKey("Amend2");
 
     // Provide creators to upper layer
-    addSubsystemObjectFactory(new TSubsystemObjectFactory<CSkeletonSubsystemObject>("Message", 1 << ESkeletonOwner));
+    addSubsystemObjectFactory(
+        new TSubsystemObjectFactory<CSkeletonSubsystemObject>("Message", 1 << ESkeletonOwner));
 }

skeleton-subsystem/SkeletonSubsystem.h

@@ -34,7 +34,5 @@
 class CSkeletonSubsystem : public CSubsystem
 {
 public:
-    CSkeletonSubsystem(const std::string& strName, core::log::Logger& logger);
-
+    CSkeletonSubsystem(const std::string &strName, core::log::Logger &logger);
 };
-

skeleton-subsystem/SkeletonSubsystemBuilder.cpp

@@ -31,10 +31,9 @@
 #include "LoggingElementBuilderTemplate.h"
 #include "SkeletonSubsystem.h"
 
-
-void PARAMETER_FRAMEWORK_PLUGIN_ENTRYPOINT_V1(CSubsystemLibrary* pSubsystemLibrary, core::log::Logger& logger)
+void PARAMETER_FRAMEWORK_PLUGIN_ENTRYPOINT_V1(CSubsystemLibrary *pSubsystemLibrary,
+                                              core::log::Logger &logger)
 {
     pSubsystemLibrary->addElementBuilder(
-            "Skeleton",
-            new TLoggingElementBuilderTemplate<CSkeletonSubsystem>(logger));
+        "Skeleton", new TLoggingElementBuilderTemplate<CSkeletonSubsystem>(logger));
 }

skeleton-subsystem/SkeletonSubsystemObject.cpp

@@ -46,43 +46,36 @@
 using std::string;
 
 CSkeletonSubsystemObject::CSkeletonSubsystemObject(
-            const string& strMappingValue,
-            CInstanceConfigurableElement* pInstanceConfigurableElement,
-            const CMappingContext& context,
-            core::log::Logger& logger
-        ) :
-        base(pInstanceConfigurableElement,
-             logger,
-             strMappingValue,
-             EAmend1,
-             EAmendEnd - EAmend1 + 1,
-             context),
-        _bWrongElementTypeError(false)
+    const string &strMappingValue, CInstanceConfigurableElement *pInstanceConfigurableElement,
+    const CMappingContext &context, core::log::Logger &logger)
+    : base(pInstanceConfigurableElement, logger, strMappingValue, EAmend1, EAmendEnd - EAmend1 + 1,
+           context),
+      _bWrongElementTypeError(false)
 {
     // Get actual element type
-    const CParameterType* pParameterType = static_cast<const CParameterType*>(pInstanceConfigurableElement->getTypeElement());
+    const CParameterType *pParameterType =
+        static_cast<const CParameterType *>(pInstanceConfigurableElement->getTypeElement());
 
     // Retrieve sizes
     _scalarSize = pParameterType->getSize();
     _arraySize = pInstanceConfigurableElement->getFootPrint() / _scalarSize;
 
     // Construct message
-    _strMessage = context.getItem(ESkeletonOwner) + ":" + strMappingValue ;
+    _strMessage = context.getItem(ESkeletonOwner) + ":" + strMappingValue;
 
     // Handle types
     // Check we are able to handle elements (no exception support, defer the error)
-    switch(pInstanceConfigurableElement->getType()) {
+    switch (pInstanceConfigurableElement->getType()) {
 
-        case CInstanceConfigurableElement::EParameter:
-            break;
-        default:
-            _bWrongElementTypeError = true;
-            break;
+    case CInstanceConfigurableElement::EParameter:
+        break;
+    default:
+        _bWrongElementTypeError = true;
+        break;
     }
-
 }
 // Sync to/from HW
-bool CSkeletonSubsystemObject::accessHW(bool bReceive, string& strError)
+bool CSkeletonSubsystemObject::accessHW(bool bReceive, string &strError)
 {
     // Check parameter type is ok (deferred error, no exceptions available :-()
     if (_bWrongElementTypeError) {
@@ -95,11 +88,11 @@ bool CSkeletonSubsystemObject::accessHW(bool bReceive, string& strError)
     return base::accessHW(bReceive, strError);
 }
 
-bool CSkeletonSubsystemObject::sendToHW(string& /*strError*/)
+bool CSkeletonSubsystemObject::sendToHW(string & /*strError*/)
 {
-    void* pvValue = alloca(_scalarSize);
+    void *pvValue = alloca(_scalarSize);
 
-    for (size_t index = 0 ; index < _arraySize ; index++) {
+    for (size_t index = 0; index < _arraySize; index++) {
 
         // Read Value in BlackBoard
         blackboardRead(pvValue, _scalarSize);
@@ -111,11 +104,11 @@ bool CSkeletonSubsystemObject::sendToHW(string& /*strError*/)
     return true;
 }
 
-bool CSkeletonSubsystemObject::receiveFromHW(string& /*strError*/)
+bool CSkeletonSubsystemObject::receiveFromHW(string & /*strError*/)
 {
-    void* pvValue = alloca(_scalarSize);
+    void *pvValue = alloca(_scalarSize);
 
-    for (size_t index = 0 ; index < _arraySize ; index++) {
+    for (size_t index = 0; index < _arraySize; index++) {
 
         // Retreive here the value
         std::cout << "Retreive from HW: " << _strMessage << std::endl;

skeleton-subsystem/SkeletonSubsystemObject.h

@@ -36,20 +36,19 @@ class CMappingContext;
 class CSkeletonSubsystemObject : public CFormattedSubsystemObject
 {
 public:
-    CSkeletonSubsystemObject(const std::string& strMappingValue,
-                             CInstanceConfigurableElement* pInstanceConfigurableElement,
-                             const CMappingContext& context,
-                             core::log::Logger& logger);
+    CSkeletonSubsystemObject(const std::string &strMappingValue,
+                             CInstanceConfigurableElement *pInstanceConfigurableElement,
+                             const CMappingContext &context, core::log::Logger &logger);
 
 protected:
     // from CSubsystemObject
     // Sync to/from HW
-    virtual bool sendToHW(std::string& strError);
-    virtual bool receiveFromHW(std::string& strError);
+    virtual bool sendToHW(std::string &strError);
+    virtual bool receiveFromHW(std::string &strError);
 
 private:
     // Sync to/from HW
-    virtual bool accessHW(bool bReceive, std::string& strError);
+    virtual bool accessHW(bool bReceive, std::string &strError);
 
 protected:
     // Scalar parameter size for elementary access

skeleton-subsystem/test/main.cpp

@@ -34,16 +34,13 @@
 class MyLogger final : public CParameterMgrFullConnector::ILogger
 {
 public:
-    void info(const std::string& log) override {
-        std::cout << "Info: " << log << std::endl;
-    }
+    void info(const std::string &log) override { std::cout << "Info: " << log << std::endl; }
 
-    void warning(const std::string& log) override {
-        std::cerr << "Warning: " << log << std::endl;
-    }
+    void warning(const std::string &log) override { std::cerr << "Warning: " << log << std::endl; }
 };
 
-int main(void) {
+int main(void)
+{
     MyLogger logger;
     CParameterMgrFullConnector instance("toplevel.xml");
     instance.setLogger(&logger);