From 1cfc0d1127e9b71aace5ec5360c107af529a4e24 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 01 Apr 2024 15:26:30 +0200 Subject: [PATCH] all: for-each updates Signed-off-by: Drew DeVault --- ev/+linux/loop.ha | 6 ++---- ev/dial/dial.ha | 6 ++---- ev/dial/resolve.ha | 4 ++-- ev/dns/dns.ha | 12 +++++++----- diff --git a/ev/+linux/loop.ha b/ev/+linux/loop.ha index caefc12ed1837ac1ac61d48c18a65e3d01a0c689..0ff4e4144ac530c3a388f964b24de867c6a344cd 100644 --- a/ev/+linux/loop.ha +++ b/ev/+linux/loop.ha @@ -117,8 +117,7 @@ }; let todo = loop.dispatch; loop.dispatch = []; - for (let i = 0z; i < len(todo); i += 1) { - const dispatch = todo[i]; + for (let dispatch .. todo) { dispatch.cb(loop, dispatch.user); free(dispatch); }; @@ -146,8 +145,7 @@ abort("ev::dispatch: epoll_pwait failure"); }; }; - for (let i = 0; i < nevent; i += 1) { - const ev = &loop.events[i]; + for (let ev &.. loop.events) { const file = ev.data.ptr: *file; if (ev.events == 0) { continue; diff --git a/ev/dial/dial.ha b/ev/dial/dial.ha index c6461874566068264560143efa4e8ffcd0b83b70..10f6f88bb7cb8dc3716b5b2babaf3f4e058e8b5e 100644 --- a/ev/dial/dial.ha +++ b/ev/dial/dial.ha @@ -23,14 +23,12 @@ service: str, cb: *dialcb, user: nullable *opaque, ) (ev::req | error) = { - for (let i = 0z; i < len(default_protocols); i += 1) { - const p = default_protocols[i]; + for (const p .. default_protocols) { if (p.name == proto) { return p.dial(loop, address, service, cb, user); }; }; - for (let i = 0z; i < len(protocols); i += 1) { - const p = protocols[i]; + for (const p .. protocols) { if (p.name == proto) { return p.dial(loop, address, service, cb, user); }; diff --git a/ev/dial/resolve.ha b/ev/dial/resolve.ha index b6470317906c88c91b631c35d91e2241b23155d6..bd61dfb839d46fe47610514be6605efac6fa4ad6 100644 --- a/ev/dial/resolve.ha +++ b/ev/dial/resolve.ha @@ -212,8 +212,8 @@ resolve_finish(state, (state.ip, state.port)); }; fn collect_answers(addrs: *[]ip::addr, answers: *[]dns::rrecord) void = { - for (let i = 0z; i < len(answers); i += 1) { - match (answers[i].rdata) { + for (let answer &.. answers) { + match (answer.rdata) { case let addr: dns::aaaa => append(addrs, addr: ip::addr); case let addr: dns::a => diff --git a/ev/dns/dns.ha b/ev/dns/dns.ha index 8d189e12bb89bacc0253d14afd008678f290ebf6..b8402d5ef4b9a903f7f6ed89c0c02a0a39039680 100644 --- a/ev/dns/dns.ha +++ b/ev/dns/dns.ha @@ -68,11 +68,13 @@ // Note: the initial set of requests is sent directly through net::udp // as it is assumed they can fit into the kernel's internal send buffer // and will finish without blocking const buf = state.buf[..z]; - for (let i = 0z; i < len(servers); i += 1) match (servers[i]) { - case ip::addr4 => - udp::sendto(ev::getfd(socket4), buf, servers[i], 53)?; - case ip::addr6 => - udp::sendto(ev::getfd(socket6), buf, servers[i], 53)?; + for (const server .. servers) { + match (server) { + case ip::addr4 => + udp::sendto(ev::getfd(socket4), buf, server, 53)?; + case ip::addr6 => + udp::sendto(ev::getfd(socket6), buf, server, 53)?; + }; }; state.r4 = ev::recvfrom(socket4, &qrecvcb, state.buf); -- 2.48.1