nulstr-util: make ret_size in strv_make_nulstr() optional

(cherry picked from commit 16cda99c737714d6d259e45808e39f94408d90bd) Related: #2190228
redhat-plumbers · Jul 18, 2023 · 0813100 · 0813100
1 parent e7c06a1
commit 0813100
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/basic/strv.c b/src/basic/strv.c
@@ -669,7 +669,6 @@ int strv_make_nulstr(char **l, char **p, size_t *q) {
         char **i;
 
         assert(p);
-        assert(q);
 
         STRV_FOREACH(i, l) {
                 size_t z;
@@ -694,7 +693,8 @@ int strv_make_nulstr(char **l, char **p, size_t *q) {
 
         assert(n > 0);
         *p = m;
-        *q = n - 1;
+        if (q)
+                *q = n - 1;
 
         m = NULL;