commit ee853eb2d865c7da9eec99cdcac04f8aee750e49
author AppaRao Puli <apparao.puli@linux.intel.com> Fri May 29 00:53:20 2020 +0530
committer AppaRao Puli <apparao.puli@linux.intel.com> Fri May 29 00:56:05 2020 +0530
tree 49698bc9271cb47889bf955268d92f1d76625b2f
parent 33816cf9125737e9ec931961bad2924a6104c5bb

update to latest clang-format-10

Update the .clang-format and run the
latest clang-format-10 on existing source.

Tested:
It builds fine locally.

Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
Change-Id: I903b94b8334af2b50ec2c9b929c1e028901df20e

inc/srvcfg_manager.hpp

diff --git a/inc/srvcfg_manager.hpp b/inc/srvcfg_manager.hpp
index 8974b29..cd453b0 100644
--- a/inc/srvcfg_manager.hpp
+++ b/inc/srvcfg_manager.hpp
@@ -14,24 +14,25 @@
 // limitations under the License.

 */

 #pragma once

-#include <sdbusplus/timer.hpp>

 #include "utils.hpp"

 

+#include <sdbusplus/timer.hpp>

+

 namespace phosphor

 {

 namespace service

 {

 

-static constexpr const char *serviceConfigSrvName =

+static constexpr const char* serviceConfigSrvName =

     "xyz.openbmc_project.Control.Service.Manager";

-static constexpr const char *serviceConfigIntfName =

+static constexpr const char* serviceConfigIntfName =

     "xyz.openbmc_project.Control.Service.Attributes";

-static constexpr const char *srcCfgMgrBasePath =

+static constexpr const char* srcCfgMgrBasePath =

     "/xyz/openbmc_project/control/service";

-static constexpr const char *srvCfgPropPort = "Port";

-static constexpr const char *srvCfgPropMasked = "Masked";

-static constexpr const char *srvCfgPropEnabled = "Enabled";

-static constexpr const char *srvCfgPropRunning = "Running";

+static constexpr const char* srvCfgPropPort = "Port";

+static constexpr const char* srvCfgPropMasked = "Masked";

+static constexpr const char* srvCfgPropEnabled = "Enabled";

+static constexpr const char* srvCfgPropRunning = "Running";

 

 enum class UpdatedProp

 {

@@ -49,12 +50,12 @@
 class ServiceConfig

 {

   public:

-    ServiceConfig(sdbusplus::asio::object_server &srv_,

-                  std::shared_ptr<sdbusplus::asio::connection> &conn_,

-                  const std::string &objPath_, const std::string &baseUnitName,

-                  const std::string &instanceName,

-                  const std::string &serviceObjPath,

-                  const std::string &socketObjPath);

+    ServiceConfig(sdbusplus::asio::object_server& srv_,

+                  std::shared_ptr<sdbusplus::asio::connection>& conn_,

+                  const std::string& objPath_, const std::string& baseUnitName,

+                  const std::string& instanceName,

+                  const std::string& serviceObjPath,

+                  const std::string& socketObjPath);

     ~ServiceConfig() = default;

 

     std::shared_ptr<sdbusplus::asio::connection> conn;

@@ -65,7 +66,7 @@
     void startServiceRestartTimer();

 

   private:

-    sdbusplus::asio::object_server &server;

+    sdbusplus::asio::object_server& server;

     std::shared_ptr<sdbusplus::asio::dbus_interface> iface;

     bool internalSet = false;

     std::string objPath;

@@ -93,11 +94,11 @@
     void queryAndUpdateProperties();

     void createSocketOverrideConf();

     void updateServiceProperties(

-        const boost::container::flat_map<std::string, VariantType>

-            &propertyMap);

+        const boost::container::flat_map<std::string, VariantType>&

+            propertyMap);

     void updateSocketProperties(

-        const boost::container::flat_map<std::string, VariantType>

-            &propertyMap);

+        const boost::container::flat_map<std::string, VariantType>&

+            propertyMap);

     std::string getSocketUnitName();

     std::string getServiceUnitName();

 };