clang-format: copy latest and re-format
clang-format-16 has some backwards incompatible changes that require
additional settings for best compatibility and re-running the formatter.
Copy the latest .clang-format from the docs repository and reformat the
repository.
Change-Id: I172b14c1a881c734851b7dc6e0e90ee2e11cce03
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/cpuinfo_utils.cpp b/src/cpuinfo_utils.cpp
index 51136bb..c291718 100644
--- a/src/cpuinfo_utils.cpp
+++ b/src/cpuinfo_utils.cpp
@@ -174,13 +174,13 @@
*dbusConn, service, object, interface, propertyName,
[handler, propertyName = std::string(propertyName)](
boost::system::error_code ec, const PropertyType& newValue) {
- if (ec)
- {
- std::cerr << "Failed to read property " << propertyName << ": "
- << ec << "\n";
- return;
- }
- handler(newValue);
+ if (ec)
+ {
+ std::cerr << "Failed to read property " << propertyName << ": "
+ << ec << "\n";
+ return;
+ }
+ handler(newValue);
});
using ChangedPropertiesType =
@@ -218,12 +218,12 @@
sdbusplus::bus::match::rules::sender(service) +
sdbusplus::bus::match::rules::propertiesChanged(object, interface),
[commonPropHandler](sdbusplus::message_t& reply) {
- ChangedPropertiesType changedProps;
- // ignore first param (interface name), it has to be correct
- reply.read(std::string(), changedProps);
+ ChangedPropertiesType changedProps;
+ // ignore first param (interface name), it has to be correct
+ reply.read(std::string(), changedProps);
- DEBUG_PRINT << "PropertiesChanged handled\n";
- commonPropHandler(changedProps);
+ DEBUG_PRINT << "PropertiesChanged handled\n";
+ commonPropHandler(changedProps);
});
// Set up a match for the InterfacesAdded signal from the service's
@@ -236,28 +236,27 @@
sdbusplus::bus::match::rules::interfacesAdded(),
[object = std::string(object), interface = std::string(interface),
commonPropHandler](sdbusplus::message_t& reply) {
- sdbusplus::message::object_path changedObject;
- reply.read(changedObject);
- if (changedObject != object)
+ sdbusplus::message::object_path changedObject;
+ reply.read(changedObject);
+ if (changedObject != object)
+ {
+ return;
+ }
+
+ std::vector<std::pair<std::string, ChangedPropertiesType>>
+ changedInterfaces;
+ reply.read(changedInterfaces);
+
+ for (const auto& [changedInterface, changedProps] : changedInterfaces)
+ {
+ if (changedInterface != interface)
{
- return;
+ continue;
}
- std::vector<std::pair<std::string, ChangedPropertiesType>>
- changedInterfaces;
- reply.read(changedInterfaces);
-
- for (const auto& [changedInterface, changedProps] :
- changedInterfaces)
- {
- if (changedInterface != interface)
- {
- continue;
- }
-
- DEBUG_PRINT << "InterfacesAdded handled\n";
- commonPropHandler(changedProps);
- }
+ DEBUG_PRINT << "InterfacesAdded handled\n";
+ commonPropHandler(changedProps);
+ }
});
if (propertiesChangedMatch != nullptr)