From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 8 May 2023 11:06:33 +0000 (+0900)
Subject: nulstr-util: make ret_size in strv_make_nulstr() optional
X-Git-Tag: v254-rc1~539
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16cda99c737714d6d259e45808e39f94408d90bd;p=thirdparty%2Fsystemd.git

nulstr-util: make ret_size in strv_make_nulstr() optional
---

diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
index 2acc61886bd..06fa219bd19 100644
--- a/src/basic/nulstr-util.c
+++ b/src/basic/nulstr-util.c
@@ -88,7 +88,6 @@ int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
         size_t n = 0;
 
         assert(ret);
-        assert(ret_size);
 
         STRV_FOREACH(i, l) {
                 size_t z;
@@ -114,7 +113,8 @@ int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
                 m[n] = '\0';
 
         *ret = TAKE_PTR(m);
-        *ret_size = n;
+        if (ret_size)
+                *ret_size = n;
 
         return 0;
 }
@@ -125,7 +125,6 @@ int set_make_nulstr(Set *s, char **ret, size_t *ret_size) {
         _cleanup_free_ char **strv = NULL;
 
         assert(ret);
-        assert(ret_size);
 
         strv = set_get_strv(s);
         if (!strv)