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: I362352dcb341658501899267c2ff3ad044ed5912
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/subprojects/dhcp-done/dhcp-done.cpp b/subprojects/dhcp-done/dhcp-done.cpp
index 7ea8761..bf429cb 100644
--- a/subprojects/dhcp-done/dhcp-done.cpp
+++ b/subprojects/dhcp-done/dhcp-done.cpp
@@ -29,8 +29,8 @@
stdplus::ManagedFd createListener()
{
using namespace stdplus::fd;
- auto sock = socket(SocketDomain::INet6, SocketType::Stream,
- SocketProto::TCP);
+ auto sock =
+ socket(SocketDomain::INet6, SocketType::Stream, SocketProto::TCP);
setFileFlags(sock, getFileFlags(sock).set(stdplus::fd::FileFlag::NonBlock));
sockaddr_in6 addr = {};
addr.sin6_family = AF_INET6;
@@ -49,25 +49,26 @@
sdeventplus::source::IO do_accept(
event, listener.get(), EPOLLIN | EPOLLET,
[&](sdeventplus::source::IO&, int, uint32_t) {
- while (auto fd = stdplus::fd::accept(listener))
- {
- std::string data;
- try
+ while (auto fd = stdplus::fd::accept(listener))
{
- data = fileRead(statusFile);
- }
- catch (const std::exception& e)
- {
- // we don't want to fail the upgrade process, set the status
- // to ONGOING
- data.push_back(2);
- data.append("Failed to read status ");
- data.append(e.what());
- }
+ std::string data;
+ try
+ {
+ data = fileRead(statusFile);
+ }
+ catch (const std::exception& e)
+ {
+ // we don't want to fail the upgrade process, set the
+ // status to ONGOING
+ data.push_back(2);
+ data.append("Failed to read status ");
+ data.append(e.what());
+ }
- stdplus::fd::sendExact(*fd, data, stdplus::fd::SendFlags(0));
- }
- });
+ stdplus::fd::sendExact(*fd, data,
+ stdplus::fd::SendFlags(0));
+ }
+ });
return event.loop();
}
catch (const std::exception& e)