Another round of the <sys/queue.h> FOREACH transmogriffer.

Created with:   sed(1)
Reviewed by:    md5(1)

5 files changed, 13 insertions, 26 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index d0be0de..c1a4bd3 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -358,8 +358,7 @@ ifa_ifwithaddr(addr)
 #define	equal(a1, a2) \
   (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
 	TAILQ_FOREACH(ifp, &ifnet, if_link)
-	    for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-		 ifa = TAILQ_NEXT(ifa, ifa_link)) {
+	    TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 		if (ifa->ifa_addr->sa_family != addr->sa_family)
 			continue;
 		if (equal(addr, ifa->ifa_addr))
@@ -385,8 +384,7 @@ ifa_ifwithdstaddr(addr)
 
 	TAILQ_FOREACH(ifp, &ifnet, if_link)
 	    if (ifp->if_flags & IFF_POINTOPOINT)
-		for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-		     ifa = TAILQ_NEXT(ifa, ifa_link)) {
+		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			if (ifa->ifa_addr->sa_family != addr->sa_family)
 				continue;
 			if (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr))
@@ -424,8 +422,7 @@ ifa_ifwithnet(addr)
 	 * addresses in this address family.
 	 */
 	TAILQ_FOREACH(ifp, &ifnet, if_link) {
-		for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-		     ifa = TAILQ_NEXT(ifa, ifa_link)) {
+		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			register char *cp, *cp2, *cp3;
 
 			if (ifa->ifa_addr->sa_family != af)
@@ -510,8 +507,7 @@ ifaof_ifpforaddr(addr, ifp)
 
 	if (af >= AF_MAX)
 		return (0);
-	for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-	     ifa = TAILQ_NEXT(ifa, ifa_link)) {
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 		if (ifa->ifa_addr->sa_family != af)
 			continue;
 		if (ifa_maybe == 0)
@@ -1186,8 +1182,7 @@ if_addmulti(ifp, sa, retifma)
 	 * If the matching multicast address already exists
 	 * then don't add a new one, just add a reference
 	 */
-	for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma;
-	     ifma = LIST_NEXT(ifma, ifma_link)) {
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (equal(sa, ifma->ifma_addr)) {
 			ifma->ifma_refcount++;
 			if (retifma)
@@ -1229,8 +1224,7 @@ if_addmulti(ifp, sa, retifma)
 	*retifma = ifma;
 
 	if (llsa != 0) {
-		for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma;
-		     ifma = LIST_NEXT(ifma, ifma_link)) {
+		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (equal(ifma->ifma_addr, llsa))
 				break;
 		}
@@ -1273,8 +1267,7 @@ if_delmulti(ifp, sa)
 	struct ifmultiaddr *ifma;
 	int s;
 
-	for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma;
-	     ifma = LIST_NEXT(ifma, ifma_link))
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 		if (equal(sa, ifma->ifma_addr))
 			break;
 	if (ifma == 0)
@@ -1306,8 +1299,7 @@ if_delmulti(ifp, sa)
 	 * in the record for the link-layer address.  (So we don't complain
 	 * in that case.)
 	 */
-	for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma;
-	     ifma = LIST_NEXT(ifma, ifma_link))
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 		if (equal(sa, ifma->ifma_addr))
 			break;
 	if (ifma == 0)
@@ -1382,8 +1374,7 @@ ifmaof_ifpforaddr(sa, ifp)
 {
 	struct ifmultiaddr *ifma;
 	
-	for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma;
-	     ifma = LIST_NEXT(ifma, ifma_link))
+	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 		if (equal(ifma->ifma_addr, sa))
 			break;
 
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 423ceaa..5d085cf 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -313,8 +313,7 @@ atm_ifattach(ifp)
 	ifp->if_snd.ifq_maxlen = 50;	/* dummy */
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-	for (ifa = TAILQ_FIRST(&ifp->if_addrlist); ifa != 0;
-	    ifa = TAILQ_NEXT(ifa, ifa_list))
+	TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list)
 #elif defined(__FreeBSD__) && (__FreeBSD__ > 2)
 	for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa; 
 	    ifa = TAILQ_NEXT(ifa, ifa_link))
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 11d3950..3111195 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -163,8 +163,7 @@ ef_detach(struct efnet *sc)
 		if (ifp->if_flags & IFF_RUNNING) {
 		    /* find internet addresses and delete routes */
 		    register struct ifaddr *ifa;
-		    for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-			 ifa = TAILQ_NEXT(ifa, ifa_link)) {
+		    TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			    rtinit(ifa, (int)RTM_DELETE, 0);
 		    }
 		}
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 3759f03..d6f9d26 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -351,8 +351,7 @@ ifmedia_match(ifm, target, mask)
 	match = NULL;
 	mask = ~mask;
 
-	for (next = LIST_FIRST(&ifm->ifm_list); next != NULL;
-	    next = LIST_NEXT(next, ifm_list)) {
+	LIST_FOREACH(next, &ifm->ifm_list, ifm_list) {
 		if ((next->ifm_media & mask) == (target & mask)) {
 #if defined(IFMEDIA_DEBUG) || defined(DIAGNOSTIC)
 			if (match) {
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 1df5477..51ef8847 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -241,8 +241,7 @@ tunclose(dev, foo, bar, p)
 
 		s = splimp();
 		/* find internet addresses and delete routes */
-		for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
-		    ifa = TAILQ_NEXT(ifa, ifa_link))
+		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
 			if (ifa->ifa_addr->sa_family == AF_INET)
 				rtinit(ifa, (int)RTM_DELETE,
 				    tp->tun_flags & TUN_DSTADDR ? RTF_HOST : 0);