From: John Marino <draco@marino.st>
Date: Wed, 11 Feb 2015 01:57:59 +0000 (+0100)
Subject: kern: Fix [-Werror=aggressive-loop-optimizations]
X-Git-Tag: v4.2.0rc~859
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/82bb7981009e6fb1c85a79fc087da60bdb2fb4d7

kern: Fix [-Werror=aggressive-loop-optimizations]

These were basic upper bound checking errors on loops
---

diff --git a/sys/bus/pccard/pccard.c b/sys/bus/pccard/pccard.c
index c4d4e5b51a..e786539739 100644
--- a/sys/bus/pccard/pccard.c
+++ b/sys/bus/pccard/pccard.c
@@ -971,7 +971,7 @@ pccard_probe_nomatch(device_t bus, device_t child)
 	    "at function %d\n", sc->card.manufacturer, sc->card.product,
 	    pf->function, pf->number);
 	device_printf(bus, "   CIS info: ");
-	for (i = 0; sc->card.cis1_info[i] != NULL && i < 4; i++)
+	for (i = 0; i < 4 && sc->card.cis1_info[i] != NULL; i++)
 		kprintf("%s%s", i > 0 ? ", " : "", sc->card.cis1_info[i]);
 	kprintf("\n");
 	return;
diff --git a/sys/dev/raid/arcmsr/arcmsr.c b/sys/dev/raid/arcmsr/arcmsr.c
index d9bfb7f7a2..282c06eb91 100644
--- a/sys/dev/raid/arcmsr/arcmsr.c
+++ b/sys/dev/raid/arcmsr/arcmsr.c
@@ -4381,7 +4381,7 @@ static int arcmsr_detach(device_t dev)
 	bus_teardown_intr(dev, acb->irqres, acb->ih);
 	arcmsr_shutdown(dev);
 	arcmsr_free_resource(acb);
-	for(i=0; (acb->sys_res_arcmsr[i]!=NULL) && (i<2); i++) {
+	for(i=0; i<2 && (acb->sys_res_arcmsr[i]!=NULL); i++) {
 		bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(i), acb->sys_res_arcmsr[i]);
 	}
 	bus_release_resource(dev, SYS_RES_IRQ, 0, acb->irqres);