From f5f6d0e25574dd63fb605b81fa7767dd71c454db Mon Sep 17 00:00:00 2001
From: Daniel Buch <boogiewasthere@gmail.com>
Date: Tue, 26 Nov 2013 09:38:02 +0100
Subject: tree-wide usage of %m specifier instead of strerror(errno)

Also for log_error() except where a specific error is specified

e.g. errno ? strerror(errno) : "Some user specified message"
---
 src/udev/collect/collect.c     | 6 +++---
 src/udev/scsi_id/scsi_id.c     | 2 +-
 src/udev/scsi_id/scsi_serial.c | 8 +++-----
 src/udev/udev-rules.c          | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/udev')

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 1346f27f91..2bbbcd7106 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -97,7 +97,7 @@ static int prepare(char *dir, char *filename)
 
         fd = open(buf,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
         if (fd < 0)
-                fprintf(stderr, "Cannot open %s: %s\n", buf, strerror(errno));
+                fprintf(stderr, "Cannot open %s: %m\n", buf);
 
         if (lockf(fd,F_TLOCK,0) < 0) {
                 if (debug)
@@ -109,7 +109,7 @@ static int prepare(char *dir, char *filename)
                                 fprintf(stderr, "Acquired lock on %s\n", buf);
                 } else {
                         if (debug)
-                                fprintf(stderr, "Could not get lock on %s: %s\n", buf, strerror(errno));
+                                fprintf(stderr, "Could not get lock on %s: %m\n", buf);
                 }
         }
 
@@ -404,7 +404,7 @@ int main(int argc, char **argv)
         us = argv[argi++];
 
         if (signal(SIGALRM, sig_alrm) == SIG_ERR) {
-                fprintf(stderr, "Cannot set SIGALRM: %s\n", strerror(errno));
+                fprintf(stderr, "Cannot set SIGALRM: %m\n");
                 ret = 2;
                 goto exit;
         }
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index ab7c54c3f2..c2cc2ea48d 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -185,7 +185,7 @@ static int get_file_options(struct udev *udev,
                 if (errno == ENOENT) {
                         return 1;
                 } else {
-                        log_error("can't open %s: %s\n", config_file, strerror(errno));
+                        log_error("can't open %s: %m\n", config_file);
                         return -1;
                 }
         }
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index d522a23a08..4b0711b447 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -362,7 +362,7 @@ resend:
                         dev_scsi->use_sg = 3;
                         goto resend;
                 }
-                log_debug("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
+                log_debug("%s: ioctl failed: %m\n", dev_scsi->kernel);
                 goto error;
         }
 
@@ -820,14 +820,12 @@ int scsi_std_inquiry(struct udev *udev,
 
         fd = open(devname, O_RDONLY | O_NONBLOCK);
         if (fd < 0) {
-                log_debug("scsi_id: cannot open %s: %s\n",
-                     devname, strerror(errno));
+                log_debug("scsi_id: cannot open %s: %m\n", devname);
                 return 1;
         }
 
         if (fstat(fd, &statbuf) < 0) {
-                log_debug("scsi_id: cannot stat %s: %s\n",
-                     devname, strerror(errno));
+                log_debug("scsi_id: cannot stat %s: %m\n", devname);
                 err = 2;
                 goto out;
         }
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 320f004dc3..9154700bfa 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2595,7 +2595,7 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules)
                                         strscpyl(tag_symlink, sizeof(tag_symlink), tags_dir, unescaped_filename, NULL);
                                         r = symlink(device_node, tag_symlink);
                                         if (r < 0 && errno != EEXIST) {
-                                                log_error("failed to create symlink %s -> %s: %s\n", tag_symlink, device_node, strerror(errno));
+                                                log_error("failed to create symlink %s -> %s: %m\n", tag_symlink, device_node);
                                                 return -errno;
                                         } else
                                                 r = 0;
-- 
cgit v1.2.3-54-g00ecf