clang-format: Update to match docs repo
Update the .clang-format file and run clang-format-6.0.
This .clang-format matches the example one in
https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#clang-formatting
Change-Id: Ia331c9a5b040e1a3c45a0ebf1b8d776d93b05ae5
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/rtnetlink_server.cpp b/rtnetlink_server.cpp
index eb63f74..3121e4d 100644
--- a/rtnetlink_server.cpp
+++ b/rtnetlink_server.cpp
@@ -31,16 +31,16 @@
static int eventHandler(sd_event_source* es, int fd, uint32_t revents,
void* userdata)
{
- char buffer[phosphor::network::rtnetlink::BUFSIZE] {};
- int len {};
+ char buffer[phosphor::network::rtnetlink::BUFSIZE]{};
+ int len{};
auto netLinkHeader = reinterpret_cast<struct nlmsghdr*>(buffer);
- while ((len = recv(fd, netLinkHeader,
- phosphor::network::rtnetlink::BUFSIZE, 0)) > 0)
+ while ((len = recv(fd, netLinkHeader, phosphor::network::rtnetlink::BUFSIZE,
+ 0)) > 0)
{
for (; (NLMSG_OK(netLinkHeader, len)) &&
(netLinkHeader->nlmsg_type != NLMSG_DONE);
- netLinkHeader = NLMSG_NEXT(netLinkHeader, len))
+ netLinkHeader = NLMSG_NEXT(netLinkHeader, len))
{
if (netLinkHeader->nlmsg_type == RTM_NEWADDR ||
netLinkHeader->nlmsg_type == RTM_DELADDR)
@@ -55,7 +55,7 @@
// crash
refreshObjectTimer->startTimer(time);
} // end if
- } // end if
+ } // end if
} // end for
@@ -67,14 +67,16 @@
Server::Server(EventPtr& eventPtr, const phosphor::Descriptor& smartSock)
{
using namespace phosphor::logging;
- using InternalFailure = sdbusplus::xyz::openbmc_project::Common::
- Error::InternalFailure;
- struct sockaddr_nl addr {};
- int r {};
+ using InternalFailure =
+ sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+ struct sockaddr_nl addr
+ {
+ };
+ int r{};
- sigset_t ss {};
+ sigset_t ss{};
// check that the given socket is valid or not.
- if(smartSock() < 0)
+ if (smartSock() < 0)
{
r = -EBADF;
goto finish;
@@ -118,8 +120,8 @@
goto finish;
}
- r = sd_event_add_io(eventPtr.get(), nullptr,
- smartSock(), EPOLLIN, eventHandler, nullptr);
+ r = sd_event_add_io(eventPtr.get(), nullptr, smartSock(), EPOLLIN,
+ eventHandler, nullptr);
if (r < 0)
{
goto finish;
@@ -135,7 +137,6 @@
}
}
-
-} //rtnetlink
-} //network
-} //phosphor
+} // namespace rtnetlink
+} // namespace network
+} // namespace phosphor