diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-04-29 18:22:22 +0200 |
---|---|---|
committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-04-30 09:39:07 +0200 |
commit | ed0cb346821972ec2c505ee11ed3d383aba6256e (patch) | |
tree | 4a3d21f05d3f0c5066d5e2306158a1be8a27d762 /src/udev | |
parent | 4a4eaade6072d5358f9b8cc7e1a6fca22e7d15e6 (diff) | |
download | systemd-ed0cb346821972ec2c505ee11ed3d383aba6256e.tar.gz |
tree-wide: code improvements suggested by Coccinelle
Diffstat (limited to 'src/udev')
-rw-r--r-- | src/udev/cdrom_id/cdrom_id.c | 21 | ||||
-rw-r--r-- | src/udev/scsi_id/scsi_id.c | 10 | ||||
-rw-r--r-- | src/udev/scsi_id/scsi_serial.c | 52 |
3 files changed, 44 insertions, 39 deletions
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 7581ddb5b4..231d39dcdd 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -203,8 +203,7 @@ static int cd_capability_compat(int fd) { capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL); if (capability < 0) { - log_debug("CDROM_GET_CAPABILITY failed"); - return -1; + return log_debug_errno(errno, "CDROM_GET_CAPABILITY failed"); } if (capability & CDC_CD_R) @@ -226,8 +225,7 @@ static int cd_capability_compat(int fd) { static int cd_media_compat(int fd) { if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) { - log_debug("CDROM_DRIVE_STATUS != CDS_DISC_OK"); - return -1; + return log_debug_errno(errno, "CDROM_DRIVE_STATUS != CDS_DISC_OK"); } cd_media = 1; return 0; @@ -249,8 +247,7 @@ static int cd_inquiry(int fd) { } if ((inq[0] & 0x1F) != 5) { - log_debug("not an MMC unit"); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "not an MMC unit"); } log_debug("INQUIRY: [%.8s][%.16s][%.4s]", inq + 8, inq + 16, inq + 32); @@ -474,8 +471,8 @@ static int cd_profiles_old_mmc(int fd) { cd_media_track_count_data = 1; return 0; } else { - log_debug("no current profile, assuming no media"); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(ENOMEDIUM), + "no current profile, assuming no media"); } }; @@ -660,8 +657,8 @@ static int cd_media_info(int fd) { len = format[3]; if (len & 7 || len < 16) { - log_debug("invalid format capacities length"); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "invalid format capacities length"); } switch(format[8] & 3) { @@ -680,8 +677,8 @@ static int cd_media_info(int fd) { case 3: cd_media = 0; //return no media - log_debug("format capacities returned no media"); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(ENOMEDIUM), + "format capacities returned no media"); } } diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index f57ae9be75..bb9801e7cc 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -347,16 +347,18 @@ static int set_options(int argc, char **argv, else if (streq(optarg, "pre-spc3-83")) default_page_code = PAGE_83_PRE_SPC3; else { - log_error("Unknown page code '%s'", optarg); - return -1; + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Unknown page code '%s'", + optarg); } break; case 's': sg_version = atoi(optarg); if (sg_version < 3 || sg_version > 4) { - log_error("Unknown SG version '%s'", optarg); - return -1; + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Unknown SG version '%s'", + optarg); } break; diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 8718f5ef1b..fc62339a52 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -169,8 +169,9 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi, */ if (sb_len < 1) { - log_debug("%s: sense buffer empty", dev_scsi->kernel); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: sense buffer empty", + dev_scsi->kernel); } sense_class = (sense_buffer[0] >> 4) & 0x07; @@ -182,9 +183,10 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi, */ s = sense_buffer[7] + 8; if (sb_len < s) { - log_debug("%s: sense buffer too small %d bytes, %d bytes too short", - dev_scsi->kernel, sb_len, s - sb_len); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: sense buffer too small %d bytes, %d bytes too short", + dev_scsi->kernel, sb_len, + s - sb_len); } if (IN_SET(code, 0x0, 0x1)) { sense_key = sense_buffer[2] & 0xf; @@ -192,9 +194,9 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi, /* * Possible? */ - log_debug("%s: sense result too" " small %d bytes", - dev_scsi->kernel, s); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: sense result too small %d bytes", + dev_scsi->kernel, s); } asc = sense_buffer[12]; ascq = sense_buffer[13]; @@ -203,17 +205,18 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi, asc = sense_buffer[2]; ascq = sense_buffer[3]; } else { - log_debug("%s: invalid sense code 0x%x", - dev_scsi->kernel, code); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: invalid sense code 0x%x", + dev_scsi->kernel, code); } log_debug("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x", dev_scsi->kernel, sense_key, asc, ascq); } else { if (sb_len < 4) { - log_debug("%s: sense buffer too small %d bytes, %d bytes too short", - dev_scsi->kernel, sb_len, 4 - sb_len); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: sense buffer too small %d bytes, %d bytes too short", + dev_scsi->kernel, sb_len, + 4 - sb_len); } if (sense_buffer[0] < 15) @@ -235,8 +238,9 @@ static int scsi_dump(struct scsi_id_device *dev_scsi, struct sg_io_hdr *io) { /* * Impossible, should not be called. */ - log_debug("%s: called with no error", __FUNCTION__); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: called with no error", + __FUNCTION__); } log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x", @@ -253,8 +257,9 @@ static int scsi_dump_v4(struct scsi_id_device *dev_scsi, struct sg_io_v4 *io) { /* * Impossible, should not be called. */ - log_debug("%s: called with no error", __FUNCTION__); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: called with no error", + __FUNCTION__); } log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x", @@ -279,8 +284,8 @@ static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd, int retval; if (buflen > SCSI_INQ_BUFF_LEN) { - log_debug("buflen %d too long", buflen); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "buflen %d too long", buflen); } resend: @@ -412,9 +417,10 @@ static int prepend_vendor_model(struct scsi_id_device *dev_scsi, char *serial) { * above, ind will never be too large. */ if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) { - log_debug("%s: expected length %d, got length %d", - dev_scsi->kernel, (VENDOR_LENGTH + MODEL_LENGTH), ind); - return -1; + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), + "%s: expected length %d, got length %d", + dev_scsi->kernel, + (VENDOR_LENGTH + MODEL_LENGTH), ind); } return ind; } |