From cf1e6e626056817a31b022a2490e84f15cb5dfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 4 May 2021 14:49:47 +0200 Subject: [PATCH] resolved: directly initialize iovec array --- src/resolve/resolved-dns-stream.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 10641f6ac5..3e6505cd75 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -315,15 +315,14 @@ static int on_stream_io(sd_event_source *es, int fd, uint32_t revents, void *use s->write_packet && s->n_written < sizeof(s->write_size) + s->write_packet->size) { - struct iovec iov[2]; - ssize_t ss; + struct iovec iov[] = { + IOVEC_MAKE(&s->write_size, sizeof(s->write_size)), + IOVEC_MAKE(DNS_PACKET_DATA(s->write_packet), s->write_packet->size), + }; - iov[0] = IOVEC_MAKE(&s->write_size, sizeof(s->write_size)); - iov[1] = IOVEC_MAKE(DNS_PACKET_DATA(s->write_packet), s->write_packet->size); + IOVEC_INCREMENT(iov, ELEMENTSOF(iov), s->n_written); - IOVEC_INCREMENT(iov, 2, s->n_written); - - ss = dns_stream_writev(s, iov, 2, 0); + ssize_t ss = dns_stream_writev(s, iov, ELEMENTSOF(iov), 0); if (ss < 0) { if (!IN_SET(-ss, EINTR, EAGAIN)) return dns_stream_complete(s, -ss);