Fix #166: simplify comparison, unsigned int always > 0

troglobit · troglobit · commit 8d89604c5b57 · 2021-09-12T21:55:14.000+02:00
Signed-off-by: Joachim Wiberg &lt;troglobit@gmail.com&gt;
diff --git a/src/mroute.c b/src/mroute.c
@@ -309,9 +309,9 @@ static int mroute4_del_vif(struct iface *iface)
 		rc = -1;
 	}
 
-	if (iface->vif >= 0 && iface->vif < ALL_VIFS)
+	if (iface->vif != ALL_VIFS)
 		mroute4_prune_vif(iface->vif);
-	iface->vif = -1;
+	iface->vif = ALL_VIFS;
 
 	return rc;
 }
@@ -911,9 +911,9 @@ static int mroute6_del_mif(struct iface *iface)
 		rc = -1;
 	}
 
-	if (iface->mif >= 0 && iface->mif < ALL_VIFS)
+	if (iface->mif != ALL_VIFS)
 		mroute6_prune_mif(iface->mif);
-	iface->mif = -1;
+	iface->mif = ALL_VIFS;
 
 	return rc;
 }

Original file line number	Diff line number	Diff line change
`@@ -309,9 +309,9 @@ static int mroute4_del_vif(struct iface *iface)`
`309`	`309`	`rc = -1;`
`310`	`310`	`}`
`311`	`311`
`312`		`- if (iface->vif >= 0 && iface->vif < ALL_VIFS)`
	`312`	`+ if (iface->vif != ALL_VIFS)`
`313`	`313`	`mroute4_prune_vif(iface->vif);`
`314`		`- iface->vif = -1;`
	`314`	`+ iface->vif = ALL_VIFS;`
`315`	`315`
`316`	`316`	`return rc;`
`317`	`317`	`}`
`@@ -911,9 +911,9 @@ static int mroute6_del_mif(struct iface *iface)`
`911`	`911`	`rc = -1;`
`912`	`912`	`}`
`913`	`913`
`914`		`- if (iface->mif >= 0 && iface->mif < ALL_VIFS)`
	`914`	`+ if (iface->mif != ALL_VIFS)`
`915`	`915`	`mroute6_prune_mif(iface->mif);`
`916`		`- iface->mif = -1;`
	`916`	`+ iface->mif = ALL_VIFS;`
`917`	`917`
`918`	`918`	`return rc;`
`919`	`919`	`}`