diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-06-08 22:19:29 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-06-08 22:19:29 +0000 |
| commit | baa8616302995c1c67c5cef16e393a8c4d170abd (patch) | |
| tree | f3ca42f6e4e832b7857d6d008a125d4a78753a66 /sys/netinet6/raw_ip6.c | |
| parent | 93ed54a4e7d31d795814bcc1348460ce921aa7e6 (diff) | |
More damned eye searing whitespace. No change to .o files.
Diffstat (limited to 'sys/netinet6/raw_ip6.c')
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 00f0bf52257..83a8d75c14a 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.73 2015/03/04 11:10:55 mpi Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.74 2015/06/08 22:19:28 krw Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -503,7 +503,7 @@ rip6_output(struct mbuf *m, ...) * Raw IPv6 socket option processing. */ int -rip6_ctloutput(int op, struct socket *so, int level, int optname, +rip6_ctloutput(int op, struct socket *so, int level, int optname, struct mbuf **mp) { struct inpcb *inp = sotoinpcb(so); @@ -517,17 +517,17 @@ rip6_ctloutput(int op, struct socket *so, int level, int optname, case IP_DIVERTFL: switch (op) { case PRCO_SETOPT: - if (*mp == 0 || (*mp)->m_len < sizeof (int)) { + if (*mp == NULL || (*mp)->m_len < sizeof(int)) { error = EINVAL; break; } dir = *mtod(*mp, int *); if (inp->inp_divertfl > 0) error = ENOTSUP; - else if ((dir & IPPROTO_DIVERT_RESP) || + else if ((dir & IPPROTO_DIVERT_RESP) || (dir & IPPROTO_DIVERT_INIT)) inp->inp_divertfl = dir; - else + else error = EINVAL; break; @@ -588,7 +588,7 @@ extern u_long rip6_sendspace; extern u_long rip6_recvspace; int -rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, +rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct proc *p) { struct inpcb *in6p = sotoinpcb(so); @@ -650,7 +650,7 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, soisdisconnected(so); /* FALLTHROUGH */ case PRU_DETACH: - if (in6p == 0) + if (in6p == NULL) panic("rip6_detach"); #ifdef MROUTING if (so == ip6_mrouter) |