svn commit: r283907 - head/sbin/camcontrol

Marcelo Araujo araujo at FreeBSD.org
Tue Jun 2 09:05:47 UTC 2015


Author: araujo (ports committer)
Date: Tue Jun  2 09:05:45 2015
New Revision: 283907
URL: https://svnweb.freebsd.org/changeset/base/283907

Log:
  Remove unused variables reported by clang.
  
  Differential Revision:	D2688
  Reviewed by:		rodrigc, mav

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

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Tue Jun  2 09:03:15 2015	(r283906)
+++ head/sbin/camcontrol/camcontrol.c	Tue Jun  2 09:05:45 2015	(r283907)
@@ -2566,12 +2566,11 @@ atahpa(struct cam_device *device, int re
 	struct ata_params *ident_buf;
 	struct ccb_getdev cgd;
 	struct ata_set_max_pwd pwd;
-	int error, confirm, quiet, c, action, actions, setpwd, persist;
+	int error, confirm, quiet, c, action, actions, persist;
 	int security, is48bit, pwdsize;
 	u_int64_t hpasize, maxsize;
 
 	actions = 0;
-	setpwd = 0;
 	confirm = 0;
 	quiet = 0;
 	maxsize = 0;

Modified: head/sbin/camcontrol/persist.c
==============================================================================
--- head/sbin/camcontrol/persist.c	Tue Jun  2 09:03:15 2015	(r283906)
+++ head/sbin/camcontrol/persist.c	Tue Jun  2 09:05:45 2015	(r283907)
@@ -432,7 +432,7 @@ scsipersist(struct cam_device *device, i
 	uint32_t res_len = 0;
 	unsigned long rel_tgt_port = 0;
 	uint8_t *res_buf = NULL;
-	int scope = SPR_LU_SCOPE, res_type = 0, key_set = 0, sa_key_set = 0;
+	int scope = SPR_LU_SCOPE, res_type = 0;
 	struct persist_transport_id *id, *id2;
 	STAILQ_HEAD(, persist_transport_id) transport_id_list;
 	uint64_t key = 0, sa_key = 0;
@@ -510,10 +510,8 @@ scsipersist(struct cam_device *device, i
 			}
 			if (c == 'k') {
 				key = tmpval;
-				key_set = 1;
 			} else {
 				sa_key = tmpval;
-				sa_key_set = 1;
 			}
 			break;
 		}


More information about the svn-src-all mailing list