shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-05-29 01:05:59 +03:00
Code

nulstr-util: make ret_size in strv_make_nulstr() optional

Browse Source
This commit is contained in:
Yu Watanabe 2023-05-08 20:06:33 +09:00 committed by Mike Yuan
parent 6840e89a57
commit 16cda99c73
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/nulstr-util.c
View File

@ -88,7 +88,6 @@ int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
size_t n = 0; size_t n = 0;
assert(ret); assert(ret);
assert(ret_size);
STRV_FOREACH(i, l) { STRV_FOREACH(i, l) {
size_t z; size_t z;
@ -114,7 +113,8 @@ int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
m[n] = '\0'; m[n] = '\0';
*ret = TAKE_PTR(m); *ret = TAKE_PTR(m);
*ret_size = n; if (ret_size)
*ret_size = n;
return 0; return 0;
} }
@ -125,7 +125,6 @@ int set_make_nulstr(Set *s, char **ret, size_t *ret_size) {
_cleanup_free_ char **strv = NULL; _cleanup_free_ char **strv = NULL;
assert(ret); assert(ret);
assert(ret_size);
strv = set_get_strv(s); strv = set_get_strv(s);
if (!strv) if (!strv)