Replace LIST_END with NULL, for clarity and less characters.
frag6.c was definitely a big fan of LIST_END.
Index: netinet/if_ether.c
===================================================================
RCS file: /cvs/src/sys/netinet/if_ether.c,v
retrieving revision 1.97
diff -u -p -r1.97 if_ether.c
--- netinet/if_ether.c 7 Mar 2013 09:03:16 -0000 1.97
+++ netinet/if_ether.c 15 Mar 2013 20:46:48 -0000
@@ -126,8 +126,7 @@ arptimer(void *arg)
s = splsoftnet();
timeout_add_sec(to, arpt_prune);
- for (la = LIST_FIRST(&llinfo_arp); la != LIST_END(&llinfo_arp);
- la = nla) {
+ for (la = LIST_FIRST(&llinfo_arp); la != NULL; la = nla) {
struct rtentry *rt = la->la_rt;
Index: netinet/if_ether.h
===================================================================
RCS file: /cvs/src/sys/netinet/if_ether.h,v
retrieving revision 1.48
diff -u -p -r1.48 if_ether.h
--- netinet/if_ether.h 18 Oct 2012 00:36:22 -0000 1.48
+++ netinet/if_ether.h 15 Mar 2013 20:46:59 -0000
@@ -244,7 +244,7 @@ struct ether_multistep {
/* struct ether_multi *enm; */ \
do { \
for ((enm) = LIST_FIRST(&(ac)->ac_multiaddrs); \
- (enm) != LIST_END(&(ac)->ac_multiaddrs) && \
+ (enm) != NULL && \
(bcmp((enm)->enm_addrlo, (addrlo), ETHER_ADDR_LEN) != 0 || \
bcmp((enm)->enm_addrhi, (addrhi), ETHER_ADDR_LEN) != 0); \
(enm) = LIST_NEXT((enm), enm_list)); \
Index: netinet/in.c
===================================================================
RCS file: /cvs/src/sys/netinet/in.c,v
retrieving revision 1.73
diff -u -p -r1.73 in.c
--- netinet/in.c 7 Mar 2013 09:03:16 -0000 1.73
+++ netinet/in.c 15 Mar 2013 20:53:39 -0000
@@ -224,8 +224,7 @@ in_control(struct socket *so, u_long cmd
case SIOCAIFADDR:
case SIOCDIFADDR:
if (ifra->ifra_addr.sin_family == AF_INET)
- for (; ia != TAILQ_END(&in_ifaddr);
- ia = TAILQ_NEXT(ia, ia_list)) {
+ for (; ia != NULL; ia = TAILQ_NEXT(ia, ia_list)) {
if (ia->ia_ifp == ifp &&
ia->ia_addr.sin_addr.s_addr ==
ifra->ifra_addr.sin_addr.s_addr)
@@ -277,7 +276,7 @@ in_control(struct socket *so, u_long cmd
if (ia && satosin(&ifr->ifr_addr)->sin_addr.s_addr) {
struct in_ifaddr *ia2;
- for (ia2 = ia; ia2 != TAILQ_END(&in_ifaddr);
+ for (ia2 = ia; ia2 != NULL;
ia2 = TAILQ_NEXT(ia2, ia_list)) {
if (ia2->ia_ifp == ifp &&
ia2->ia_addr.sin_addr.s_addr ==
Index: netinet/in_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/in_var.h,v
retrieving revision 1.18
diff -u -p -r1.18 in_var.h
--- netinet/in_var.h 11 Nov 2012 04:45:44 -0000 1.18
+++ netinet/in_var.h 15 Mar 2013 20:54:05 -0000
@@ -98,7 +98,7 @@ void in_socktrim(struct sockaddr_in *);
do { \
struct in_ifaddr *ia; \
\
- for (ia = TAILQ_FIRST(&in_ifaddr); ia != TAILQ_END(&in_ifaddr) && \
+ for (ia = TAILQ_FIRST(&in_ifaddr); ia != NULL && \
(ia->ia_ifp->if_rdomain != rtable_l2(rdomain) || \
ia->ia_addr.sin_addr.s_addr != (addr).s_addr); \
ia = TAILQ_NEXT(ia, ia_list)) \
@@ -115,7 +115,7 @@ do {
\
/* struct in_ifaddr *ia; */ \
do { \
for ((ia) = TAILQ_FIRST(&in_ifaddr); \
- (ia) != TAILQ_END(&in_ifaddr) && (ia)->ia_ifp != (ifp); \
+ (ia) != NULL && (ia)->ia_ifp != (ifp); \
(ia) = TAILQ_NEXT((ia), ia_list)) \
continue; \
} while (/* CONSTCOND */ 0)
@@ -173,7 +173,7 @@ do {
\
(inm) = NULL; \
else \
for ((inm) = LIST_FIRST(&ia->ia_multiaddrs); \
- (inm) != LIST_END(&ia->ia_multiaddrs) && \
+ (inm) != NULL && \
(inm)->inm_addr.s_addr != (addr).s_addr; \
(inm) = LIST_NEXT(inm, inm_list)) \
continue; \
Index: netinet/ip_carp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_carp.c,v
retrieving revision 1.198
diff -u -p -r1.198 ip_carp.c
--- netinet/ip_carp.c 8 Oct 2012 18:48:25 -0000 1.198
+++ netinet/ip_carp.c 15 Mar 2013 20:47:24 -0000
@@ -1028,8 +1028,7 @@ carp_destroy_vhosts(struct carp_softc *s
/* XXX bow out? */
struct carp_vhost_entry *vhe, *nvhe;
- for (vhe = LIST_FIRST(&sc->carp_vhosts);
- vhe != LIST_END(&sc->carp_vhosts); vhe = nvhe) {
+ for (vhe = LIST_FIRST(&sc->carp_vhosts); vhe != NULL; vhe = nvhe) {
nvhe = LIST_NEXT(vhe, vhost_entries);
free(vhe, M_DEVBUF);
}
Index: netinet/ip_input.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.200
diff -u -p -r1.200 ip_input.c
--- netinet/ip_input.c 6 Nov 2012 12:32:42 -0000 1.200
+++ netinet/ip_input.c 15 Mar 2013 20:48:10 -0000
@@ -814,8 +814,8 @@ ip_reass(struct ipqent *ipqe, struct ipq
/*
* Find a segment which begins after this one does.
*/
- for (p = NULL, q = LIST_FIRST(&fp->ipq_fragq);
- q != LIST_END(&fp->ipq_fragq); p = q, q = LIST_NEXT(q, ipqe_q))
+ for (p = NULL, q = LIST_FIRST(&fp->ipq_fragq); q != NULL;
+ p = q, q = LIST_NEXT(q, ipqe_q))
if (ntohs(q->ipqe_ip->ip_off) > ntohs(ipqe->ipqe_ip->ip_off))
break;
@@ -873,8 +873,8 @@ insert:
LIST_INSERT_AFTER(p, ipqe, ipqe_q);
}
next = 0;
- for (p = NULL, q = LIST_FIRST(&fp->ipq_fragq);
- q != LIST_END(&fp->ipq_fragq); p = q, q = LIST_NEXT(q, ipqe_q)) {
+ for (p = NULL, q = LIST_FIRST(&fp->ipq_fragq); q != NULL;
+ p = q, q = LIST_NEXT(q, ipqe_q)) {
if (ntohs(q->ipqe_ip->ip_off) != next)
return (0);
next += ntohs(q->ipqe_ip->ip_len);
@@ -947,8 +947,7 @@ ip_freef(struct ipq *fp)
{
struct ipqent *q, *p;
- for (q = LIST_FIRST(&fp->ipq_fragq); q != LIST_END(&fp->ipq_fragq);
- q = p) {
+ for (q = LIST_FIRST(&fp->ipq_fragq); q != NULL; q = p) {
p = LIST_NEXT(q, ipqe_q);
m_freem(q->ipqe_m);
LIST_REMOVE(q, ipqe_q);
@@ -970,7 +969,7 @@ ip_slowtimo(void)
struct ipq *fp, *nfp;
int s = splsoftnet();
- for (fp = LIST_FIRST(&ipq); fp != LIST_END(&ipq); fp = nfp) {
+ for (fp = LIST_FIRST(&ipq); fp != NULL; fp = nfp) {
nfp = LIST_NEXT(fp, ipq_q);
if (--fp->ipq_ttl == 0) {
ipstat.ips_fragtimeout++;
Index: netinet6/frag6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/frag6.c,v
retrieving revision 1.44
diff -u -p -r1.44 frag6.c
--- netinet6/frag6.c 4 Mar 2013 14:42:25 -0000 1.44
+++ netinet6/frag6.c 15 Mar 2013 20:54:36 -0000
@@ -267,7 +267,7 @@ frag6_input(struct mbuf **mp, int *offp,
IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &q6->ip6q_dst))
break;
- if (q6 == TAILQ_END(&frag6_queue)) {
+ if (q6 == NULL) {
/*
* the first fragment to arrive, create a reassembly queue.
*/
@@ -378,7 +378,7 @@ frag6_input(struct mbuf **mp, int *offp,
IP6_REASS_MBUF(ip6af) = m;
if (first_frag) {
- paf6 = LIST_END(&q6->ip6q_asfrag);
+ paf6 = NULL;
goto insert;
}
@@ -406,9 +406,8 @@ frag6_input(struct mbuf **mp, int *offp,
/*
* Find a segment which begins after this one does.
*/
- for (paf6 = LIST_END(&q6->ip6q_asfrag),
- af6 = LIST_FIRST(&q6->ip6q_asfrag);
- af6 != LIST_END(&q6->ip6q_asfrag);
+ for (paf6 = NULL, af6 = LIST_FIRST(&q6->ip6q_asfrag);
+ af6 != NULL;
paf6 = af6, af6 = LIST_NEXT(af6, ip6af_list))
if (af6->ip6af_off > ip6af->ip6af_off)
break;
@@ -419,7 +418,7 @@ frag6_input(struct mbuf **mp, int *offp,
* fragment, the entire datagram (and any constituent fragments) MUST
* be silently discarded.
*/
- if (paf6 != LIST_END(&q6->ip6q_asfrag)) {
+ if (paf6 != NULL) {
i = (paf6->ip6af_off + paf6->ip6af_frglen) - ip6af->ip6af_off;
if (i > 0) {
#if 0 /* suppress the noisy log */
@@ -431,7 +430,7 @@ frag6_input(struct mbuf **mp, int *offp,
goto flushfrags;
}
}
- if (af6 != LIST_END(&q6->ip6q_asfrag)) {
+ if (af6 != NULL) {
i = (ip6af->ip6af_off + ip6af->ip6af_frglen) - af6->ip6af_off;
if (i > 0) {
#if 0 /* suppress the noisy log */
@@ -451,7 +450,7 @@ frag6_input(struct mbuf **mp, int *offp,
* Move to front of packet queue, as we are
* the most recently active fragmented packet.
*/
- if (paf6 != LIST_END(&q6->ip6q_asfrag))
+ if (paf6 != NULL)
LIST_INSERT_AFTER(paf6, ip6af, ip6af_list);
else
LIST_INSERT_HEAD(&q6->ip6q_asfrag, ip6af, ip6af_list);
@@ -464,9 +463,8 @@ frag6_input(struct mbuf **mp, int *offp,
}
#endif
next = 0;
- for (paf6 = LIST_END(&q6->ip6q_asfrag),
- af6 = LIST_FIRST(&q6->ip6q_asfrag);
- af6 != LIST_END(&q6->ip6q_asfrag);
+ for (paf6 = NULL, af6 = LIST_FIRST(&q6->ip6q_asfrag);
+ af6 != NULL;
paf6 = af6, af6 = LIST_NEXT(af6, ip6af_list)) {
if (af6->ip6af_off != next) {
IP6Q_UNLOCK();
@@ -485,8 +483,7 @@ frag6_input(struct mbuf **mp, int *offp,
ip6af = LIST_FIRST(&q6->ip6q_asfrag);
LIST_REMOVE(ip6af, ip6af_list);
t = m = IP6_REASS_MBUF(ip6af);
- while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) !=
- LIST_END(&q6->ip6q_asfrag)) {
+ while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) != NULL) {
LIST_REMOVE(af6, ip6af_list);
while (t->m_next)
t = t->m_next;
@@ -547,8 +544,7 @@ frag6_input(struct mbuf **mp, int *offp,
return nxt;
flushfrags:
- while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) !=
- LIST_END(&q6->ip6q_asfrag)) {
+ while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) != NULL) {
LIST_REMOVE(af6, ip6af_list);
m_freem(IP6_REASS_MBUF(af6));
free(af6, M_FTABLE);
@@ -602,8 +598,7 @@ frag6_freef(struct ip6q *q6)
IP6Q_LOCK_CHECK();
- while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) !=
- LIST_END(&q6->ip6q_asfrag)) {
+ while ((af6 = LIST_FIRST(&q6->ip6q_asfrag)) != NULL) {
struct mbuf *m = IP6_REASS_MBUF(af6);
LIST_REMOVE(af6, ip6af_list);
@@ -690,7 +685,7 @@ frag6_drain(void)
if (ip6q_lock_try() == 0)
return;
- while ((q6 = TAILQ_FIRST(&frag6_queue)) != TAILQ_END(&frag6_queue)) {
+ while ((q6 = TAILQ_FIRST(&frag6_queue)) != NULL) {
ip6stat.ip6s_fragdropped++;
/* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */
frag6_freef(q6);
Index: netinet6/icmp6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/icmp6.c,v
retrieving revision 1.119
diff -u -p -r1.119 icmp6.c
--- netinet6/icmp6.c 4 Mar 2013 14:42:25 -0000 1.119
+++ netinet6/icmp6.c 15 Mar 2013 20:54:49 -0000
@@ -1757,7 +1757,7 @@ ni6_store_addrs(struct icmp6_nodeinfo *n
again:
- for (; ifp != TAILQ_END(&ifnet); ifp = TAILQ_NEXT(ifp, if_list)) {
+ for (; ifp != NULL; ifp = TAILQ_NEXT(ifp, if_list)) {
TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
Index: netinet6/in6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6.c,v
retrieving revision 1.105
diff -u -p -r1.105 in6.c
--- netinet6/in6.c 7 Mar 2013 09:03:16 -0000 1.105
+++ netinet6/in6.c 15 Mar 2013 20:50:58 -0000
@@ -1594,7 +1594,7 @@ in6_savemkludge(struct in6_ifaddr *oia)
IFP_TO_IA6(oia->ia_ifp, ia);
if (ia) { /* there is another address */
for (in6m = LIST_FIRST(&oia->ia6_multiaddrs);
- in6m != LIST_END(&oia->ia6_multiaddrs); in6m = next) {
+ in6m != NULL; in6m = next) {
next = LIST_NEXT(in6m, in6m_entry);
ifafree(&in6m->in6m_ia->ia_ifa);
ia->ia_ifa.ifa_refcnt++;
@@ -1612,7 +1612,7 @@ in6_savemkludge(struct in6_ifaddr *oia)
panic("in6_savemkludge: no kludge space");
for (in6m = LIST_FIRST(&oia->ia6_multiaddrs);
- in6m != LIST_END(&oia->ia6_multiaddrs); in6m = next) {
+ in6m != NULL; in6m = next) {
next = LIST_NEXT(in6m, in6m_entry);
ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */
in6m->in6m_ia = NULL;
@@ -1635,8 +1635,7 @@ in6_restoremkludge(struct in6_ifaddr *ia
if (mk->mk_ifp == ifp) {
struct in6_multi *in6m, *next;
- for (in6m = LIST_FIRST(&mk->mk_head);
- in6m != LIST_END(&mk->mk_head);
+ for (in6m = LIST_FIRST(&mk->mk_head); in6m != NULL;
in6m = next) {
next = LIST_NEXT(in6m, in6m_entry);
in6m->in6m_ia = ia;
Index: netinet6/in6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/in6_var.h,v
retrieving revision 1.36
diff -u -p -r1.36 in6_var.h
--- netinet6/in6_var.h 4 Mar 2013 14:23:35 -0000 1.36
+++ netinet6/in6_var.h 15 Mar 2013 20:51:09 -0000
@@ -535,7 +535,7 @@ do {
\
(in6m) = NULL; \
else \
for ((in6m) = LIST_FIRST(&ia->ia6_multiaddrs); \
- (in6m) != LIST_END(&ia->ia6_multiaddrs) && \
+ (in6m) != NULL && \
!IN6_ARE_ADDR_EQUAL(&(in6m)->in6m_addr, &(addr)); \
(in6m) = LIST_NEXT((in6m), in6m_entry)) \
continue; \
