summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-24 11:28:25 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-27 20:12:44 +0100
commita7addf32a529e56ee8a7f146042047884fa61b42 (patch)
tree924fc2d9d31bd0b0b4e9839c219d99996d1c953e /src/libsystemd
parentb35ed5530ba1c576b4fa899b9da04882a940ab07 (diff)
downloadsystemd-a7addf32a529e56ee8a7f146042047884fa61b42.tar.gz
sd-path,strv: add simple helper to wrap oom handling around strv_split_nulstr()
Diffstat (limited to 'src/libsystemd')
-rw-r--r--src/libsystemd/sd-path/sd-path.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index 5797f55c75..eed8229f5b 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -536,16 +536,11 @@ static int get_search(uint64_t type, char ***list) {
"/etc",
NULL);
- case SD_PATH_SEARCH_BINARIES_DEFAULT: {
- char **t;
+ case SD_PATH_SEARCH_BINARIES_DEFAULT:
+ return strv_from_nulstr(list, DEFAULT_PATH_NULSTR);
- t = strv_split_nulstr(DEFAULT_PATH_NULSTR);
- if (!t)
- return -ENOMEM;
- *list = t;
- return 0;
- }}
+ }
return -EOPNOTSUPP;
}