From 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 28 Nov 2014 11:58:34 +0100
Subject: treewide: auto-convert the simple cases to log_*_errno()

As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:

find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'

Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().
---
 src/udev/net/ethtool-util.c | 6 +++---
 src/udev/net/link-config.c  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/udev/net')

diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 54cb928091..e46d4d3d7c 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -76,7 +76,7 @@ int ethtool_get_driver(int *fd, const char *ifname, char **ret) {
         if (*fd < 0) {
                 r = ethtool_connect(fd);
                 if (r < 0) {
-                        log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+                        log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
                         return r;
                 }
         }
@@ -112,7 +112,7 @@ int ethtool_set_speed(int *fd, const char *ifname, unsigned int speed, Duplex du
         if (*fd < 0) {
                 r = ethtool_connect(fd);
                 if (r < 0) {
-                        log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+                        log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
                         return r;
                 }
         }
@@ -172,7 +172,7 @@ int ethtool_set_wol(int *fd, const char *ifname, WakeOnLan wol) {
         if (*fd < 0) {
                 r = ethtool_connect(fd);
                 if (r < 0) {
-                        log_warning("link_config: could not connect to ethtool: %s", strerror(-r));
+                        log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
                         return r;
                 }
         }
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 5aefb7d415..97e260baed 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -175,7 +175,7 @@ static bool enable_name_policy(void) {
 
         r = proc_cmdline(&line);
         if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+                log_warning_errno(-r, "Failed to read /proc/cmdline, ignoring: %m");
                 return true;
         }
 
@@ -203,7 +203,7 @@ int link_config_load(link_config_ctx *ctx) {
 
         r = conf_files_list_strv(&files, ".link", NULL, link_dirs);
         if (r < 0) {
-                log_error("failed to enumerate link files: %s", strerror(-r));
+                log_error_errno(-r, "failed to enumerate link files: %m");
                 return r;
         }
 
-- 
cgit v1.2.3-54-g00ecf