svn commit: r209052 - in head/sbin: ccdconfig gbde iscontrol

[Ulrich Spoerlein]

Author: uqs
Date: Fri Jun 11 17:03:04 2010
New Revision: 209052
URL: http://svn.freebsd.org/changeset/base/209052

Log:
  Remove dead variable assignments
  
  Found by:	clang static analyzer
  Verified by:	md5(1)

Modified:
  head/sbin/ccdconfig/ccdconfig.c
  head/sbin/gbde/gbde.c
  head/sbin/iscontrol/config.c

Modified: head/sbin/ccdconfig/ccdconfig.c
==============================================================================
--- head/sbin/ccdconfig/ccdconfig.c	Fri Jun 11 17:02:57 2010	(r209051)
+++ head/sbin/ccdconfig/ccdconfig.c	Fri Jun 11 17:03:04 2010	(r209052)
@@ -177,11 +177,10 @@ do_single(int argc, char **argv, int act
 	 */
 	if (action == CCD_UNCONFIG || action == CCD_UNCONFIGALL) {
 		ex = 0;
-		for (i = 0; argc != 0; ) {
+		for (; argc != 0;) {
 			cp = *argv++; --argc;
 			if ((ccd = resolve_ccdname(cp)) < 0) {
 				warnx("invalid ccd name: %s", cp);
-				i = 1;
 				continue;
 			}
 			grq = gctl_get_handle();

Modified: head/sbin/gbde/gbde.c
==============================================================================
--- head/sbin/gbde/gbde.c	Fri Jun 11 17:02:57 2010	(r209051)
+++ head/sbin/gbde/gbde.c	Fri Jun 11 17:03:04 2010	(r209052)
@@ -750,7 +750,7 @@ main(int argc, char **argv)
 	if (argc < 3)
 		usage();
 
-	if ((i = modfind("g_bde")) < 0) {
+	if (modfind("g_bde") < 0) {
 		/* need to load the gbde module */
 		if (kldload(GBDEMOD) < 0 || modfind("g_bde") < 0)
 			err(1, GBDEMOD ": Kernel module not available");

Modified: head/sbin/iscontrol/config.c
==============================================================================
--- head/sbin/iscontrol/config.c	Fri Jun 11 17:02:57 2010	(r209051)
+++ head/sbin/iscontrol/config.c	Fri Jun 11 17:03:04 2010	(r209052)
@@ -249,7 +249,6 @@ getConfig(FILE *fd, char *key, char **Ar
 	  switch(state) {
 	  case 0:
 	       if((p = strchr(lp, '{')) != NULL) {
-		    n = 0;
 		    while((--p > lp) && *p && isspace(*p));
 		    n = p - lp;
 		    if(len && strncmp(lp, key, MAX(n, len)) == 0)