svn commit: r298075 - in head/sys: net netgraph netgraph/atm/ccatm netinet6 netipsec
Pedro F. Giffuni
pfg at FreeBSD.org
Fri Apr 15 17:30:37 UTC 2016
Author: pfg
Date: Fri Apr 15 17:30:33 2016
New Revision: 298075
URL: https://svnweb.freebsd.org/changeset/base/298075
Log:
sys/net* : for pointers replace 0 with NULL.
Mostly cosmetical, no functional change.
Found with devel/coccinelle.
Modified:
head/sys/net/bpf_filter.c
head/sys/net/if.c
head/sys/net/if_arcsubr.c
head/sys/net/if_atmsubr.c
head/sys/net/if_bridge.c
head/sys/net/if_disc.c
head/sys/net/if_ethersubr.c
head/sys/net/if_fddisubr.c
head/sys/net/if_fwsubr.c
head/sys/net/if_iso88025subr.c
head/sys/net/if_loop.c
head/sys/net/if_spppsubr.c
head/sys/net/radix.c
head/sys/net/raw_usrreq.c
head/sys/netgraph/atm/ccatm/ng_ccatm.c
head/sys/netgraph/ng_socket.c
head/sys/netgraph/ng_source.c
head/sys/netinet6/in6.c
head/sys/netinet6/ip6_output.c
head/sys/netinet6/nd6_rtr.c
head/sys/netinet6/raw_ip6.c
head/sys/netinet6/udp6_usrreq.c
head/sys/netipsec/ipsec_mbuf.c
head/sys/netipsec/key.c
head/sys/netipsec/keysock.c
head/sys/netipsec/xform_ipcomp.c
Modified: head/sys/net/bpf_filter.c
==============================================================================
--- head/sys/net/bpf_filter.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/bpf_filter.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -99,7 +99,7 @@ m_xword(struct mbuf *m, bpf_u_int32 k, i
while (k >= len) {
k -= len;
m = m->m_next;
- if (m == 0)
+ if (m == NULL)
goto bad;
len = m->m_len;
}
@@ -109,7 +109,7 @@ m_xword(struct mbuf *m, bpf_u_int32 k, i
return (EXTRACT_LONG(cp));
}
m0 = m->m_next;
- if (m0 == 0 || m0->m_len + len - k < 4)
+ if (m0 == NULL || m0->m_len + len - k < 4)
goto bad;
*err = 0;
np = mtod(m0, u_char *);
@@ -148,7 +148,7 @@ m_xhalf(struct mbuf *m, bpf_u_int32 k, i
while (k >= len) {
k -= len;
m = m->m_next;
- if (m == 0)
+ if (m == NULL)
goto bad;
len = m->m_len;
}
@@ -158,7 +158,7 @@ m_xhalf(struct mbuf *m, bpf_u_int32 k, i
return (EXTRACT_SHORT(cp));
}
m0 = m->m_next;
- if (m0 == 0)
+ if (m0 == NULL)
goto bad;
*err = 0;
return ((cp[0] << 8) | mtod(m0, u_char *)[0]);
Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -1948,8 +1948,8 @@ link_rtrequest(int cmd, struct rtentry *
struct sockaddr *dst;
struct ifnet *ifp;
- if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
- ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
+ if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == NULL) ||
+ ((ifp = ifa->ifa_ifp) == NULL) || ((dst = rt_key(rt)) == NULL))
return;
ifa = ifaof_ifpforaddr(dst, ifp);
if (ifa) {
@@ -2139,7 +2139,7 @@ if_qflush(struct ifnet *ifp)
ALTQ_PURGE(ifq);
#endif
n = ifq->ifq_head;
- while ((m = n) != 0) {
+ while ((m = n) != NULL) {
n = m->m_nextpkt;
m_freem(m);
}
Modified: head/sys/net/if_arcsubr.c
==============================================================================
--- head/sys/net/if_arcsubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_arcsubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -210,7 +210,7 @@ arc_output(struct ifnet *ifp, struct mbu
isphds = arc_isphds(atype);
M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
ah = mtod(m, struct arc_header *);
ah->arc_type = atype;
@@ -261,12 +261,12 @@ arc_frag_next(struct ifnet *ifp)
struct arc_header *ah;
ac = (struct arccom *)ifp->if_l2com;
- if ((m = ac->curr_frag) == 0) {
+ if ((m = ac->curr_frag) == NULL) {
int tfrags;
/* dequeue new packet */
IF_DEQUEUE(&ifp->if_snd, m);
- if (m == 0)
+ if (m == NULL)
return 0;
ah = mtod(m, struct arc_header *);
@@ -296,7 +296,7 @@ arc_frag_next(struct ifnet *ifp)
}
M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
- if (m == 0) {
+ if (m == NULL) {
m_freem(ac->curr_frag);
ac->curr_frag = 0;
return 0;
@@ -315,7 +315,7 @@ arc_frag_next(struct ifnet *ifp)
ac->curr_frag = 0;
M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
return 0;
ah = mtod(m, struct arc_header *);
@@ -328,7 +328,7 @@ arc_frag_next(struct ifnet *ifp)
ac->curr_frag = 0;
M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
return 0;
ah = mtod(m, struct arc_header *);
@@ -740,7 +740,7 @@ arc_resolvemulti(struct ifnet *ifp, stru
sdl = (struct sockaddr_dl *)sa;
if (*LLADDR(sdl) != arcbroadcastaddr)
return EADDRNOTAVAIL;
- *llsa = 0;
+ *llsa = NULL;
return 0;
#ifdef INET
case AF_INET:
@@ -763,7 +763,7 @@ arc_resolvemulti(struct ifnet *ifp, stru
* (This is used for multicast routers.)
*/
ifp->if_flags |= IFF_ALLMULTI;
- *llsa = 0;
+ *llsa = NULL;
return 0;
}
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
Modified: head/sys/net/if_atmsubr.c
==============================================================================
--- head/sys/net/if_atmsubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_atmsubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -192,7 +192,7 @@ atm_output(struct ifnet *ifp, struct mbu
if (atm_flags & ATM_PH_LLCSNAP)
sz += 8; /* sizeof snap == 8 */
M_PREPEND(m, sz, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
ad = mtod(m, struct atm_pseudohdr *);
*ad = atmdst;
@@ -295,7 +295,7 @@ atm_input(struct ifnet *ifp, struct atm_
struct atmllc *alc;
if (m->m_len < sizeof(*alc) &&
- (m = m_pullup(m, sizeof(*alc))) == 0)
+ (m = m_pullup(m, sizeof(*alc))) == NULL)
return; /* failed */
alc = mtod(m, struct atmllc *);
if (bcmp(alc, ATMLLC_HDR, 6)) {
Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_bridge.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -3248,7 +3248,7 @@ bridge_pfil(struct mbuf **mp, struct ifn
if (hlen < sizeof(struct ip))
goto bad;
if (hlen > (*mp)->m_len) {
- if ((*mp = m_pullup(*mp, hlen)) == 0)
+ if ((*mp = m_pullup(*mp, hlen)) == NULL)
goto bad;
ip = mtod(*mp, struct ip *);
if (ip == NULL)
@@ -3366,7 +3366,7 @@ bridge_ip_checkbasic(struct mbuf **mp)
goto bad;
}
if (hlen > m->m_len) {
- if ((m = m_pullup(m, hlen)) == 0) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
KMOD_IPSTAT_INC(ips_badhlen);
goto bad;
}
Modified: head/sys/net/if_disc.c
==============================================================================
--- head/sys/net/if_disc.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_disc.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -216,7 +216,7 @@ discioctl(struct ifnet *ifp, u_long cmd,
break;
case SIOCADDMULTI:
case SIOCDELMULTI:
- if (ifr == 0) {
+ if (ifr == NULL) {
error = EAFNOSUPPORT; /* XXX */
break;
}
Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_ethersubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -1075,7 +1075,7 @@ ether_resolvemulti(struct ifnet *ifp, st
e_addr = LLADDR(sdl);
if (!ETHER_IS_MULTICAST(e_addr))
return EADDRNOTAVAIL;
- *llsa = 0;
+ *llsa = NULL;
return 0;
#ifdef INET
@@ -1100,7 +1100,7 @@ ether_resolvemulti(struct ifnet *ifp, st
* (This is used for multicast routers.)
*/
ifp->if_flags |= IFF_ALLMULTI;
- *llsa = 0;
+ *llsa = NULL;
return 0;
}
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
Modified: head/sys/net/if_fddisubr.c
==============================================================================
--- head/sys/net/if_fddisubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_fddisubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -235,7 +235,7 @@ fddi_output(struct ifnet *ifp, struct mb
if (type != 0) {
struct llc *l;
M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
l = mtod(m, struct llc *);
l->llc_control = LLC_UI;
@@ -251,7 +251,7 @@ fddi_output(struct ifnet *ifp, struct mb
* allocate another.
*/
M_PREPEND(m, FDDI_HDR_LEN, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
fh = mtod(m, struct fddi_header *);
fh->fddi_fc = FDDIFC_LLC_ASYNC|FDDIFC_LLC_PRIO4;
@@ -607,7 +607,7 @@ fddi_resolvemulti(ifp, llsa, sa)
e_addr = LLADDR(sdl);
if ((e_addr[0] & 1) != 1)
return (EADDRNOTAVAIL);
- *llsa = 0;
+ *llsa = NULL;
return (0);
#ifdef INET
@@ -634,7 +634,7 @@ fddi_resolvemulti(ifp, llsa, sa)
* (This is used for multicast routers.)
*/
ifp->if_flags |= IFF_ALLMULTI;
- *llsa = 0;
+ *llsa = NULL;
return (0);
}
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
Modified: head/sys/net/if_fwsubr.c
==============================================================================
--- head/sys/net/if_fwsubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_fwsubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -132,7 +132,7 @@ firewire_output(struct ifnet *ifp, struc
}
destfw = (struct fw_hwaddr *)(mtag + 1);
} else {
- destfw = 0;
+ destfw = NULL;
}
switch (dst->sa_family) {
@@ -269,7 +269,7 @@ firewire_output(struct ifnet *ifp, struc
mtail = m_split(m, fsize, M_NOWAIT);
m_tag_copy_chain(mtail, m, M_NOWAIT);
} else {
- mtail = 0;
+ mtail = NULL;
}
/*
@@ -701,7 +701,7 @@ firewire_resolvemulti(struct ifnet *ifp,
/*
* No mapping needed.
*/
- *llsa = 0;
+ *llsa = NULL;
return 0;
#ifdef INET
@@ -709,7 +709,7 @@ firewire_resolvemulti(struct ifnet *ifp,
sin = (struct sockaddr_in *)sa;
if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
return EADDRNOTAVAIL;
- *llsa = 0;
+ *llsa = NULL;
return 0;
#endif
#ifdef INET6
@@ -722,12 +722,12 @@ firewire_resolvemulti(struct ifnet *ifp,
* (This is used for multicast routers.)
*/
ifp->if_flags |= IFF_ALLMULTI;
- *llsa = 0;
+ *llsa = NULL;
return 0;
}
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
return EADDRNOTAVAIL;
- *llsa = 0;
+ *llsa = NULL;
return 0;
#endif
Modified: head/sys/net/if_iso88025subr.c
==============================================================================
--- head/sys/net/if_iso88025subr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_iso88025subr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -328,7 +328,7 @@ iso88025_output(struct ifnet *ifp, struc
if (snap_type != 0) {
struct llc *l;
M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
l = mtod(m, struct llc *);
l->llc_control = LLC_UI;
@@ -344,7 +344,7 @@ iso88025_output(struct ifnet *ifp, struc
* allocate another.
*/
M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_NOWAIT);
- if (m == 0)
+ if (m == NULL)
senderr(ENOBUFS);
th = mtod(m, struct iso88025_header *);
bcopy((caddr_t)edst, (caddr_t)&gen_th.iso88025_dhost, ISO88025_ADDR_LEN);
@@ -638,7 +638,7 @@ iso88025_resolvemulti (ifp, llsa, sa)
if ((e_addr[0] & 1) != 1) {
return (EADDRNOTAVAIL);
}
- *llsa = 0;
+ *llsa = NULL;
return (0);
#ifdef INET
@@ -664,7 +664,7 @@ iso88025_resolvemulti (ifp, llsa, sa)
* (This is used for multicast routers.)
*/
ifp->if_flags |= IFF_ALLMULTI;
- *llsa = 0;
+ *llsa = NULL;
return (0);
}
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) {
Modified: head/sys/net/if_loop.c
==============================================================================
--- head/sys/net/if_loop.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_loop.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -380,7 +380,7 @@ loioctl(struct ifnet *ifp, u_long cmd, c
case SIOCADDMULTI:
case SIOCDELMULTI:
- if (ifr == 0) {
+ if (ifr == NULL) {
error = EAFNOSUPPORT; /* XXX */
break;
}
Modified: head/sys/net/if_spppsubr.c
==============================================================================
--- head/sys/net/if_spppsubr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/if_spppsubr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -4835,7 +4835,7 @@ sppp_get_ip_addrs(struct sppp *sp, u_lon
* Pick the first AF_INET address from the list,
* aliases don't make any sense on a p2p link anyway.
*/
- si = 0;
+ si = NULL;
if_addr_rlock(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
if (ifa->ifa_addr->sa_family == AF_INET) {
@@ -4877,7 +4877,7 @@ sppp_set_ip_addr(struct sppp *sp, u_long
* Pick the first AF_INET address from the list,
* aliases don't make any sense on a p2p link anyway.
*/
- si = 0;
+ si = NULL;
if_addr_rlock(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family == AF_INET) {
@@ -5055,7 +5055,7 @@ sppp_params(struct sppp *sp, u_long cmd,
struct spppreq *spr;
int rv = 0;
- if ((spr = malloc(sizeof(struct spppreq), M_TEMP, M_NOWAIT)) == 0)
+ if ((spr = malloc(sizeof(struct spppreq), M_TEMP, M_NOWAIT)) == NULL)
return (EAGAIN);
/*
* ifr->ifr_data is supposed to point to a struct spppreq.
Modified: head/sys/net/radix.c
==============================================================================
--- head/sys/net/radix.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/radix.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -519,11 +519,11 @@ rn_addmask(void *n_arg, struct radix_mas
*addmask_key = mlen;
x = rn_search(addmask_key, maskhead->head.rnh_treetop);
if (bcmp(addmask_key, x->rn_key, mlen) != 0)
- x = 0;
+ x = NULL;
if (x || search)
return (x);
R_Zalloc(x, struct radix_node *, RADIX_MAX_KEY_LEN + 2 * sizeof (*x));
- if ((saved_x = x) == 0)
+ if ((saved_x = x) == NULL)
return (0);
netmask = cp = (unsigned char *)(x + 2);
bcopy(addmask_key, cp, mlen);
@@ -599,7 +599,7 @@ rn_addroute(void *v_arg, void *n_arg, st
struct radix_node treenodes[2])
{
caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
- struct radix_node *t, *x = 0, *tt;
+ struct radix_node *t, *x = NULL, *tt;
struct radix_node *saved_tt, *top = head->rnh_treetop;
short b = 0, b_leaf = 0;
int keyduplicated;
@@ -722,7 +722,7 @@ rn_addroute(void *v_arg, void *n_arg, st
for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
if (m->rm_bit >= b_leaf)
break;
- t->rn_mklist = m; *mp = 0;
+ t->rn_mklist = m; *mp = NULL;
}
on2:
/* Add new route to highest possible ancestor's list */
@@ -785,7 +785,7 @@ rn_delete(void *v_arg, void *netmask_arg
vlen = LEN(v);
saved_tt = tt;
top = x;
- if (tt == 0 ||
+ if (tt == NULL ||
bcmp(v + head_off, tt->rn_key + head_off, vlen - head_off))
return (0);
/*
@@ -797,10 +797,10 @@ rn_delete(void *v_arg, void *netmask_arg
return (0);
netmask = x->rn_key;
while (tt->rn_mask != netmask)
- if ((tt = tt->rn_dupedkey) == 0)
+ if ((tt = tt->rn_dupedkey) == NULL)
return (0);
}
- if (tt->rn_mask == 0 || (saved_m = m = tt->rn_mklist) == 0)
+ if (tt->rn_mask == 0 || (saved_m = m = tt->rn_mklist) == NULL)
goto on1;
if (tt->rn_flags & RNF_NORMAL) {
if (m->rm_leaf != tt || m->rm_refs > 0) {
@@ -829,7 +829,7 @@ rn_delete(void *v_arg, void *netmask_arg
R_Free(m);
break;
}
- if (m == 0) {
+ if (m == NULL) {
log(LOG_ERR, "rn_delete: couldn't find our annotation\n");
if (tt->rn_flags & RNF_NORMAL)
return (0); /* Dangling ref to us */
@@ -1044,7 +1044,7 @@ rn_walktree_from(struct radix_head *h, v
rn = rn->rn_left;
next = rn;
/* Process leaves */
- while ((rn = base) != 0) {
+ while ((rn = base) != NULL) {
base = rn->rn_dupedkey;
/* printf("leaf %p\n", rn); */
if (!(rn->rn_flags & RNF_ROOT)
Modified: head/sys/net/raw_usrreq.c
==============================================================================
--- head/sys/net/raw_usrreq.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/net/raw_usrreq.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -83,7 +83,7 @@ raw_input_ext(struct mbuf *m0, struct so
struct mbuf *m = m0;
struct socket *last;
- last = 0;
+ last = NULL;
mtx_lock(&rawcb_mtx);
LIST_FOREACH(rp, &V_rawcb_list, list) {
if (rp->rcb_proto.sp_family != proto->sp_family)
Modified: head/sys/netgraph/atm/ccatm/ng_ccatm.c
==============================================================================
--- head/sys/netgraph/atm/ccatm/ng_ccatm.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netgraph/atm/ccatm/ng_ccatm.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -441,7 +441,7 @@ send_dump(struct ccdata *data, void *uar
m->m_pkthdr.len = 0;
} else {
m = m_getcl(M_NOWAIT, MT_DATA, 0);
- if (m == 0) {
+ if (m == NULL) {
m_freem(priv->dump_first);
return (ENOBUFS);
}
Modified: head/sys/netgraph/ng_socket.c
==============================================================================
--- head/sys/netgraph/ng_socket.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netgraph/ng_socket.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -360,7 +360,7 @@ ngc_bind(struct socket *so, struct socka
{
struct ngpcb *const pcbp = sotongpcb(so);
- if (pcbp == 0)
+ if (pcbp == NULL)
return (EINVAL);
return (ng_bind(nam, pcbp));
}
@@ -474,7 +474,7 @@ ngd_connect(struct socket *so, struct so
{
struct ngpcb *const pcbp = sotongpcb(so);
- if (pcbp == 0)
+ if (pcbp == NULL)
return (EINVAL);
return (ng_connect_data(nam, pcbp));
}
Modified: head/sys/netgraph/ng_source.c
==============================================================================
--- head/sys/netgraph/ng_source.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netgraph/ng_source.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -294,7 +294,7 @@ ng_source_newhook(node_p node, hook_p ho
sc->input = hook;
} else if (strcmp(name, NG_SOURCE_HOOK_OUTPUT) == 0) {
sc->output = hook;
- sc->output_ifp = 0;
+ sc->output_ifp = NULL;
bzero(&sc->stats, sizeof(sc->stats));
} else
return (EINVAL);
Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netinet6/in6.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -1823,7 +1823,7 @@ in6_ifawithifp(struct ifnet *ifp, struct
{
int dst_scope = in6_addrscope(dst), blen = -1, tlen;
struct ifaddr *ifa;
- struct in6_ifaddr *besta = 0;
+ struct in6_ifaddr *besta = NULL;
struct in6_ifaddr *dep[2]; /* last-resort: deprecated */
dep[0] = dep[1] = NULL;
Modified: head/sys/netinet6/ip6_output.c
==============================================================================
--- head/sys/netinet6/ip6_output.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netinet6/ip6_output.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -256,7 +256,7 @@ ip6_fragment(struct ifnet *ifp, struct m
ip6f->ip6f_offlg |= IP6F_MORE_FRAG;
mhip6->ip6_plen = htons((u_short)(mtu + hlen +
sizeof(*ip6f) - sizeof(struct ip6_hdr)));
- if ((m_frgpart = m_copy(m0, off, mtu)) == 0) {
+ if ((m_frgpart = m_copy(m0, off, mtu)) == NULL) {
IP6STAT_INC(ip6s_odropped);
return (ENOBUFS);
}
@@ -503,7 +503,7 @@ ip6_output(struct mbuf *m0, struct ip6_p
/*
* Route packet.
*/
- if (ro == 0) {
+ if (ro == NULL) {
ro = &ip6route;
bzero((caddr_t)ro, sizeof(*ro));
}
@@ -1116,7 +1116,7 @@ ip6_insert_jumboopt(struct ip6_exthdrs *
* jumbo payload option, allocate a cluster to store the whole options.
* Otherwise, use it to store the options.
*/
- if (exthdrs->ip6e_hbh == 0) {
+ if (exthdrs->ip6e_hbh == NULL) {
mopt = m_get(M_NOWAIT, MT_DATA);
if (mopt == NULL)
return (ENOBUFS);
@@ -1198,7 +1198,7 @@ ip6_insertfraghdr(struct mbuf *m0, struc
if (hlen > sizeof(struct ip6_hdr)) {
n = m_copym(m0, sizeof(struct ip6_hdr),
hlen - sizeof(struct ip6_hdr), M_NOWAIT);
- if (n == 0)
+ if (n == NULL)
return (ENOBUFS);
m->m_next = n;
} else
@@ -2515,7 +2515,7 @@ int
ip6_setpktopts(struct mbuf *control, struct ip6_pktopts *opt,
struct ip6_pktopts *stickyopt, struct ucred *cred, int uproto)
{
- struct cmsghdr *cm = 0;
+ struct cmsghdr *cm = NULL;
if (control == NULL || opt == NULL)
return (EINVAL);
Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netinet6/nd6_rtr.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -1510,7 +1510,7 @@ pfxlist_onlink_check()
find_pfxlist_reachable_router(pr) == NULL)
pr->ndpr_stateflags |= NDPRF_DETACHED;
if ((pr->ndpr_stateflags & NDPRF_DETACHED) != 0 &&
- find_pfxlist_reachable_router(pr) != 0)
+ find_pfxlist_reachable_router(pr) != NULL)
pr->ndpr_stateflags &= ~NDPRF_DETACHED;
}
} else {
Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netinet6/raw_ip6.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -163,7 +163,7 @@ rip6_input(struct mbuf **mp, int *offp,
struct mbuf *m = *mp;
register struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
register struct inpcb *in6p;
- struct inpcb *last = 0;
+ struct inpcb *last = NULL;
struct mbuf *opts = NULL;
struct sockaddr_in6 fromsa;
Modified: head/sys/netinet6/udp6_usrreq.c
==============================================================================
--- head/sys/netinet6/udp6_usrreq.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netinet6/udp6_usrreq.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -1212,9 +1212,9 @@ udp6_send(struct socket *so, int flags,
#ifdef INET
if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) {
int hasv4addr;
- struct sockaddr_in6 *sin6 = 0;
+ struct sockaddr_in6 *sin6 = NULL;
- if (addr == 0)
+ if (addr == NULL)
hasv4addr = (inp->inp_vflag & INP_IPV4);
else {
sin6 = (struct sockaddr_in6 *)addr;
Modified: head/sys/netipsec/ipsec_mbuf.c
==============================================================================
--- head/sys/netipsec/ipsec_mbuf.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netipsec/ipsec_mbuf.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -202,7 +202,7 @@ m_pad(struct mbuf *m, int n)
if (pad > M_TRAILINGSPACE(m0)) {
/* Add an mbuf to the chain. */
MGET(m1, M_NOWAIT, MT_DATA);
- if (m1 == 0) {
+ if (m1 == NULL) {
m_freem(m0);
DPRINTF(("%s: unable to get extra mbuf\n", __func__));
return NULL;
Modified: head/sys/netipsec/key.c
==============================================================================
--- head/sys/netipsec/key.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netipsec/key.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -4923,8 +4923,8 @@ key_update(struct socket *so, struct mbu
dport = (struct sadb_x_nat_t_port *)
mhp->ext[SADB_X_EXT_NAT_T_DPORT];
} else {
- type = 0;
- sport = dport = 0;
+ type = NULL;
+ sport = dport = NULL;
}
if (mhp->ext[SADB_X_EXT_NAT_T_OAI] != NULL &&
mhp->ext[SADB_X_EXT_NAT_T_OAR] != NULL) {
@@ -4949,7 +4949,7 @@ key_update(struct socket *so, struct mbu
frag = (struct sadb_x_nat_t_frag *)
mhp->ext[SADB_X_EXT_NAT_T_FRAG];
} else {
- frag = 0;
+ frag = NULL;
}
#endif
@@ -5215,7 +5215,7 @@ key_add(struct socket *so, struct mbuf *
KEY_PORTTOSADDR(&saidx.dst,
dport->sadb_x_nat_t_port_port);
} else {
- type = 0;
+ type = NULL;
}
if (mhp->ext[SADB_X_EXT_NAT_T_OAI] != NULL &&
mhp->ext[SADB_X_EXT_NAT_T_OAR] != NULL) {
@@ -5240,7 +5240,7 @@ key_add(struct socket *so, struct mbuf *
frag = (struct sadb_x_nat_t_frag *)
mhp->ext[SADB_X_EXT_NAT_T_FRAG];
} else {
- frag = 0;
+ frag = NULL;
}
#endif
@@ -6599,7 +6599,7 @@ key_acquire2(struct socket *so, struct m
static int
key_register(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
{
- struct secreg *reg, *newreg = 0;
+ struct secreg *reg, *newreg = NULL;
IPSEC_ASSERT(so != NULL, ("null socket"));
IPSEC_ASSERT(m != NULL, ("null mbuf"));
Modified: head/sys/netipsec/keysock.c
==============================================================================
--- head/sys/netipsec/keysock.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netipsec/keysock.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -92,7 +92,7 @@ key_output(struct mbuf *m, struct socket
struct sadb_msg *msg;
int len, error = 0;
- if (m == 0)
+ if (m == NULL)
panic("%s: NULL pointer was passed.\n", __func__);
PFKEYSTAT_INC(out_total);
@@ -106,7 +106,7 @@ key_output(struct mbuf *m, struct socket
}
if (m->m_len < sizeof(struct sadb_msg)) {
- if ((m = m_pullup(m, sizeof(struct sadb_msg))) == 0) {
+ if ((m = m_pullup(m, sizeof(struct sadb_msg))) == NULL) {
PFKEYSTAT_INC(out_nomem);
error = ENOBUFS;
goto end;
@@ -178,7 +178,7 @@ key_sendup(struct socket *so, struct sad
int tlen;
/* sanity check */
- if (so == 0 || msg == 0)
+ if (so == NULL || msg == NULL)
panic("%s: NULL pointer was passed.\n", __func__);
KEYDEBUG(KEYDEBUG_KEY_DUMP,
@@ -388,7 +388,7 @@ key_attach(struct socket *so, int proto,
/* XXX */
kp = malloc(sizeof *kp, M_PCB, M_WAITOK | M_ZERO);
- if (kp == 0)
+ if (kp == NULL)
return ENOBUFS;
so->so_pcb = (caddr_t)kp;
Modified: head/sys/netipsec/xform_ipcomp.c
==============================================================================
--- head/sys/netipsec/xform_ipcomp.c Fri Apr 15 17:28:24 2016 (r298074)
+++ head/sys/netipsec/xform_ipcomp.c Fri Apr 15 17:30:33 2016 (r298075)
@@ -283,7 +283,7 @@ ipcomp_input_cb(struct cryptop *crp)
/* In case it's not done already, adjust the size of the mbuf chain */
m->m_pkthdr.len = clen + hlen + skip;
- if (m->m_len < skip + hlen && (m = m_pullup(m, skip + hlen)) == 0) {
+ if (m->m_len < skip + hlen && (m = m_pullup(m, skip + hlen)) == NULL) {
IPCOMPSTAT_INC(ipcomps_hdrops); /*XXX*/
DPRINTF(("%s: m_pullup failed\n", __func__));
error = EINVAL; /*XXX*/
More information about the svn-src-head
mailing list