summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-01-10 02:59:58 +0000
committereadler <eadler@FreeBSD.org>2012-01-10 02:59:58 +0000
commit4c01c80c87297b020f801f227c173267de9920de (patch)
treed6f8bcbfd4a5282f2cb5b3b1a6c41435484df718 /sbin
parent570e2fcfc0746d70069c90df78ad52c8c48790ec (diff)
downloadFreeBSD-src-4c01c80c87297b020f801f227c173267de9920de.zip
FreeBSD-src-4c01c80c87297b020f801f227c173267de9920de.tar.gz
Fix warning when compiling with gcc46:
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
Diffstat (limited to 'sbin')
-rw-r--r--sbin/camcontrol/camcontrol.c5
-rw-r--r--sbin/camcontrol/modeedit.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 1366061..6116db7 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -3412,7 +3412,6 @@ ratecontrol(struct cam_device *device, int retry_count, int timeout,
}
if (spi && syncrate != -1) {
int prelim_sync_period;
- u_int freq;
if ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) {
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;
spi->sync_period =
scsi_calc_syncparam(prelim_sync_period);
- freq = scsi_calc_syncsrate(spi->sync_period);
didsettings++;
}
if (sata && syncrate != -1) {
@@ -4030,13 +4028,12 @@ retry:
RPL_LUNDATA_LUN_LUN_MASK);
break;
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] &
RPL_LUNDATA_EXT_EAM_MASK;
field_len_code = (lundata->luns[i].lundata[j] &
RPL_LUNDATA_EXT_LEN_MASK) >> 4;
- field_len = field_len_code * 2;
if ((eam_code == RPL_LUNDATA_EXT_EAM_WK)
&& (field_len_code == 0x00)) {
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index e43ce9c..6a628e8 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -869,7 +869,6 @@ mode_list(struct cam_device *device, int page_control, int dbd,
int retry_count, int timeout)
{
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_page_header *mph;
struct pagename *nameentry;
@@ -895,7 +894,6 @@ mode_list(struct cam_device *device, int page_control, int dbd,
/* Locate the next mode page header. */
mph = (struct scsi_mode_page_header *)
((intptr_t)mh + sizeof(*mh) + len);
- mode_pars = MODE_PAGE_DATA(mph);
mph->page_code &= SMS_PAGE_CODE;
nameentry = nameentry_lookup(mph->page_code);
OpenPOWER on IntegriCloud