diff options
author | pfg <pfg@FreeBSD.org> | 2016-04-15 17:30:33 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-04-15 17:30:33 +0000 |
commit | 12232f84636cebecfa250541cfbf09b07fe2f520 (patch) | |
tree | 98ee835e82a915a778aa14e68e7285dcd4e077f6 /sys/netipsec | |
parent | e0bee002cf61bb0e2600dd61f3d7b41689818973 (diff) | |
download | FreeBSD-src-12232f84636cebecfa250541cfbf09b07fe2f520.zip FreeBSD-src-12232f84636cebecfa250541cfbf09b07fe2f520.tar.gz |
sys/net* : for pointers replace 0 with NULL.
Mostly cosmetical, no functional change.
Found with devel/coccinelle.
Diffstat (limited to 'sys/netipsec')
-rw-r--r-- | sys/netipsec/ipsec_mbuf.c | 2 | ||||
-rw-r--r-- | sys/netipsec/key.c | 12 | ||||
-rw-r--r-- | sys/netipsec/keysock.c | 8 | ||||
-rw-r--r-- | sys/netipsec/xform_ipcomp.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c index b3df0e0..7111210 100644 --- a/sys/netipsec/ipsec_mbuf.c +++ b/sys/netipsec/ipsec_mbuf.c @@ -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; diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 865a630..7070c1d 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -4923,8 +4923,8 @@ key_update(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp) 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 mbuf *m, const struct sadb_msghdr *mhp) 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 *m, const struct sadb_msghdr *mhp) 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 *m, const struct sadb_msghdr *mhp) 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 mbuf *m, const struct sadb_msghdr *mhp) 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")); diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 4d12957..73e54bb 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -92,7 +92,7 @@ key_output(struct mbuf *m, struct socket *so, ...) 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 *so, ...) } 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 sadb_msg *msg, u_int len, int target) 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, struct thread *td) /* 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; diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index 122fc72..ae19d8d 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -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*/ |