 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos 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: @(#)main.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos Exp $");
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
 #define	COPYRIGHT(x)	__COPYRIGHT(x)
 #else
 #define	COPYRIGHT(x)	static const char copyright[] = x
 #endif
 #ifndef lint
 COPYRIGHT("@(#) Copyright (c) 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 @@ -1866,41 +1866,42 @@ check_dead_devi(const char *key, void *v
+		}
+	}
 	return 0;
+}
 static struct devbase root;
 static int
 addlevelparent(struct devbase *d, struct devbase *parent)
+{
 	struct devbase *p;
 	if (d == parent) {
-		if (d->d_level++ > 1)
+		if (d->d_level > 1)
 			return 0;
 		return 1;
+	}
 	if (d->d_levelparent) {
-		if (d->d_level++ > 1)
+		if (d->d_level > 1)
 			return 0;
 		return 1;
+	}
 	for (p = parent; p != NULL; p = p->d_levelparent)
-		if (d == p && d->d_level++ > 1)
+		if (d == p && d->d_level > 1)
 			return 0;
 	d->d_levelparent = p ? p : &root;
 	d->d_level++;
 	return 1;
+}
 static void
 do_kill_orphans(struct devbase *d, struct attr *at, struct devbase *parent,
     int state)
+{
 	struct nvlist *nv1;
 	struct attrlist *al;
 	struct attr *a;
 	struct devi *i, *j = NULL;
 	struct pspec *p;
 	int active = 0;
 @@ -1916,26 +1917,27 @@ do_kill_orphans(struct devbase *d, struc
 	 * A pseudo device can never be marked DEVI_IGNORED.
 	 */
 	if (d->d_ispseudo) {
 		if (d->d_ihead != NULL)
 			d->d_ihead->i_active = active = DEVI_ACTIVE;
 		else {
 			if (ht_lookup(deaddevitab, d->d_name) != NULL)
 				active = DEVI_IGNORED;
 			else
 				return;
+		}
 	} else {
 		int seen = 0;
 		int changed = 0;
 		for (i = d->d_ihead; i != NULL; i = i->i_bsame) {
 			for (j = i; j != NULL; j = j->i_alias) {
 				p = j->i_pspec;
 				if ((p == NULL && at == NULL) ||
 				    (p != NULL && p->p_iattr == at &&
 				    (p->p_atdev == NULL ||
 				    p->p_atdev == parent))) {
 					if (p != NULL &&
 					    !devbase_has_any_instance(parent,
 					      p->p_atunit, state, j->i_level))
 						continue;
 					/*
 @@ -1948,26 +1950,27 @@ do_kill_orphans(struct devbase *d, struc
 					 */
 					if (j->i_active == DEVI_ACTIVE ||
 					    j->i_active == state) {
 						/*
 						 * Device has already been
 						 * seen.  However it might
 						 * have siblings who still
 						 * have to be activated or
 						 * orphaned.
 						 */
 						seen = 1;
 						continue;
+					}
 					changed |= j->i_active != state;
 					j->i_active = active = state;
 					if (p != NULL) {
 						if (state == DEVI_ACTIVE ||
 						    --p->p_ref == 0)
 							p->p_active = state;
+					}
 					if (state == DEVI_IGNORED) {
 						CFGDBG(5,
 						    "`%s' at '%s' ignored",
 						    d->d_name, parent ?
 						    parent->d_name : "(root)");
+					}
+				}
 @@ -1987,28 +1990,29 @@ do_kill_orphans(struct devbase *d, struc
 				 * That device had its instances removed.
 				 * Continue the loop marking descendants
 				 * with DEVI_IGNORED instead of DEVI_ACTIVE.
+				 *
 				 * There is one special case for devices that
 				 * are their own parent:  if that instance is
 				 * removed (e.g., no uhub* at uhub?), we don't
 				 * have to continue looping.
 				 */
 				active = DEVI_IGNORED;
 				CFGDBG(5, "`%s' at '%s' ignored", d->d_name,
 				    parent ? parent->d_name : "(root)");
 			} else if (!changed)
 				goto out;
+		}
+	}
 	for (al = d->d_attrs; al != NULL; al = al->al_next) {
 		a = al->al_this;
 		for (nv1 = a->a_devs; nv1 != NULL; nv1 = nv1->nv_next) {
 			do_kill_orphans(nv1->nv_ptr, a, d, active);
+		}
+	}
 out:
 	d->d_levelparent = NULL;
 	d->d_level--;
+}