iovec-wrapper: make iovw_size() take NULL again

This partially reverts 267b16f33c5636617927f15d7ae6b945c862a587.

We usually make xyz_size() take NULL, e.g. hashmap_size().

diff --git a/src/basic/iovec-wrapper.c b/src/basic/iovec-wrapper.c
index 59b1addaaf266898247edd56ce53fb38a16204a7..c5d1a878ff3cb4aeb8532f693654f59e6b860f52 100644 (file)
--- a/src/basic/iovec-wrapper.c
+++ b/src/basic/iovec-wrapper.c
@@ -237,7 +237,8 @@ void iovw_rebase(struct iovec_wrapper *iovw, void *old, void *new) {
 }
 
 size_t iovw_size(const struct iovec_wrapper *iovw) {
-        assert(iovw);
+        if (iovw_isempty(iovw))
+                return 0;
 
         return iovec_total_size(iovw->iovec, iovw->count);
 }

diff --git a/src/test/test-iovec-wrapper.c b/src/test/test-iovec-wrapper.c
index 791a041ab8d6fbc70d75f3e6517448c46ffe331c..d38806e75e543b3b3bece7ae6624c85097d0fd60 100644 (file)
--- a/src/test/test-iovec-wrapper.c
+++ b/src/test/test-iovec-wrapper.c
@@ -393,6 +393,8 @@ TEST(iovw_size) {
         ASSERT_OK(iovw_put(&iovw, (char*) "efghij", 6));
         ASSERT_OK(iovw_put(&iovw, (char*) "kl", 2));
         ASSERT_EQ(iovw_size(&iovw), 12U);
+
+        ASSERT_EQ(iovw_size(NULL), 0U);
 }
 
 TEST(iovw_concat) {