]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
conf-files: remove misplaced log_oom()
authorLennart Poettering <lennart@poettering.net>
Fri, 30 Nov 2018 15:55:57 +0000 (16:55 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 30 Nov 2018 15:55:57 +0000 (16:55 +0100)
The caller should log in this case (and all callers in fact already do),
hence let's remove the duplicate logging here.

src/basic/conf-files.c

index 6320674fb5b610754bfc672b210e26aacc16686d..3ba9f6b45d76bd29ba1fdc71278d81bcd3b52a70 100644 (file)
@@ -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)