d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning when compiling with gcc46:

Browse Source 
error: variable 'freq' set but not used
	error: variable 'mode_pars' set but not used

Reviewed by:	mav
Approved by:	dim
MFC after:	3 days
This commit is contained in:
Eitan Adler 2012-01-10 02:59:58 +00:00
parent eb450775e0
commit b8e4b9659f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/camcontrol/camcontrol.c
View File

@ -3412,7 +3412,6 @@ ratecontrol(struct cam_device *device, int retry_count, int timeout,
} }
if (spi && syncrate != -1) { if (spi && syncrate != -1) {
int prelim_sync_period; int prelim_sync_period;
u_int freq;
if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) { if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) {
warnx("HBA is not capable of changing " warnx("HBA is not capable of changing "
@ -3437,7 +3436,6 @@ ratecontrol(struct cam_device *device, int retry_count, int timeout,
prelim_sync_period = 10000000 / syncrate; prelim_sync_period = 10000000 / syncrate;
spi->sync_period = spi->sync_period =
scsi_calc_syncparam(prelim_sync_period); scsi_calc_syncparam(prelim_sync_period);
freq = scsi_calc_syncsrate(spi->sync_period);
didsettings++; didsettings++;
} }
if (sata && syncrate != -1) { if (sata && syncrate != -1) {
@ -4030,13 +4028,12 @@ scsireportluns(struct cam_device *device, int argc, char **argv,
RPL_LUNDATA_LUN_LUN_MASK); RPL_LUNDATA_LUN_LUN_MASK);
break; break;
case RPL_LUNDATA_ATYP_EXTLUN: { case RPL_LUNDATA_ATYP_EXTLUN: {
int field_len, field_len_code, eam_code; int field_len_code, eam_code;
eam_code = lundata->luns[i].lundata[j] & eam_code = lundata->luns[i].lundata[j] &
RPL_LUNDATA_EXT_EAM_MASK; RPL_LUNDATA_EXT_EAM_MASK;
field_len_code = (lundata->luns[i].lundata[j] & field_len_code = (lundata->luns[i].lundata[j] &
RPL_LUNDATA_EXT_LEN_MASK) >> 4; RPL_LUNDATA_EXT_LEN_MASK) >> 4;
field_len = field_len_code * 2;
if ((eam_code == RPL_LUNDATA_EXT_EAM_WK) if ((eam_code == RPL_LUNDATA_EXT_EAM_WK)
&& (field_len_code == 0x00)) { && (field_len_code == 0x00)) {

2
sbin/camcontrol/modeedit.c
View File

@ -869,7 +869,6 @@ mode_list(struct cam_device *device, int page_control, int dbd,
int retry_count, int timeout) int retry_count, int timeout)
{ {
u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */ u_int8_t data[MAX_COMMAND_SIZE];/* Buffer to hold sense data. */
u_int8_t *mode_pars; /* Pointer to modepage params. */
struct scsi_mode_header_6 *mh; /* Location of mode header. */ struct scsi_mode_header_6 *mh; /* Location of mode header. */
struct scsi_mode_page_header *mph; struct scsi_mode_page_header *mph;
struct pagename *nameentry; struct pagename *nameentry;
@ -895,7 +894,6 @@ mode_list(struct cam_device *device, int page_control, int dbd,
/* Locate the next mode page header. */ /* Locate the next mode page header. */
mph = (struct scsi_mode_page_header *) mph = (struct scsi_mode_page_header *)
((intptr_t)mh + sizeof(*mh) + len); ((intptr_t)mh + sizeof(*mh) + len);
mode_pars = MODE_PAGE_DATA(mph);
mph->page_code &= SMS_PAGE_CODE; mph->page_code &= SMS_PAGE_CODE;
nameentry = nameentry_lookup(mph->page_code); nameentry = nameentry_lookup(mph->page_code);