treewide: no need to negate errno for log_*_errno()

[elogind.git] / src / modules-load / modules-load.c

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c77b092a628b3599a03dca0ff7160ee205a1a888..b31dc807f4be1067a8b50b184efa23b23aa554d7 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -38,21 +38,13 @@
 
 static char **arg_proc_cmdline_modules = NULL;
 
-static const char conf_file_dirs[] =
-        "/etc/modules-load.d\0"
-        "/run/modules-load.d\0"
-        "/usr/local/lib/modules-load.d\0"
-        "/usr/lib/modules-load.d\0"
-#ifdef HAVE_SPLIT_USR
-        "/lib/modules-load.d\0"
-#endif
-        ;
+static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load");
 
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args) {
 
         DISABLE_WARNING_FORMAT_NONLITERAL;
-        log_metav(priority, file, line, fn, format, args);
+        log_internalv(priority, 0, file, line, fn, format, args);
         REENABLE_WARNING;
 }
 
@@ -90,7 +82,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
 
         r = kmod_module_new_from_lookup(ctx, m, &modlist);
         if (r < 0) {
-                log_error("Failed to lookup alias '%s': %s", m, strerror(-r));
+                log_error_errno(r, "Failed to lookup alias '%s': %m", m);
                 return r;
         }
 
@@ -150,7 +142,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
                 if (ignore_enoent && r == -ENOENT)
                         return 0;
 
-                log_error("Failed to open %s, ignoring: %s", path, strerror(-r));
+                log_error_errno(r, "Failed to open %s, ignoring: %m", path);
                 return r;
         }
 
@@ -243,8 +235,9 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
-                return EXIT_FAILURE;
+        r = parse_proc_cmdline(parse_proc_cmdline_item);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         ctx = kmod_new(NULL, NULL);
         if (!ctx) {
@@ -278,7 +271,7 @@ int main(int argc, char *argv[]) {
 
                 k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                 if (k < 0) {
-                        log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
+                        log_error_errno(k, "Failed to enumerate modules-load.d files: %m");
                         if (r == 0)
                                 r = k;
                         goto finish;