summaryrefslogtreecommitdiffstats
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-30 16:55:57 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-30 16:55:57 +0100
commita7181c671a7ae2ca7c4cb6edbd5a3dac4e02426a (patch)
tree4cede31f886071c1a27c480cd7ea6d28682b72cc /src/basic
parentconf-files: improve algorithm O(n²) → O(n) (diff)
downloadsystemd-a7181c671a7ae2ca7c4cb6edbd5a3dac4e02426a.tar.xz
systemd-a7181c671a7ae2ca7c4cb6edbd5a3dac4e02426a.zip
conf-files: remove misplaced log_oom()
The caller should log in this case (and all callers in fact already do), hence let's remove the duplicate logging here.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/conf-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 6320674fb5..3ba9f6b45d 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -235,7 +235,7 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p
t = path_join(root, path, NULL);
if (!t)
- return log_oom();
+ return -ENOMEM;
r = strv_insert(strv, i, t);
if (r < 0)