picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udev: drop unnecessary brackets

Browse source 
Follow-up for ed0cb34682.
This commit is contained in:
Yu Watanabe 2019-04-30 18:45:29 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 0892f3f999
commit 8b803ad634
3 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/udev/cdrom_id/cdrom_id.c
View file

@ -202,9 +202,8 @@ static int cd_capability_compat(int fd) {
int capability; int capability;
capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL); capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
if (capability < 0) { if (capability < 0)
return log_debug_errno(errno, "CDROM_GET_CAPABILITY failed"); return log_debug_errno(errno, "CDROM_GET_CAPABILITY failed");
}
if (capability & CDC_CD_R) if (capability & CDC_CD_R)
cd_cd_r = 1; cd_cd_r = 1;
@ -224,9 +223,9 @@ static int cd_capability_compat(int fd) {
} }
static int cd_media_compat(int fd) { static int cd_media_compat(int fd) {
if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) { if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK)
return log_debug_errno(errno, "CDROM_DRIVE_STATUS != CDS_DISC_OK"); return log_debug_errno(errno, "CDROM_DRIVE_STATUS != CDS_DISC_OK");
}
cd_media = 1; cd_media = 1;
return 0; return 0;
} }
@ -246,9 +245,8 @@ static int cd_inquiry(int fd) {
return -1; return -1;
} }
if ((inq[0] & 0x1F) != 5) { if ((inq[0] & 0x1F) != 5)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "not an MMC unit"); return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "not an MMC unit");
}
log_debug("INQUIRY: [%.8s][%.16s][%.4s]", inq + 8, inq + 16, inq + 32); log_debug("INQUIRY: [%.8s][%.16s][%.4s]", inq + 8, inq + 16, inq + 32);
return 0; return 0;
@ -470,10 +468,9 @@ static int cd_profiles_old_mmc(int fd) {
cd_media_track_count = 1; cd_media_track_count = 1;
cd_media_track_count_data = 1; cd_media_track_count_data = 1;
return 0; return 0;
} else { } else
return log_debug_errno(SYNTHETIC_ERRNO(ENOMEDIUM), return log_debug_errno(SYNTHETIC_ERRNO(ENOMEDIUM),
"no current profile, assuming no media"); "no current profile, assuming no media");
}
}; };
cd_media = 1; cd_media = 1;
@ -656,10 +653,9 @@ static int cd_media_info(int fd) {
} }
len = format[3]; len = format[3];
if (len & 7 || len < 16) { if (len & 7 || len < 16)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"invalid format capacities length"); "invalid format capacities length");
}
switch(format[8] & 3) { switch(format[8] & 3) {
case 1: case 1:

6
src/udev/scsi_id/scsi_id.c
View file

@ -346,20 +346,18 @@ static int set_options(int argc, char **argv,
default_page_code = PAGE_83; default_page_code = PAGE_83;
else if (streq(optarg, "pre-spc3-83")) else if (streq(optarg, "pre-spc3-83"))
default_page_code = PAGE_83_PRE_SPC3; default_page_code = PAGE_83_PRE_SPC3;
else { else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Unknown page code '%s'", "Unknown page code '%s'",
optarg); optarg);
}
break; break;
case 's': case 's':
sg_version = atoi(optarg); sg_version = atoi(optarg);
if (sg_version < 3 || sg_version > 4) { if (sg_version < 3 || sg_version > 4)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Unknown SG version '%s'", "Unknown SG version '%s'",
optarg); optarg);
}
break; break;
case 'u': case 'u':

30
src/udev/scsi_id/scsi_serial.c
View file

