change LIST_END to literal NULL for clarity.

ok claudio mpi

4 files changed, 20 insertions, 21 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index dfd0b5f527e..7b240389444 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.250 2013/03/07 09:40:19 mpi Exp $	*/
+/*	$OpenBSD: if.c,v 1.251 2013/03/15 20:45:34 tedu Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -1693,7 +1693,7 @@ ifconf(u_long cmd, caddr_t data)
 
 	ifrp = ifc->ifc_req;
 	for (ifp = TAILQ_FIRST(&ifnet); space >= sizeof(ifr) &&
-	    ifp != TAILQ_END(&ifnet); ifp = TAILQ_NEXT(ifp, if_list)) {
+	    ifp != NULL; ifp = TAILQ_NEXT(ifp, if_list)) {
 		bcopy(ifp->if_xname, ifr.ifr_name, IFNAMSIZ);
 		if (TAILQ_EMPTY(&ifp->if_addrlist)) {
 			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
@@ -1705,7 +1705,7 @@ ifconf(u_long cmd, caddr_t data)
 		} else
 			for (ifa = TAILQ_FIRST(&ifp->if_addrlist);
 			    space >= sizeof (ifr) &&
-			    ifa != TAILQ_END(&ifp->if_addrlist);
+			    ifa != NULL;
 			    ifa = TAILQ_NEXT(ifa, ifa_list)) {
 				struct sockaddr *sa = ifa->ifa_addr;
 #if defined(COMPAT_43) || defined(COMPAT_LINUX)
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index b5f2fdc52d6..decc0ed545b 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.205 2013/01/23 13:28:36 camield Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.206 2013/03/15 20:45:34 tedu Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -322,7 +322,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		TAILQ_FOREACH(p, &sc->sc_spanlist, next)
 			if (p->ifp == ifs)
 				break;
-		if (p != TAILQ_END(&sc->sc_spanlist)) {
+		if (p != NULL) {
 			error = EBUSY;
 			break;
 		}
@@ -424,7 +424,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			if (p->ifp == ifs)
 				break;
 		}
-		if (p != TAILQ_END(&sc->sc_spanlist)) {
+		if (p != NULL) {
 			error = EEXIST;
 			break;
 		}
@@ -450,7 +450,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				break;
 			}
 		}
-		if (p == TAILQ_END(&sc->sc_spanlist)) {
+		if (p == NULL) {
 			error = ENOENT;
 			break;
 		}
@@ -1053,7 +1053,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
 				sc->sc_if.if_oerrors++;
 				continue;
 			}
-			if (TAILQ_NEXT(p, next) == TAILQ_END(&sc->sc_iflist)) {
+			if (TAILQ_NEXT(p, next) == NULL) {
 				used = 1;
 				mc = m;
 			} else {
@@ -1397,7 +1397,7 @@ bridge_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
 				if (ifl->ifp->if_type == IFT_ETHER)
 					break;
 			}
-			if (ifl != TAILQ_END(&sc->sc_iflist)) {
+			if (ifl != NULL) {
 				m->m_pkthdr.rcvif = ifl->ifp;
 				m->m_pkthdr.rdomain = ifl->ifp->if_rdomain;
 #if NBPFILTER > 0
@@ -1552,7 +1552,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *ifp,
 		bridge_localbroadcast(sc, dst_if, eh, m);
 
 		/* If last one, reuse the passed-in mbuf */
-		if (TAILQ_NEXT(p, next) == TAILQ_END(&sc->sc_iflist)) {
+		if (TAILQ_NEXT(p, next) == NULL) {
 			mc = m;
 			used = 1;
 		} else {
@@ -1708,7 +1708,7 @@ bridge_rtupdate(struct bridge_softc *sc, struct ether_addr *ea,
 
 	h = bridge_hash(sc, ea);
 	p = LIST_FIRST(&sc->sc_rts[h]);
-	if (p == LIST_END(&sc->sc_rts[h])) {
+	if (p == NULL) {
 		if (sc->sc_brtcnt >= sc->sc_brtmax)
 			goto done;
 		p = malloc(sizeof(*p), M_DEVBUF, M_NOWAIT);
@@ -1768,7 +1768,7 @@ bridge_rtupdate(struct bridge_softc *sc, struct ether_addr *ea,
 			goto want;
 		}
 
-		if (p == LIST_END(&sc->sc_rts[h])) {
+		if (p == NULL) {
 			if (sc->sc_brtcnt >= sc->sc_brtmax)
 				goto done;
 			p = malloc(sizeof(*p), M_DEVBUF, M_NOWAIT);
@@ -1787,7 +1787,7 @@ bridge_rtupdate(struct bridge_softc *sc, struct ether_addr *ea,
 			sc->sc_brtcnt++;
 			goto want;
 		}
-	} while (p != LIST_END(&sc->sc_rts[h]));
+	} while (p != NULL);
 
 done:
 	ifp = NULL;
@@ -1871,7 +1871,7 @@ bridge_rtage(struct bridge_softc *sc)
 
 	for (i = 0; i < BRIDGE_RTABLE_SIZE; i++) {
 		n = LIST_FIRST(&sc->sc_rts[i]);
-		while (n != LIST_END(&sc->sc_rts[i])) {
+		while (n != NULL) {
 			if ((n->brt_flags & IFBAF_TYPEMASK) == IFBAF_STATIC) {
 				n->brt_age = !n->brt_age;
 				if (n->brt_age)
@@ -1937,7 +1937,7 @@ bridge_rtflush(struct bridge_softc *sc, int full)
 
 	for (i = 0; i < BRIDGE_RTABLE_SIZE; i++) {
 		n = LIST_FIRST(&sc->sc_rts[i]);
-		while (n != LIST_END(&sc->sc_rts[i])) {
+		while (n != NULL) {
 			if (full ||
 			    (n->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
 				p = LIST_NEXT(n, brt_next);
@@ -1987,7 +1987,7 @@ bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int dynonly)
 	 */
 	for (i = 0; i < BRIDGE_RTABLE_SIZE; i++) {
 		n = LIST_FIRST(&sc->sc_rts[i]);
-		while (n != LIST_END(&sc->sc_rts[i])) {
+		while (n != NULL) {
 			if (n->brt_if != ifp) {
 				/* Not ours */
 				n = LIST_NEXT(n, brt_next);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 838d5ce997f..19e3828ccaa 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.153 2013/01/18 12:10:11 sthen Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.154 2013/03/15 20:45:34 tedu Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -815,7 +815,7 @@ ether_ifdetach(ifp)
 	struct ether_multi *enm;
 
 	for (enm = LIST_FIRST(&ac->ac_multiaddrs);
-	    enm != LIST_END(&ac->ac_multiaddrs);
+	    enm != NULL;
 	    enm = LIST_FIRST(&ac->ac_multiaddrs)) {
 		LIST_REMOVE(enm, enm_list);
 		free(enm, M_IFMADDR);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index e1d4a541b07..5965a68ef70 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.124 2013/03/07 09:03:16 mpi Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.125 2013/03/15 20:45:34 tedu Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -1346,8 +1346,7 @@ sysctl_iflist(int af, struct walkarg *w)
 			w->w_where += len;
 		}
 		ifpaddr = 0;
-		while ((ifa = TAILQ_NEXT(ifa, ifa_list)) !=
-		    TAILQ_END(&ifp->if_addrlist)) {
+		while ((ifa = TAILQ_NEXT(ifa, ifa_list)) != NULL) {
 			if (af && af != ifa->ifa_addr->sa_family)
 				continue;
 			ifaaddr = ifa->ifa_addr;