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
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();
};
diff --git a/inc/utils.hpp b/inc/utils.hpp
index 5f01d44..9a1ff02 100644
--- a/inc/utils.hpp
+++ b/inc/utils.hpp
@@ -14,50 +14,51 @@
// limitations under the License.
*/
#pragma once
-#include <ctime>
-#include <chrono>
-#include <string>
-#include <sdbusplus/asio/object_server.hpp>
-#include <phosphor-logging/elog-errors.hpp>
-#include <xyz/openbmc_project/Common/error.hpp>
-#include <experimental/filesystem>
#include <boost/asio.hpp>
+#include <phosphor-logging/elog-errors.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <xyz/openbmc_project/Common/error.hpp>
-static constexpr const char *sysdStartUnit = "StartUnit";
-static constexpr const char *sysdStopUnit = "StopUnit";
-static constexpr const char *sysdRestartUnit = "RestartUnit";
-static constexpr const char *sysdReloadMethod = "Reload";
-static constexpr const char *sysdGetJobMethod = "GetJob";
-static constexpr const char *sysdReplaceMode = "replace";
-static constexpr const char *dBusGetAllMethod = "GetAll";
-static constexpr const char *dBusGetMethod = "Get";
-static constexpr const char *sysdService = "org.freedesktop.systemd1";
-static constexpr const char *sysdObjPath = "/org/freedesktop/systemd1";
-static constexpr const char *sysdMgrIntf = "org.freedesktop.systemd1.Manager";
-static constexpr const char *sysdUnitIntf = "org.freedesktop.systemd1.Unit";
-static constexpr const char *sysdSocketIntf = "org.freedesktop.systemd1.Socket";
-static constexpr const char *dBusPropIntf = "org.freedesktop.DBus.Properties";
-static constexpr const char *stateMasked = "masked";
-static constexpr const char *stateEnabled = "enabled";
-static constexpr const char *stateDisabled = "disabled";
-static constexpr const char *subStateRunning = "running";
+#include <chrono>
+#include <ctime>
+#include <experimental/filesystem>
+#include <string>
-static inline std::string addInstanceName(const std::string &instanceName,
- const std::string &suffix)
+static constexpr const char* sysdStartUnit = "StartUnit";
+static constexpr const char* sysdStopUnit = "StopUnit";
+static constexpr const char* sysdRestartUnit = "RestartUnit";
+static constexpr const char* sysdReloadMethod = "Reload";
+static constexpr const char* sysdGetJobMethod = "GetJob";
+static constexpr const char* sysdReplaceMode = "replace";
+static constexpr const char* dBusGetAllMethod = "GetAll";
+static constexpr const char* dBusGetMethod = "Get";
+static constexpr const char* sysdService = "org.freedesktop.systemd1";
+static constexpr const char* sysdObjPath = "/org/freedesktop/systemd1";
+static constexpr const char* sysdMgrIntf = "org.freedesktop.systemd1.Manager";
+static constexpr const char* sysdUnitIntf = "org.freedesktop.systemd1.Unit";
+static constexpr const char* sysdSocketIntf = "org.freedesktop.systemd1.Socket";
+static constexpr const char* dBusPropIntf = "org.freedesktop.DBus.Properties";
+static constexpr const char* stateMasked = "masked";
+static constexpr const char* stateEnabled = "enabled";
+static constexpr const char* stateDisabled = "disabled";
+static constexpr const char* subStateRunning = "running";
+
+static inline std::string addInstanceName(const std::string& instanceName,
+ const std::string& suffix)
{
return (instanceName.empty() ? "" : suffix + instanceName);
}
void systemdDaemonReload(
- const std::shared_ptr<sdbusplus::asio::connection> &conn,
+ const std::shared_ptr<sdbusplus::asio::connection>& conn,
boost::asio::yield_context yield);
-void systemdUnitAction(const std::shared_ptr<sdbusplus::asio::connection> &conn,
+void systemdUnitAction(const std::shared_ptr<sdbusplus::asio::connection>& conn,
boost::asio::yield_context yield,
- const std::string &unitName,
- const std::string &actionMethod);
+ const std::string& unitName,
+ const std::string& actionMethod);
void systemdUnitFilesStateChange(
- const std::shared_ptr<sdbusplus::asio::connection> &conn,
- boost::asio::yield_context yield, const std::vector<std::string> &unitFiles,
- const std::string &unitState, bool maskedState, bool enabledState);
+ const std::shared_ptr<sdbusplus::asio::connection>& conn,
+ boost::asio::yield_context yield, const std::vector<std::string>& unitFiles,
+ const std::string& unitState, bool maskedState, bool enabledState);