From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 23 Oct 2023 20:23:07 +0000 (+0200)
Subject: basic/iovec-util: drop TAKE_IOVEC
X-Git-Tag: v255-rc1~159^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c9783c7f4b16c1eb702dfed1fc4f980efcb8f56;p=thirdparty%2Fsystemd.git

basic/iovec-util: drop TAKE_IOVEC

As suggested in
https://github.com/systemd/systemd/pull/29679#discussion_r1368678932.
---

diff --git a/src/basic/iovec-util.h b/src/basic/iovec-util.h
index ad6e1275d51..39feabd4260 100644
--- a/src/basic/iovec-util.h
+++ b/src/basic/iovec-util.h
@@ -19,8 +19,6 @@ bool iovec_increment(struct iovec *iovec, size_t n, size_t k);
                 IOVEC_MAKE((char*) _s, strlen(_s));     \
         })
 
-#define TAKE_IOVEC(p) TAKE_GENERIC((p), struct iovec, {})
-
 static inline void iovec_done(struct iovec *iovec) {
         /* A _cleanup_() helper that frees the iov_base in the iovec */
         assert(iovec);
diff --git a/src/partition/repart.c b/src/partition/repart.c
index e6725ed352f..9109ea18237 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -4087,7 +4087,7 @@ static int partition_format_verity_hash(
                 p->new_uuid_is_set = true;
         }
 
-        p->roothash = TAKE_IOVEC(rh);
+        p->roothash = TAKE_STRUCT(rh);
 
         return 0;
 #else