netipmid: apply clang-format rules
Lots of whitespace change. Let clang-format do its job and keep the code
looking nice.
Change-Id: Idfcad1a99cab8170d55a06163de8ad3f420b68b7
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
diff --git a/main.cpp b/main.cpp
index 78a24d2..4aa0792 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,19 +1,7 @@
#include "main.hpp"
-#include <assert.h>
-#include <dlfcn.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <iostream>
-#include <tuple>
-
-#include <systemd/sd-bus.h>
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-event.h>
-
-#include <host-ipmid/ipmid-api.h>
-#include "command/guid.hpp"
#include "comm_module.hpp"
+#include "command/guid.hpp"
#include "command_table.hpp"
#include "message.hpp"
#include "message_handler.hpp"
@@ -22,6 +10,18 @@
#include "sol_module.hpp"
#include "timer.hpp"
+#include <assert.h>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <host-ipmid/ipmid-api.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
+#include <unistd.h>
+
+#include <iostream>
+#include <tuple>
+
// Tuple of Global Singletons
session::Manager manager;
command::Table table;
@@ -29,7 +29,8 @@
sol::Manager solManager;
std::tuple<session::Manager&, command::Table&, eventloop::EventLoop&,
- sol::Manager&> singletonPool(manager, table, loop, solManager);
+ sol::Manager&>
+ singletonPool(manager, table, loop, solManager);
sd_bus* bus = nullptr;
sd_event* events = nullptr;
@@ -65,7 +66,8 @@
{
// IPMI spec, Reservation ID, the value simply increases against each
// execution of the Reserve SEL command.
- if (++selReservationID == 0) {
+ if (++selReservationID == 0)
+ {
selReservationID = 1;
}
selReservationValid = true;
@@ -93,13 +95,14 @@
/*
* Required by apphandler IPMI Provider Library for logging.
*/
- ipmidbus = fopen("/dev/null", "w");
+ ipmidbus = fopen("/dev/null", "w");
// Connect to system bus
auto rc = sd_bus_open_system(&bus);
if (rc < 0)
{
- std::cerr << "Failed to connect to system bus:" << strerror(-rc) <<"\n";
+ std::cerr << "Failed to connect to system bus:" << strerror(-rc)
+ << "\n";
goto finish;
}
@@ -107,7 +110,7 @@
rc = sd_event_default(&events);
if (rc < 0)
{
- std::cerr << "Failure to create sd_event" << strerror(-rc) <<"\n";
+ std::cerr << "Failure to create sd_event" << strerror(-rc) << "\n";
goto finish;
}
@@ -115,7 +118,6 @@
command::registerGUIDChangeCallback();
cache::guid = command::getSystemGUID();
-
// Register all the IPMI provider libraries applicable for net-ipmid
provider::registerCallbackHandlers(NET_IPMID_LIB_PATH);
@@ -126,7 +128,8 @@
sol::command::registerCommands();
// Start Event Loop
- return std::get<eventloop::EventLoop&>(singletonPool).startEventLoop(events);
+ return std::get<eventloop::EventLoop&>(singletonPool)
+ .startEventLoop(events);
finish:
sd_bus_unref(bus);