From 56f64d95763a799ba4475daf44d8e9f72a1bd474 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 28 Nov 2014 19:29:59 +0100
Subject: treewide: use log_*_errno whenever %m is in the format string

If the format string contains %m, clearly errno must have a meaningful
value, so we might as well use log_*_errno to have ERRNO= logged.

Using:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\((".*%m.*")/log_\1_errno(errno, \2/'

Plus some whitespace, linewrap, and indent adjustments.
---
 src/dbus1-generator/dbus1-generator.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/dbus1-generator')

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 21e9e9ca73..5a26f38869 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -59,7 +59,7 @@ static int create_dbus_files(
 
                 f = fopen(a, "wxe");
                 if (!f) {
-                        log_error("Failed to create %s: %m", a);
+                        log_error_errno(errno, "Failed to create %s: %m", a);
                         return -errno;
                 }
 
@@ -117,7 +117,7 @@ static int create_dbus_files(
 
         f = fopen(b, "wxe");
         if (!f) {
-                log_error("Failed to create %s: %m", b);
+                log_error_errno(errno, "Failed to create %s: %m", b);
                 return -errno;
         }
 
@@ -146,7 +146,7 @@ static int create_dbus_files(
 
         mkdir_parents_label(lnk, 0755);
         if (symlink(b, lnk)) {
-                log_error("Failed to create symlink %s: %m", lnk);
+                log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
                 return -errno;
         }
 
@@ -229,7 +229,7 @@ static int parse_dbus_fragments(const char *path, const char *type) {
                 if (errno == -ENOENT)
                         return 0;
 
-                log_error("Failed to enumerate D-Bus activated services: %m");
+                log_error_errno(errno, "Failed to enumerate D-Bus activated services: %m");
                 return -errno;
         }
 
@@ -248,7 +248,7 @@ static int parse_dbus_fragments(const char *path, const char *type) {
         return r;
 
 fail:
-        log_error("Failed to read D-Bus services directory: %m");
+        log_error_errno(errno, "Failed to read D-Bus services directory: %m");
         return -errno;
 }
 
@@ -260,7 +260,7 @@ static int link_busnames_target(const char *units) {
 
         mkdir_parents_label(t, 0755);
         if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
+                log_error_errno(errno, "Failed to create symlink %s: %m", t);
                 return -errno;
         }
 
@@ -274,7 +274,7 @@ static int link_compatibility(const char *units) {
         t = strappenda(arg_dest, "/" SPECIAL_DBUS_SOCKET);
         mkdir_parents_label(t, 0755);
         if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
+                log_error_errno(errno, "Failed to create symlink %s: %m", t);
                 return -errno;
         }
 
@@ -282,13 +282,13 @@ static int link_compatibility(const char *units) {
         t = strappenda(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket");
         mkdir_parents_label(t, 0755);
         if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
+                log_error_errno(errno, "Failed to create symlink %s: %m", t);
                 return -errno;
         }
 
         t = strappenda(arg_dest, "/" SPECIAL_DBUS_SERVICE);
         if (symlink("/dev/null", t) < 0) {
-                log_error("Failed to mask %s: %m", t);
+                log_error_errno(errno, "Failed to mask %s: %m", t);
                 return -errno;
         }
 
-- 
cgit v1.2.3-54-g00ecf