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

[elogind.git] / src / binfmt / binfmt.c

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index c1c152239bed496e8c37d353e8bc7d3b2c1182b1..7fb0664988de988d741bb1bd9cf54c7f5f33db1f 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -36,15 +36,7 @@
 #include "fileio.h"
 #include "build.h"
 
-static const char conf_file_dirs[] =
-        "/etc/binfmt.d\0"
-        "/run/binfmt.d\0"
-        "/usr/local/lib/binfmt.d\0"
-        "/usr/lib/binfmt.d\0"
-#ifdef HAVE_SPLIT_USR
-        "/lib/binfmt.d\0"
-#endif
-        ;
+static const char conf_file_dirs[] = CONF_DIRS_NULSTR("binfmt");
 
 static int delete_rule(const char *rule) {
         _cleanup_free_ char *x = NULL, *fn = NULL;
@@ -73,7 +65,7 @@ static int apply_rule(const char *rule) {
 
         r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
         if (r < 0) {
-                log_error("Failed to add binary format: %s", strerror(-r));
+                log_error_errno(r, "Failed to add binary format: %m");
                 return r;
         }
 
@@ -91,7 +83,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
                 if (ignore_enoent && r == -ENOENT)
                         return 0;
 
-                log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
+                log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
                 return r;
         }
 
@@ -199,7 +191,7 @@ int main(int argc, char *argv[]) {
 
                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                 if (r < 0) {
-                        log_error("Failed to enumerate binfmt.d files: %s", strerror(-r));
+                        log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
                         goto finish;
                 }