From 3c9783c7f4b16c1eb702dfed1fc4f980efcb8f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 23 Oct 2023 22:23:07 +0200 Subject: [PATCH] basic/iovec-util: drop TAKE_IOVEC As suggested in https://github.com/systemd/systemd/pull/29679#discussion_r1368678932. --- src/basic/iovec-util.h | 2 -- src/partition/repart.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/basic/iovec-util.h b/src/basic/iovec-util.h index ad6e1275d5..39feabd426 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 e6725ed352..9109ea1823 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