 @@ -1,14 +1,14 @@
-/*	$NetBSD: sem.c,v 1.66 2014/10/31 07:38:36 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.67 2014/11/01 04:34:27 uebayasi Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)sem.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.66 2014/10/31 07:38:36 uebayasi Exp $");
+__RCSID("$NetBSD: sem.c,v 1.67 2014/11/01 04:34:27 uebayasi Exp $");
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "defs.h"
 #include "sem.h"
 /*
  * config semantics.
  */
 @@ -1319,76 +1319,79 @@ remove_devi(struct devi *i)
 	/*
 	 * We have the device instance, i.
 	 * We have to:
 	 *   - delete the alias
+	 *
 	 *      If the devi was an alias of an already listed devi, all is
 	 *      good we don't have to do more.
 	 *      If it was the first alias, we have to replace i's entry in
 	 *      d's list by its first alias.
 	 *      If it was the only entry, we must remove i's entry from d's
 	 *      list.
 	 */
 	if (i != f) {
-		for (j = f; j->i_alias != i; j = j->i_alias);
+		for (j = f; j->i_alias != i; j = j->i_alias)
 			continue;
 		j->i_alias = i->i_alias;
 	} else {
 		if (i->i_alias == NULL) {
 			/* No alias, must unlink the entry from devitab */
 			ht_remove(devitab, i->i_name);
 			j = i->i_bsame;
 		} else {
 			/* Or have the first alias replace i in d's list */
 			i->i_alias->i_bsame = i->i_bsame;
 			j = i->i_alias;
 			if (i == f)
 				ht_replace(devitab, i->i_name, i->i_alias);
+		}
 		/*
 		 *   - remove/replace the instance from the devbase's list
+		 *
 		 * A double-linked list would make this much easier.  Oh, well,
 		 * what is done is done.
 		 */
 		for (ppi = &d->d_ihead;
 		    *ppi != NULL && *ppi != i && (*ppi)->i_bsame != i;
-		    ppi = &(*ppi)->i_bsame);
+		    ppi = &(*ppi)->i_bsame)
 			continue;
 		if (*ppi == NULL)
 			panic("deldev: dev (%s) doesn't list the devi"
 			    " (%s at %s)", d->d_name, i->i_name, i->i_at);
 		f = *ppi;
 		if (f == i)
 			/* That implies d->d_ihead == i */
 			*ppi = j;
 		else
 			(*ppi)->i_bsame = j;
 		if (d->d_ipp == &i->i_bsame) {
 			if (i->i_alias == NULL) {
 				if (f == i)
 					d->d_ipp = &d->d_ihead;
 				else
 					d->d_ipp = &f->i_bsame;
 			} else
 				d->d_ipp = &i->i_alias->i_bsame;
+		}
+	}
 	/*
 	 *   - delete the attachment instance
 	 */
 	iba = i->i_atdeva;
 	for (ppi = &iba->d_ihead;
 	    *ppi != NULL && *ppi != i && (*ppi)->i_asame != i;
-	    ppi = &(*ppi)->i_asame);
+	    ppi = &(*ppi)->i_asame)
 		continue;
 	if (*ppi == NULL)
 		panic("deldev: deva (%s) doesn't list the devi (%s)",
 		    iba->d_name, i->i_name);
 	f = *ppi;
 	if (f == i)
 		/* That implies iba->d_ihead == i */
 		*ppi = i->i_asame;
 	else
 		(*ppi)->i_asame = i->i_asame;
 	if (iba->d_ipp == &i->i_asame) {
 		if (f == i)
 			iba->d_ipp = &iba->d_ihead;
 		else
 @@ -1432,27 +1435,28 @@ remove_devi(struct devi *i)
 	 * removal of its parent.
+	 *
 	 * For active instances, i_level contains the number of devi removed so
 	 * far, and for dead devis, it contains its index.
 	 */
 	i->i_level = devilevel++;
 	i->i_alias = NULL;
 	f = ht_lookup(deaddevitab, i->i_name);
 	if (f == NULL) {
 		if (ht_insert(deaddevitab, i->i_name, i))
 			panic("remove_devi(%s) - can't add to deaddevitab",
 			    i->i_name);
 	} else {
-		for (j = f; j->i_alias != NULL; j = j->i_alias);
+		for (j = f; j->i_alias != NULL; j = j->i_alias)
 			continue;
 		j->i_alias = i;
+	}
 	/*
 	 *   - reconstruct d->d_umax
 	 */
 	d->d_umax = 0;
 	for (i = d->d_ihead; i != NULL; i = i->i_bsame)
 		if (i->i_unit >= d->d_umax)
 			d->d_umax = i->i_unit + 1;
+}
 void
 deldeva(const char *at)