diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-08 20:06:33 +0900 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-05-08 21:40:56 +0800 |
| commit | 16cda99c737714d6d259e45808e39f94408d90bd (patch) | |
| tree | af2342cf45db00c552751f0be431f5c3fdefc23b /src/basic | |
| parent | 6840e89a572f6d29ad1e562357fb64fc7f905122 (diff) | |
| download | systemd-16cda99c737714d6d259e45808e39f94408d90bd.tar.gz | |
nulstr-util: make ret_size in strv_make_nulstr() optional
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/nulstr-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c index 2acc61886b..06fa219bd1 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) |