diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-18 18:59:13 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-18 18:59:13 +0000 |
| commit | 1b65330884a219adaf7b5d0a6a83988604b49ee0 (patch) | |
| tree | fbd020e1c0bf3d98d48b83745d5bf8baefe57cfc | |
| parent | 807fd8cdd7805b67fdb6c62e6425ad52bf27487f (diff) | |
split long "if" case (cosmetic; preparation for KNF)
| -rw-r--r-- | sys/netinet6/raw_ipv6.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/netinet6/raw_ipv6.c b/sys/netinet6/raw_ipv6.c index aa6502d4ebc..f43e870c205 100644 --- a/sys/netinet6/raw_ipv6.c +++ b/sys/netinet6/raw_ipv6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ipv6.c,v 1.19 2000/06/18 18:41:36 itojun Exp $ */ +/* $OpenBSD: raw_ipv6.c,v 1.20 2000/06/18 18:59:12 itojun Exp $ */ /* %%% copyright-nrl-95 @@ -44,7 +44,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ipv6.c,v 1.19 2000/06/18 18:41:36 itojun Exp $ + * $Id: raw_ipv6.c,v 1.20 2000/06/18 18:59:12 itojun Exp $ */ #include <sys/param.h> @@ -241,7 +241,8 @@ rip6_input(mp, offp, proto) if (nexthdr == IPPROTO_ICMPV6) { if (m->m_len < extra + sizeof(struct icmp6_hdr)) { - if (!(m = m_pullup2(m, extra + sizeof(struct icmp6_hdr)))) + m = m_pullup2(m, extra + sizeof(struct icmp6_hdr)); + if (!m) goto ret; ip6 = mtod(m, struct ip6_hdr *); @@ -454,9 +455,9 @@ int rip6_output(struct mbuf *m, ...) } /* source address selection */ - if ((in6a = in6_selectsrc(dst, optp, inp->inp_moptions6, - &inp->inp_route6, &inp->inp_laddr6, - &error)) == 0) { + in6a = in6_selectsrc(dst, optp, inp->inp_moptions6, &inp->inp_route6, + &inp->inp_laddr6, &error); + if (in6a == NULL) { if (error == 0) error = EADDRNOTAVAIL; goto bad; |