From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 30 Nov 2018 15:55:57 +0000 (+0100)
Subject: conf-files: remove misplaced log_oom()
X-Git-Tag: v240~163^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7181c671a7ae2ca7c4cb6edbd5a3dac4e02426a;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 6320674fb5b..3ba9f6b45d7 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)