summaryrefslogtreecommitdiff
path: root/src/scsi_id
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-12-01 07:39:05 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-12-01 07:39:05 -0500
commit761b969283f415df75efe2ffb772a62b23379222 (patch)
tree66b297fd3a52397122ba44d0e4eefbd40cc6e160 /src/scsi_id
parented7c6787bd009fb3e16fac6cccb6c0eb2fe7705e (diff)
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. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/scsi_id')
-rw-r--r--src/scsi_id/scsi_id.c2
-rw-r--r--src/scsi_id/scsi_serial.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/scsi_id/scsi_id.c b/src/scsi_id/scsi_id.c
index befe3542ba..762e70bc56 100644
--- a/src/scsi_id/scsi_id.c
+++ b/src/scsi_id/scsi_id.c
@@ -178,7 +178,7 @@ static int get_file_options(struct udev *udev,
if (errno == ENOENT)
return 1;
else {
- log_error("can't open %s: %m", config_file);
+ log_error_errno(errno, "can't open %s: %m", config_file);
return -1;
}
}
diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
index 3e30aed419..37081adc1f 100644
--- a/src/scsi_id/scsi_serial.c
+++ b/src/scsi_id/scsi_serial.c
@@ -365,7 +365,7 @@ resend:
dev_scsi->use_sg = 3;
goto resend;
}
- log_debug("%s: ioctl failed: %m", dev_scsi->kernel);
+ log_debug_errno(errno, "%s: ioctl failed: %m", dev_scsi->kernel);
goto error;
}
@@ -823,12 +823,12 @@ int scsi_std_inquiry(struct udev *udev,
fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
if (fd < 0) {
- log_debug("scsi_id: cannot open %s: %m", devname);
+ log_debug_errno(errno, "scsi_id: cannot open %s: %m", devname);
return 1;
}
if (fstat(fd, &statbuf) < 0) {
- log_debug("scsi_id: cannot stat %s: %m", devname);
+ log_debug_errno(errno, "scsi_id: cannot stat %s: %m", devname);
err = 2;
goto out;
}