clang-format: update latest spec and reformat
Copy the latest format file from the docs repository and apply.
Change-Id: I8cff81085e79e92dfe2a694b4aa2de00b3d4717a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/.clang-format b/.clang-format
index a75a2c2..e5530e6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -104,7 +104,7 @@
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyReturnTypeOnItsOwnLine: 150
PenaltyIndentedWhitespace: 1
PointerAlignment: Left
QualifierAlignment: Left
diff --git a/mslverify/util.hpp b/mslverify/util.hpp
index 1c1ee41..3cb7ac3 100644
--- a/mslverify/util.hpp
+++ b/mslverify/util.hpp
@@ -65,10 +65,10 @@
/** @brief Invoke a method and read the response. */
template <typename Ret, typename... Args>
-static auto
- callMethodAndRead(::sdbusplus::bus_t& bus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, Args&&... args)
+static auto callMethodAndRead(
+ ::sdbusplus::bus_t& bus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, Args&&... args)
{
::sdbusplus::message_t respMsg = callMethod<Args...>(
bus, busName, path, interface, method, std::forward<Args>(args)...);
diff --git a/src/test/propertywatchtest.hpp b/src/test/propertywatchtest.hpp
index e912b43..b25ea39 100644
--- a/src/test/propertywatchtest.hpp
+++ b/src/test/propertywatchtest.hpp
@@ -61,10 +61,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<uint64_t>,
const std::string&>
{
- static PropertiesChanged<uint64_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<uint64_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU64(busName, path, interface, method,
propertiesInterface);
@@ -77,10 +77,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<uint32_t>,
const std::string&>
{
- static PropertiesChanged<uint32_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<uint32_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU32(busName, path, interface, method,
propertiesInterface);
@@ -93,10 +93,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<uint16_t>,
const std::string&>
{
- static PropertiesChanged<uint16_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<uint16_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU16(busName, path, interface, method,
propertiesInterface);
@@ -109,10 +109,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<uint8_t>,
const std::string&>
{
- static PropertiesChanged<uint8_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<uint8_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU8(busName, path, interface, method,
propertiesInterface);
@@ -125,10 +125,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<int64_t>,
const std::string&>
{
- static PropertiesChanged<int64_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<int64_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU64(busName, path, interface, method,
propertiesInterface);
@@ -141,10 +141,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<int32_t>,
const std::string&>
{
- static PropertiesChanged<int32_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<int32_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU32(busName, path, interface, method,
propertiesInterface);
@@ -157,10 +157,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<int16_t>,
const std::string&>
{
- static PropertiesChanged<int16_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<int16_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU16(busName, path, interface, method,
propertiesInterface);
@@ -173,10 +173,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<int8_t>,
const std::string&>
{
- static PropertiesChanged<int8_t>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<int8_t> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesU8(busName, path, interface, method,
propertiesInterface);
@@ -189,10 +189,10 @@
struct CallMethodAndRead<DBusInterfaceType, PropertiesChanged<std::string>,
const std::string&>
{
- static PropertiesChanged<std::string>
- op(DBusInterfaceType& dbus, const std::string& busName,
- const std::string& path, const std::string& interface,
- const std::string& method, const std::string& propertiesInterface)
+ static PropertiesChanged<std::string> op(
+ DBusInterfaceType& dbus, const std::string& busName,
+ const std::string& path, const std::string& interface,
+ const std::string& method, const std::string& propertiesInterface)
{
return dbus.getPropertiesString(busName, path, interface, method,
propertiesInterface);