]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
basic/iovec-util: drop TAKE_IOVEC
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 23 Oct 2023 20:23:07 +0000 (22:23 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 23 Oct 2023 20:23:13 +0000 (22:23 +0200)
As suggested in
https://github.com/systemd/systemd/pull/29679#discussion_r1368678932.

src/basic/iovec-util.h
src/partition/repart.c

index ad6e1275d5113d187a383e24baf299b33d4a8932..39feabd42601214956d90d6657bf7e6142aa3cfe 100644 (file)
@@ -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);
index e6725ed352f3e8e40b5a9be4ac7a0f5bdaaf74de..9109ea18237d18b26da514ac98fd7834ac147b62 100644 (file)
@@ -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