diff options
| author | Kenneth D. Merry <ken@FreeBSD.org> | 2012-01-19 18:42:03 +0000 |
|---|---|---|
| committer | Kenneth D. Merry <ken@FreeBSD.org> | 2012-01-19 18:42:03 +0000 |
| commit | 2a2443d8332be10a2d2b4421eb9c180d875bd95c (patch) | |
| tree | 20103cefab3a2be56628e53fede1339ff8218c96 /sys/cam/ctl/ctl_error.h | |
| parent | 6f0e06a10e8d3c77728d8bab50c68fa2c3b90ebc (diff) | |
| download | src-2a2443d8332be10a2d2b4421eb9c180d875bd95c.tar.gz src-2a2443d8332be10a2d2b4421eb9c180d875bd95c.zip | |
Quiet some clang warnings when compiling CTL.
ctl_error.c,
ctl_error.h: Take out the ctl_sense_format enumeration, and use
scsi_sense_data_type instead.
Remove ctl_get_sense_format() and switch ctl_build_ua()
over to using scsi_sense_data_type.
ctl_backend_ramdisk.c,
ctl_backend_block.c:
Use C99 structure initializers instead of GNU initializers.
ctl.c: Switch over to using the SCSI sense format enumeration
instead of the CTL-specific enumeration.
Submitted by: dim (partially)
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=230334
Diffstat (limited to 'sys/cam/ctl/ctl_error.h')
| -rw-r--r-- | sys/cam/ctl/ctl_error.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h index 6b97463c7418..1d8bd9b7d1b8 100644 --- a/sys/cam/ctl/ctl_error.h +++ b/sys/cam/ctl/ctl_error.h @@ -42,12 +42,6 @@ #ifndef _CTL_ERROR_H_ #define _CTL_ERROR_H_ -typedef enum { - CTL_SENSE_NOT_SPECIFIED, - CTL_SENSE_FIXED, - CTL_SENSE_DESCRIPTOR -} ctl_sense_format; - void ctl_set_sense_data_va(struct scsi_sense_data *sense_data, void *lun, scsi_sense_data_type sense_format, int current_error, int sense_key, int asc, int ascq, va_list ap); @@ -60,10 +54,9 @@ void ctl_sense_to_desc(struct scsi_sense_data_fixed *sense_src, struct scsi_sense_data_desc *sense_dest); void ctl_sense_to_fixed(struct scsi_sense_data_desc *sense_src, struct scsi_sense_data_fixed *sense_dest); -ctl_sense_format ctl_get_sense_format(struct scsi_sense_data *sense_data); void ctl_set_ua(struct ctl_scsiio *ctsio, int asc, int ascq); ctl_ua_type ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense, - ctl_sense_format sense_format); + scsi_sense_data_type sense_format); void ctl_set_overlapped_cmd(struct ctl_scsiio *ctsio); void ctl_set_overlapped_tag(struct ctl_scsiio *ctsio, uint8_t tag); void ctl_set_invalid_field(struct ctl_scsiio *ctsio, int sks_valid, int command, |