@ -168,11 +168,10 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
* we'll retry the command. * we'll retry the command.
*/ */
if (sb_len < 1) { if (sb_len < 1)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: sense buffer empty", "%s: sense buffer empty",
dev_scsi->kernel); dev_scsi->kernel);
}
sense_class = (sense_buffer[0] >> 4) & 0x07; sense_class = (sense_buffer[0] >> 4) & 0x07;
code = sense_buffer[0] & 0xf; code = sense_buffer[0] & 0xf;
@ -182,42 +181,41 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
* extended sense data. * extended sense data.
*/ */
s = sense_buffer[7] + 8; s = sense_buffer[7] + 8;
if (sb_len < s) { if (sb_len < s)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: sense buffer too small %d bytes, %d bytes too short", "%s: sense buffer too small %d bytes, %d bytes too short",
dev_scsi->kernel, sb_len, dev_scsi->kernel, sb_len,
s - sb_len); s - sb_len);
}
if (IN_SET(code, 0x0, 0x1)) { if (IN_SET(code, 0x0, 0x1)) {
sense_key = sense_buffer[2] & 0xf; sense_key = sense_buffer[2] & 0xf;
if (s < 14) { if (s < 14)
/* /*
* Possible? * Possible?
*/ */
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: sense result too small %d bytes", "%s: sense result too small %d bytes",
dev_scsi->kernel, s); dev_scsi->kernel, s);
}
asc = sense_buffer[12]; asc = sense_buffer[12];
ascq = sense_buffer[13]; ascq = sense_buffer[13];
} else if (IN_SET(code, 0x2, 0x3)) { } else if (IN_SET(code, 0x2, 0x3)) {
sense_key = sense_buffer[1] & 0xf; sense_key = sense_buffer[1] & 0xf;
asc = sense_buffer[2]; asc = sense_buffer[2];
ascq = sense_buffer[3]; ascq = sense_buffer[3];
} else { } else
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: invalid sense code 0x%x", "%s: invalid sense code 0x%x",
dev_scsi->kernel, code); dev_scsi->kernel, code);
}
log_debug("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x", log_debug("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x",
dev_scsi->kernel, sense_key, asc, ascq); dev_scsi->kernel, sense_key, asc, ascq);
} else { } else {
if (sb_len < 4) { if (sb_len < 4)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: sense buffer too small %d bytes, %d bytes too short", "%s: sense buffer too small %d bytes, %d bytes too short",
dev_scsi->kernel, sb_len, dev_scsi->kernel, sb_len,
4 - sb_len); 4 - sb_len);
}
if (sense_buffer[0] < 15) if (sense_buffer[0] < 15)
log_debug("%s: old sense key: 0x%x", dev_scsi->kernel, sense_buffer[0] & 0x0f); log_debug("%s: old sense key: 0x%x", dev_scsi->kernel, sense_buffer[0] & 0x0f);
@ -234,14 +232,13 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
static int scsi_dump(struct scsi_id_device *dev_scsi, struct sg_io_hdr *io) { static int scsi_dump(struct scsi_id_device *dev_scsi, struct sg_io_hdr *io) {
if (!io->status && !io->host_status && !io->msg_status && if (!io->status && !io->host_status && !io->msg_status &&
!io->driver_status) { !io->driver_status)
/* /*
* Impossible, should not be called. * Impossible, should not be called.
*/ */
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: called with no error", "%s: called with no error",
__FUNCTION__); __FUNCTION__);
}
log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x", log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x",
dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status); dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status);
@ -253,14 +250,13 @@ static int scsi_dump(struct scsi_id_device *dev_scsi, struct sg_io_hdr *io) {
static int scsi_dump_v4(struct scsi_id_device *dev_scsi, struct sg_io_v4 *io) { static int scsi_dump_v4(struct scsi_id_device *dev_scsi, struct sg_io_v4 *io) {
if (!io->device_status && !io->transport_status && if (!io->device_status && !io->transport_status &&
!io->driver_status) { !io->driver_status)
/* /*
* Impossible, should not be called. * Impossible, should not be called.
*/ */
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: called with no error", "%s: called with no error",
__FUNCTION__); __FUNCTION__);
}
log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x", log_debug("%s: sg_io failed status 0x%x 0x%x 0x%x",
dev_scsi->kernel, io->driver_status, io->transport_status, io->device_status); dev_scsi->kernel, io->driver_status, io->transport_status, io->device_status);
@ -283,10 +279,9 @@ static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd,
int retry = 3; /* rather random */ int retry = 3; /* rather random */
int retval; int retval;
if (buflen > SCSI_INQ_BUFF_LEN) { if (buflen > SCSI_INQ_BUFF_LEN)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"buflen %d too long", buflen); "buflen %d too long", buflen);
}
resend: resend:
if (dev_scsi->use_sg == 4) { if (dev_scsi->use_sg == 4) {
@ -416,12 +411,11 @@ static int prepend_vendor_model(struct scsi_id_device *dev_scsi, char *serial) {
* This is not a complete check, since we are using strncat/cpy * This is not a complete check, since we are using strncat/cpy
* above, ind will never be too large. * above, ind will never be too large.
*/ */
if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) { if (ind != (VENDOR_LENGTH + MODEL_LENGTH))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: expected length %d, got length %d", "%s: expected length %d, got length %d",
dev_scsi->kernel, dev_scsi->kernel,
(VENDOR_LENGTH + MODEL_LENGTH), ind); (VENDOR_LENGTH + MODEL_LENGTH), ind);
}
return ind; return ind;
} }