clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ib7af6345a7b9e858700bd81645fe87d9d7e9d0fb
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp
index b31c1b7..7a57f5a 100644
--- a/src/TachSensor.cpp
+++ b/src/TachSensor.cpp
@@ -44,17 +44,17 @@
static constexpr unsigned int pwmPollMs = 500;
-TachSensor::TachSensor(const std::string& path, const std::string& objectType,
- sdbusplus::asio::object_server& objectServer,
- std::shared_ptr<sdbusplus::asio::connection>& conn,
- std::shared_ptr<PresenceSensor>& presenceSensor,
- std::optional<RedundancySensor>* redundancy,
- boost::asio::io_context& io, const std::string& fanName,
- std::vector<thresholds::Threshold>&& thresholdsIn,
- const std::string& sensorConfiguration,
- const std::pair<double, double>& limits,
- const PowerState& powerState,
- const std::optional<std::string>& ledIn) :
+TachSensor::TachSensor(
+ const std::string& path, const std::string& objectType,
+ sdbusplus::asio::object_server& objectServer,
+ std::shared_ptr<sdbusplus::asio::connection>& conn,
+ std::shared_ptr<PresenceSensor>& presenceSensor,
+ std::optional<RedundancySensor>* redundancy, boost::asio::io_context& io,
+ const std::string& fanName,
+ std::vector<thresholds::Threshold>&& thresholdsIn,
+ const std::string& sensorConfiguration,
+ const std::pair<double, double>& limits, const PowerState& powerState,
+ const std::optional<std::string>& ledIn) :
Sensor(escapeName(fanName), std::move(thresholdsIn), sensorConfiguration,
objectType, false, false, limits.second, limits.first, conn,
powerState),
@@ -119,12 +119,12 @@
inputDev.async_read_some_at(
0, boost::asio::buffer(readBuf),
[weakRef](const boost::system::error_code& ec, std::size_t bytesRead) {
- std::shared_ptr<TachSensor> self = weakRef.lock();
- if (self)
- {
- self->handleResponse(ec, bytesRead);
- }
- });
+ std::shared_ptr<TachSensor> self = weakRef.lock();
+ if (self)
+ {
+ self->handleResponse(ec, bytesRead);
+ }
+ });
}
void TachSensor::restartRead(size_t pollTime)
@@ -173,8 +173,8 @@
{
const char* bufEnd = readBuf.data() + bytesRead;
int nvalue = 0;
- std::from_chars_result ret = std::from_chars(readBuf.data(), bufEnd,
- nvalue);
+ std::from_chars_result ret =
+ std::from_chars(readBuf.data(), bufEnd, nvalue);
if (ret.ec != std::errc())
{
incrementError();
@@ -216,8 +216,7 @@
PresenceSensor::PresenceSensor(const std::string& gpioName, bool inverted,
boost::asio::io_context& io,
const std::string& name) :
- gpioLine(gpiod::find_line(gpioName)),
- gpioFd(io), name(name)
+ gpioLine(gpiod::find_line(gpioName)), gpioFd(io), name(name)
{
if (!gpioLine)
{
@@ -261,21 +260,22 @@
{
gpioFd.async_wait(boost::asio::posix::stream_descriptor::wait_read,
[this](const boost::system::error_code& ec) {
- if (ec == boost::system::errc::bad_file_descriptor)
- {
- return; // we're being destroyed
- }
- if (ec)
- {
- std::cerr << "Error on presence sensor " << name << " \n";
- ;
- }
- else
- {
- read();
- }
- monitorPresence();
- });
+ if (ec == boost::system::errc::bad_file_descriptor)
+ {
+ return; // we're being destroyed
+ }
+ if (ec)
+ {
+ std::cerr << "Error on presence sensor " << name
+ << " \n";
+ ;
+ }
+ else
+ {
+ read();
+ }
+ monitorPresence();
+ });
}
void PresenceSensor::read()