From 5e4bc87a7d40a649d59240c2078ca7cc03acc737 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 6 May 2024 11:19:13 +0200 Subject: [PATCH] remove struct so that clang-format does not insists laying out the var init over three lines. --- pdns/iputils.hh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pdns/iputils.hh b/pdns/iputils.hh index b13f825eab..ba088b6e4e 100644 --- a/pdns/iputils.hh +++ b/pdns/iputils.hh @@ -85,10 +85,8 @@ union ComboAddress { - struct sockaddr_in sin4 - { - }; - struct sockaddr_in6 sin6; + sockaddr_in sin4{}; + sockaddr_in6 sin6; bool operator==(const ComboAddress& rhs) const { @@ -1886,7 +1884,7 @@ bool IsAnyAddress(const ComboAddress& addr); bool HarvestDestinationAddress(const struct msghdr* msgh, ComboAddress* destination); bool HarvestTimestamp(struct msghdr* msgh, struct timeval* timeval); void fillMSGHdr(struct msghdr* msgh, struct iovec* iov, cmsgbuf_aligned* cbuf, size_t cbufsize, char* data, size_t datalen, ComboAddress* addr); -int sendOnNBSocket(int fd, const struct msghdr *msgh); +int sendOnNBSocket(int fileDesc, const struct msghdr* msgh); size_t sendMsgWithOptions(int socketDesc, const void* buffer, size_t len, const ComboAddress* dest, const ComboAddress* local, unsigned int localItf, int flags); /* requires a non-blocking, connected TCP socket */ -- 2.47.2