projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08af3cc
)
nulstr-util: modernize strv_from_nulstr() a bit
author
Lennart Poettering
<lennart@poettering.net>
Fri, 11 Nov 2022 20:57:28 +0000
(21:57 +0100)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Sun, 13 Nov 2022 08:39:08 +0000
(17:39 +0900)
src/basic/nulstr-util.h
patch
|
blob
|
history
diff --git
a/src/basic/nulstr-util.h
b/src/basic/nulstr-util.h
index 8c2849b11101673efa4f7818232de0c70869fb53..19f4edd3846de365642b998a6baec702625b470b 100644
(file)
--- a/
src/basic/nulstr-util.h
+++ b/
src/basic/nulstr-util.h
@@
-2,6
+2,7
@@
#pragma once
#include <errno.h>
+#include <macro.h>
#include <stdbool.h>
#include <string.h>
@@
-21,12
+22,15
@@
char** strv_parse_nulstr(const char *s, size_t l);
char** strv_split_nulstr(const char *s);
int strv_make_nulstr(char * const *l, char **p, size_t *n);
-static inline int strv_from_nulstr(char ***
a
, const char *nulstr) {
+static inline int strv_from_nulstr(char ***
ret
, const char *nulstr) {
char **t;
+ assert(ret);
+
t = strv_split_nulstr(nulstr);
if (!t)
return -ENOMEM;
- *a = t;
+
+ *ret = t;
return 0;
}