From: Frantisek Sumsal <fsumsal@redhat.com>
Date: Thu, 15 Jun 2023 18:45:32 +0000 (+0200)
Subject: audit-util,varlink: use IOVEC_MAKE() in a couple more places
X-Git-Tag: v254-rc1~191^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0347b9fdaa17a58280ef4762b0a21ea058e98fae;p=thirdparty%2Fsystemd.git

audit-util,varlink: use IOVEC_MAKE() in a couple more places
---

diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index f2dce206b37..92479affa3a 100644
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -10,6 +10,7 @@
 #include "audit-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "io-util.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "process-util.h"
@@ -85,10 +86,7 @@ static int try_audit_request(int fd) {
                 .hdr.nlmsg_type = AUDIT_GET_FEATURE,
                 .hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,
         };
-        iov = (struct iovec) {
-                .iov_base = &msg,
-                .iov_len = msg.hdr.nlmsg_len,
-        };
+        iov = IOVEC_MAKE(&msg, msg.hdr.nlmsg_len);
         mh = (struct msghdr) {
                 .msg_iov = &iov,
                 .msg_iovlen = 1,
diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index 333cd3af589..343f8b4aaca 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -686,10 +686,7 @@ static int varlink_read(Varlink *v) {
         rs = MALLOC_SIZEOF_SAFE(v->input_buffer) - (v->input_buffer_index + v->input_buffer_size);
 
         if (v->allow_fd_passing_input) {
-                iov = (struct iovec) {
-                        .iov_base = p,
-                        .iov_len = rs,
-                };
+                iov = IOVEC_MAKE(p, rs);
                 mh = (struct msghdr) {
                         .msg_iov = &iov,
                         .msg_iovlen = 1,