From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 23 Apr 2026 18:10:16 +0000 (+0900)
Subject: iovec-wrapper: reintroduce iovw_free() and iovw_free_free()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fc58bf62111ae164bbbbf2f276af24f1c4b0efd;p=thirdparty%2Fsystemd.git

iovec-wrapper: reintroduce iovw_free() and iovw_free_free()

They were dropped by the commit 267b16f33c5636617927f15d7ae6b945c862a587,
but will be used later. Hence, let's reintroduce them.
---

diff --git a/src/basic/iovec-wrapper.c b/src/basic/iovec-wrapper.c
index 6b4b006c059..da217170c57 100644
--- a/src/basic/iovec-wrapper.c
+++ b/src/basic/iovec-wrapper.c
@@ -24,6 +24,22 @@ void iovw_done_free(struct iovec_wrapper *iovw) {
         iovw_done(iovw);
 }
 
+struct iovec_wrapper* iovw_free(struct iovec_wrapper *iovw) {
+        if (!iovw)
+                return NULL;
+
+        iovw_done(iovw);
+        return mfree(iovw);
+}
+
+struct iovec_wrapper* iovw_free_free(struct iovec_wrapper *iovw) {
+        if (!iovw)
+                return NULL;
+
+        iovw_done_free(iovw);
+        return mfree(iovw);
+}
+
 int iovw_compare(const struct iovec_wrapper *a, const struct iovec_wrapper *b) {
         int r;
 
diff --git a/src/basic/iovec-wrapper.h b/src/basic/iovec-wrapper.h
index c2a0cff1aee..a4f93f1fdb9 100644
--- a/src/basic/iovec-wrapper.h
+++ b/src/basic/iovec-wrapper.h
@@ -11,6 +11,12 @@ struct iovec_wrapper {
 void iovw_done_free(struct iovec_wrapper *iovw);
 void iovw_done(struct iovec_wrapper *iovw);
 
+struct iovec_wrapper* iovw_free(struct iovec_wrapper *iovw);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct iovec_wrapper*, iovw_free);
+
+struct iovec_wrapper* iovw_free_free(struct iovec_wrapper *iovw);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct iovec_wrapper*, iovw_free_free);
+
 int iovw_compare(const struct iovec_wrapper *a, const struct iovec_wrapper *b) _pure_;
 static inline bool iovw_equal(const struct iovec_wrapper *a, const struct iovec_wrapper *b) {
         return iovw_compare(a, b) == 0;