Skip to content

Commit b3ac5f9

Browse files
ThalhammerThalhammer
authored
👷 Upgrade clang-format (#4)
1 parent db07abf commit b3ac5f9

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
steps:
1212
- run: |
13-
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
14-
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
13+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" | sudo tee /etc/apt/sources.list.d/llvm.list
14+
echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
1515
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
16-
sudo apt update && sudo apt-get install clang-format-17
16+
sudo apt update && sudo apt-get install clang-format-20
1717
shopt -s globstar
1818
- uses: actions/checkout@v3
19-
- run: find \( -name "*.h" -or -name "*.cpp" \) -exec clang-format-17 -i {} \;
19+
- run: find \( -name "*.h" -or -name "*.cpp" \) -exec clang-format-20 -i {} \;
2020
- run: find \( -name "*.h" -or -name "*.cpp" \) -exec ./.github/scripts/add-newline-if-missing.sh {} \;
2121
- uses: ./.github/actions/process-linting-results
2222
with:

‎src/io_engine_generic_unix.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ namespace asyncpp::io::detail {
146146
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
147147
"group and interface need to be of the same type");
148148
if (group.is_ipv4()) {
149-
struct ip_mreq mc_req {};
149+
struct ip_mreq mc_req{};
150150
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
151151
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
152152
auto res = setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mc_req, sizeof(mc_req));
153153
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
154154
} else if (group.is_ipv6()) {
155-
struct ipv6_mreq mc_req {};
155+
struct ipv6_mreq mc_req{};
156156
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
157157
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
158158
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mc_req, sizeof(mc_req));
@@ -168,13 +168,13 @@ namespace asyncpp::io::detail {
168168
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
169169
"group and interface need to be of the same type");
170170
if (group.is_ipv4()) {
171-
struct ip_mreq mc_req {};
171+
struct ip_mreq mc_req{};
172172
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
173173
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
174174
auto res = setsockopt(socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mc_req, sizeof(mc_req));
175175
if (res < 0) throw std::system_error(errno, std::system_category(), "setsockopt failed");
176176
} else if (group.is_ipv6()) {
177-
struct ipv6_mreq mc_req {};
177+
struct ipv6_mreq mc_req{};
178178
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
179179
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
180180
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mc_req, sizeof(mc_req));
@@ -283,12 +283,12 @@ namespace asyncpp::io::detail {
283283

284284
uint64_t io_engine_generic_unix::file_size(file_handle_t fd) {
285285
#ifdef __APPLE__
286-
struct stat info {};
286+
struct stat info{};
287287
auto res = fstat(fd, &info);
288288
if (res < 0) throw std::system_error(errno, std::system_category());
289289
return info.st_size;
290290
#else
291-
struct stat64 info {};
291+
struct stat64 info{};
292292
auto res = fstat64(fd, &info);
293293
if (res < 0) throw std::system_error(errno, std::system_category());
294294
return info.st_size;

‎src/io_engine_iocp.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ namespace asyncpp::io::detail {
252252
if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, (char*)&reuse, (socklen_t)sizeof(reuse)) == -1)
253253
close_and_throw("setsockopt", listener);
254254

255-
struct sockaddr_in inaddr {};
255+
struct sockaddr_in inaddr{};
256256
inaddr.sin_family = AF_INET;
257257
inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
258258
if (bind(listener, reinterpret_cast<sockaddr*>(&inaddr), sizeof(inaddr)) == SOCKET_ERROR)
@@ -357,14 +357,14 @@ namespace asyncpp::io::detail {
357357
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
358358
"group and interface need to be of the same type");
359359
if (group.is_ipv4()) {
360-
struct ip_mreq mc_req {};
360+
struct ip_mreq mc_req{};
361361
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
362362
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
363363
auto res = setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, reinterpret_cast<const char*>(&mc_req),
364364
sizeof(mc_req));
365365
if (res < 0) throw std::system_error(WSAGetLastError(), std::system_category(), "setsockopt failed");
366366
} else if (group.is_ipv6()) {
367-
struct ipv6_mreq mc_req {};
367+
struct ipv6_mreq mc_req{};
368368
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
369369
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
370370
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, reinterpret_cast<const char*>(&mc_req),
@@ -381,14 +381,14 @@ namespace asyncpp::io::detail {
381381
throw std::system_error(std::make_error_code(std::errc::invalid_argument),
382382
"group and interface need to be of the same type");
383383
if (group.is_ipv4()) {
384-
struct ip_mreq mc_req {};
384+
struct ip_mreq mc_req{};
385385
mc_req.imr_multiaddr = group.ipv4().to_sockaddr_in().first.sin_addr;
386386
mc_req.imr_interface = iface.ipv4().to_sockaddr_in().first.sin_addr;
387387
auto res = setsockopt(socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, reinterpret_cast<const char*>(&mc_req),
388388
sizeof(mc_req));
389389
if (res < 0) throw std::system_error(WSAGetLastError(), std::system_category(), "setsockopt failed");
390390
} else if (group.is_ipv6()) {
391-
struct ipv6_mreq mc_req {};
391+
struct ipv6_mreq mc_req{};
392392
mc_req.ipv6mr_multiaddr = group.ipv6().to_sockaddr_in6().first.sin6_addr;
393393
mc_req.ipv6mr_interface = iface.ipv6().to_sockaddr_in6().first.sin6_scope_id;
394394
auto res = setsockopt(socket, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, reinterpret_cast<const char*>(&mc_req),

‎src/io_engine_select.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ namespace asyncpp::io::detail {
153153
max_fd = (std::max)(e.socket, max_fd);
154154
}
155155
lck.unlock();
156-
struct timeval timeout {};
156+
struct timeval timeout{};
157157
if (!nowait) timeout.tv_sec = 10;
158158
auto res = select(max_fd + 1, &rd_set, &wrt_set, &err_set, &timeout);
159159
if (res < 0) throw std::system_error(errno, std::system_category(), "select failed");

‎src/io_engine_uring.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace asyncpp::io::detail {
8383
std::mutex m_sqe_mtx{};
8484
std::mutex m_cqe_mtx{};
8585
std::atomic<size_t> m_inflight_count{};
86-
struct io_uring m_ring {};
86+
struct io_uring m_ring{};
8787
};
8888

8989
std::unique_ptr<io_engine> create_io_engine_uring() {

0 commit comments

Comments
 (0)