svn commit: r229919 - head/sbin/camcontrol

[Eitan Adler]

Author: eadler (ports committer)
Date: Tue Jan 10 02:59:58 2012
New Revision: 229919
URL: http://svn.freebsd.org/changeset/base/229919

Log:
  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

Modified:
  head/sbin/camcontrol/camcontrol.c
  head/sbin/camcontrol/modeedit.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Tue Jan 10 02:59:50 2012	(r229918)
+++ head/sbin/camcontrol/camcontrol.c	Tue Jan 10 02:59:58 2012	(r229919)
@@ -3412,7 +3412,6 @@ ratecontrol(struct cam_device *device, i
 		}
 		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, i
 				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)) {

Modified: head/sbin/camcontrol/modeedit.c
==============================================================================
--- head/sbin/camcontrol/modeedit.c	Tue Jan 10 02:59:50 2012	(r229918)
+++ head/sbin/camcontrol/modeedit.c	Tue Jan 10 02:59:58 2012	(r229919)
@@ -869,7 +869,6 @@ mode_list(struct cam_device *device, int
 	  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
 		/* 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);