chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide usage of %m specifier instead of strerror(errno)
[elogind.git]
/
src
/
udev
/
scsi_id
/
scsi_serial.c
diff --git
a/src/udev/scsi_id/scsi_serial.c
b/src/udev/scsi_id/scsi_serial.c
index 6bfb7f780cbf204e1e5692e9977e6c587a596b1d..4b0711b4475434dd5047245bfb8864827bddd422 100644
(file)
--- 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;
}
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;
}
goto error;
}
@@
-436,7
+436,7
@@
static int do_scsi_page0_inquiry(struct udev *udev,
* If the vendor id appears in the page assume the page is
* invalid.
*/
* If the vendor id appears in the page assume the page is
* invalid.
*/
- if (
!strncmp
((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
+ if (
strneq
((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
log_debug("%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
log_debug("%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
@@
-469,10
+469,10
@@
static int prepend_vendor_model(struct udev *udev,
return ind;
}
return ind;
}
-/*
*
+/*
* check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
* serial number.
* check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
* serial number.
- *
*
/
+ */
static int check_fill_0x83_id(struct udev *udev,
struct scsi_id_device *dev_scsi,
unsigned char *page_83,
static int check_fill_0x83_id(struct udev *udev,
struct scsi_id_device *dev_scsi,
unsigned char *page_83,
@@
-799,6
+799,7
@@
static int do_scsi_page80_inquiry(struct udev *udev,
ser_ind = prepend_vendor_model(udev, dev_scsi, &serial[1]);
if (ser_ind < 0)
return 1;
ser_ind = prepend_vendor_model(udev, dev_scsi, &serial[1]);
if (ser_ind < 0)
return 1;
+ ser_ind++; /* for the leading 'S' */
for (i = 4; i < len + 4; i++, ser_ind++)
serial[ser_ind] = buf[i];
}
for (i = 4; i < len + 4; i++, ser_ind++)
serial[ser_ind] = buf[i];
}
@@
-819,14
+820,12
@@
int scsi_std_inquiry(struct udev *udev,
fd = open(devname, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
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) {
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;
}
err = 2;
goto out;
}
@@
-920,7
+919,8
@@
int scsi_get_serial(struct udev *udev,
}
} else if (page_code != 0x00) {
log_debug("%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
}
} else if (page_code != 0x00) {
log_debug("%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
- return 1;
+ retval = 1;
+ goto completed;
}
/*
}
/*