Update clang format
Update to clang-format-10
Change-Id: I7fcab706fb384e5fcc07a06c42897a5ddbc4b511
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
index d22afd8..bfe17ac 100644
--- a/src/ADCSensor.cpp
+++ b/src/ADCSensor.cpp
@@ -21,6 +21,9 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
#include <cmath>
#include <filesystem>
#include <fstream>
@@ -28,8 +31,6 @@
#include <limits>
#include <memory>
#include <optional>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
#include <string>
#include <vector>
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index df35722..cc8e7cd 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -22,15 +22,16 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
#include <filesystem>
#include <fstream>
#include <functional>
#include <memory>
#include <optional>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <string>
#include <variant>
#include <vector>
diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp
index 241b14f..ea869c9 100644
--- a/src/CPUSensor.cpp
+++ b/src/CPUSensor.cpp
@@ -23,12 +23,13 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
#include <iostream>
#include <istream>
#include <limits>
#include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
#include <stdexcept>
#include <string>
#include <vector>
diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 15a5a37..6b04fd1 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -20,21 +20,22 @@
#include <fcntl.h>
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/process/child.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
#include <filesystem>
#include <fstream>
#include <functional>
#include <memory>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <sstream>
#include <stdexcept>
#include <string>
@@ -70,8 +71,7 @@
const std::string& name, const State& state) :
bus(bus),
addr(addr), name(name), state(state)
- {
- }
+ {}
int bus;
int addr;
std::string name;
diff --git a/src/ChassisIntrusionSensor.cpp b/src/ChassisIntrusionSensor.cpp
index 15ed888..8293bab 100644
--- a/src/ChassisIntrusionSensor.cpp
+++ b/src/ChassisIntrusionSensor.cpp
@@ -23,14 +23,16 @@
#include <boost/asio.hpp>
#include <boost/bind.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
#include <chrono>
#include <iostream>
#include <memory>
-#include <sdbusplus/asio/object_server.hpp>
#include <string>
#include <thread>
-extern "C" {
+extern "C"
+{
#include <i2c/smbus.h>
#include <linux/i2c-dev.h>
}
@@ -363,8 +365,7 @@
mType(IntrusionSensorType::gpio), mValue("unknown"), mOldValue("unknown"),
mBusId(-1), mSlaveAddr(-1), mPollTimer(io), mGpioInverted(false),
mGpioFd(io)
-{
-}
+{}
ChassisIntrusionSensor::~ChassisIntrusionSensor()
{
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index 9ba311b..70c7bae 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -21,10 +21,14 @@
#include <math.h>
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
#include <chrono>
#include <cmath>
#include <functional>
@@ -32,9 +36,6 @@
#include <limits>
#include <memory>
#include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <stdexcept>
#include <utility>
#include <variant>
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index 37a4e63..9f78fc7 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -19,21 +19,22 @@
#include "Utils.hpp"
#include "VariantVisitors.hpp"
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
#include <boost/lexical_cast.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
#include <filesystem>
#include <fstream>
#include <functional>
#include <memory>
#include <optional>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <string>
#include <utility>
#include <variant>
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index ab3544d..94f23c0 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -17,19 +17,20 @@
#include "HwmonTempSensor.hpp"
#include "Utils.hpp"
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
#include <filesystem>
#include <fstream>
#include <functional>
#include <memory>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <stdexcept>
#include <string>
#include <utility>
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index 9f9448a..71ff4ed 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -21,12 +21,13 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
#include <iostream>
#include <istream>
#include <limits>
#include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
#include <string>
#include <vector>
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index f6cf9aa..f3d95fb 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -19,16 +19,9 @@
#include <systemd/sd-journal.h>
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/asio.hpp>
#include <boost/container/flat_map.hpp>
-#include <chrono>
-#include <ctime>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <memory>
#include <sdbusplus/asio/connection.hpp>
#include <sdbusplus/asio/object_server.hpp>
#include <sdbusplus/asio/sd_event.hpp>
@@ -37,6 +30,14 @@
#include <sdbusplus/exception.hpp>
#include <sdbusplus/server.hpp>
#include <sdbusplus/timer.hpp>
+
+#include <array>
+#include <chrono>
+#include <ctime>
+#include <fstream>
+#include <functional>
+#include <iostream>
+#include <memory>
#include <stdexcept>
#include <string>
#include <utility>
diff --git a/src/IpmbSensor.cpp b/src/IpmbSensor.cpp
index 9f591ac..87ad632 100644
--- a/src/IpmbSensor.cpp
+++ b/src/IpmbSensor.cpp
@@ -25,15 +25,16 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
#include <chrono>
#include <functional>
#include <iostream>
#include <limits>
#include <memory>
#include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <string>
#include <tuple>
#include <variant>
diff --git a/src/MCUTempSensor.cpp b/src/MCUTempSensor.cpp
index 06376b6..a413214 100644
--- a/src/MCUTempSensor.cpp
+++ b/src/MCUTempSensor.cpp
@@ -24,19 +24,21 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
#include <chrono>
#include <functional>
#include <iostream>
#include <limits>
#include <memory>
#include <numeric>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <string>
#include <vector>
-extern "C" {
+extern "C"
+{
#include <i2c/smbus.h>
#include <linux/i2c-dev.h>
}
diff --git a/src/NVMeSensor.cpp b/src/NVMeSensor.cpp
index e993833..8cdf744 100644
--- a/src/NVMeSensor.cpp
+++ b/src/NVMeSensor.cpp
@@ -23,6 +23,7 @@
#include <boost/algorithm/string/replace.hpp>
#include <boost/asio/ip/tcp.hpp>
+
#include <iostream>
static constexpr double maxReading = 127;
@@ -288,8 +289,7 @@
void rxMessage(uint8_t eid, void*, void* msg, size_t len)
{
struct nvme_mi_msg_response_header header
- {
- };
+ {};
int inFd = mctp_smbus_get_in_fd(nvmeMCTP::smbus);
int rootBus = nvmeMCTP::getRootBus(inFd);
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index 1858ea9..8a1f4bc 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -17,6 +17,7 @@
#include "NVMeSensor.hpp"
#include <boost/asio/deadline_timer.hpp>
+
#include <regex>
static constexpr const char* sensorType =
diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index c8107bd..94125fa 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -19,10 +19,11 @@
#include <systemd/sd-journal.h>
#include <boost/container/flat_map.hpp>
-#include <iostream>
-#include <memory>
#include <sdbusplus/asio/connection.hpp>
#include <sdbusplus/asio/object_server.hpp>
+
+#include <iostream>
+#include <memory>
#include <stdexcept>
#include <string>
#include <utility>
diff --git a/src/PSUSensor.cpp b/src/PSUSensor.cpp
index 28eec4f..4d6bc1d 100644
--- a/src/PSUSensor.cpp
+++ b/src/PSUSensor.cpp
@@ -21,12 +21,13 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
#include <iostream>
#include <istream>
#include <limits>
#include <memory>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
#include <string>
#include <vector>
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 1b363e1..a011e49 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -18,20 +18,21 @@
#include "PSUSensor.hpp"
#include "Utils.hpp"
-#include <array>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
+#include <array>
#include <cmath>
#include <filesystem>
#include <fstream>
#include <functional>
#include <iostream>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <string>
#include <utility>
#include <variant>
diff --git a/src/PwmSensor.cpp b/src/PwmSensor.cpp
index eee29ef..3e5c8a1 100644
--- a/src/PwmSensor.cpp
+++ b/src/PwmSensor.cpp
@@ -17,9 +17,10 @@
#include "Utils.hpp"
+#include <sdbusplus/asio/object_server.hpp>
+
#include <fstream>
#include <iostream>
-#include <sdbusplus/asio/object_server.hpp>
#include <stdexcept>
#include <string>
diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp
index bea79d8..c45fcb0 100644
--- a/src/TachSensor.cpp
+++ b/src/TachSensor.cpp
@@ -23,15 +23,16 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
-#include <fstream>
#include <gpiod.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+
+#include <fstream>
#include <iostream>
#include <istream>
#include <limits>
#include <memory>
#include <optional>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
#include <stdexcept>
#include <string>
#include <utility>
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index dd6b7ca..9e0066f 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -3,10 +3,11 @@
#include "VariantVisitors.hpp"
#include "sensor.hpp"
-#include <array>
#include <boost/algorithm/string/replace.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/lexical_cast.hpp>
+
+#include <array>
#include <cmath>
#include <fstream>
#include <iostream>
diff --git a/src/Utils.cpp b/src/Utils.cpp
index ca5a294..6b9ddf9 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -18,13 +18,14 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+
#include <filesystem>
#include <fstream>
#include <memory>
#include <regex>
-#include <sdbusplus/asio/connection.hpp>
-#include <sdbusplus/asio/object_server.hpp>
-#include <sdbusplus/bus/match.hpp>
#include <stdexcept>
#include <string>
#include <utility>