diff options
author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-09-11 05:38:48 +0000 |
---|---|---|
committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-09-11 05:38:48 +0000 |
commit | 3077f36a703beaa821b0880e5d2c796015b4ec88 (patch) | |
tree | a6145baccb2d0e038dbff8fa573509dee74a47b7 | |
parent | cc5f852b94d363dd33a348bfa1259aa75881c49a (diff) |
KNF - return is not a function.
-rw-r--r-- | sys/net/if.c | 4 | ||||
-rw-r--r-- | sys/net/if_arcsubr.c | 6 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 6 | ||||
-rw-r--r-- | sys/net/if_loop.c | 4 | ||||
-rw-r--r-- | sys/net/if_media.c | 4 | ||||
-rw-r--r-- | sys/net/if_sl.c | 4 | ||||
-rw-r--r-- | sys/net/if_spppsubr.c | 6 | ||||
-rw-r--r-- | sys/net/if_strip.c | 28 | ||||
-rw-r--r-- | sys/net/pf.c | 4 | ||||
-rw-r--r-- | sys/net/raw_usrreq.c | 4 | ||||
-rw-r--r-- | sys/net/route.c | 4 |
11 files changed, 37 insertions, 37 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 3c8a4472731..1d703fca524 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.63 2002/07/03 21:19:08 miod Exp $ */ +/* $OpenBSD: if.c,v 1.64 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1035,7 +1035,7 @@ ifconf(cmd, data) } } ifc->ifc_len = space; - return(0); + return (0); } ifrp = ifc->ifc_req; diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index fba64dab5d8..9ef0598cf37 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_arcsubr.c,v 1.11 2002/06/30 13:04:35 itojun Exp $ */ +/* $OpenBSD: if_arcsubr.c,v 1.12 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_arcsubr.c,v 1.8 1996/05/07 02:40:29 thorpej Exp $ */ /* @@ -107,7 +107,7 @@ arc_output(ifp, m0, dst, rt0) ALTQ_DECL(struct altq_pktattr pktattr;) if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) - return(ENETDOWN); /* m, m1 aren't initialized yet */ + return (ENETDOWN); /* m, m1 aren't initialized yet */ error = newencoding = 0; ac = (struct arccom *)ifp; @@ -427,7 +427,7 @@ arc_defrag(ifp, m) /* is it the last one? */ if (af->af_lastseen > af->af_maxflag) { af->af_packet = NULL; - return(m1); + return (m1); } else return NULL; } diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 10572afca1a..046778961f7 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.65 2002/06/30 13:04:36 itojun Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.66 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -302,7 +302,7 @@ ether_output(ifp, m0, dst, rt0) #ifdef INET6 case AF_INET6: if (!nd6_storelladdr(ifp, rt, m, dst, (u_char *)edst)) - return(0); /* it must be impossible, but... */ + return (0); /* it must be impossible, but... */ etype = htons(ETHERTYPE_IPV6); break; #endif @@ -1260,7 +1260,7 @@ ether_addmulti(ifr, ac) error = ether_multiaddr(&ifr->ifr_addr, addrlo, addrhi); if (error != 0) { splx(s); - return(error); + return (error); } /* diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 3f40ef0adc6..2a15e53f12c 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_loop.c,v 1.24 2002/06/30 13:04:36 itojun Exp $ */ +/* $OpenBSD: if_loop.c,v 1.25 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* @@ -278,7 +278,7 @@ looutput(ifp, m, dst, rt) M_PREPEND(m, sizeof(int32_t), M_DONTWAIT); if (m == 0) - return(ENOBUFS); + return (ENOBUFS); afp = mtod(m, int32_t *); *afp = (int32_t)dst->sa_family; diff --git a/sys/net/if_media.c b/sys/net/if_media.c index 3f5fc45d939..06662c6d32c 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.c,v 1.7 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if_media.c,v 1.8 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */ /*- @@ -226,7 +226,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) int error = 0, sticky; if (ifp == NULL || ifr == NULL || ifm == NULL) - return(EINVAL); + return (EINVAL); switch (cmd) { diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 576d29dea16..b7e413803d5 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sl.c,v 1.16 2002/06/30 13:04:36 itojun Exp $ */ +/* $OpenBSD: if_sl.c,v 1.17 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $ */ /* @@ -298,7 +298,7 @@ slopen(dev, tp) error = clalloc(&tp->t_outq, 3*SLMTU, 0); if (error) { splx(s); - return(error); + return (error); } } else sc->sc_oldbufsize = sc->sc_oldbufquot = 0; diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 544f13d9f09..5c682c610d7 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.14 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.15 2002/09/11 05:38:47 itojun Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -695,9 +695,9 @@ sppp_output(struct ifnet *ifp, struct mbuf *m, m_freem(m); splx(s); if(ip->ip_p == IPPROTO_TCP) - return(EADDRNOTAVAIL); + return (EADDRNOTAVAIL); else - return(0); + return (0); } diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c index d340eaffa4a..825f81fc6ab 100644 --- a/sys/net/if_strip.c +++ b/sys/net/if_strip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_strip.c,v 1.21 2002/07/30 23:30:50 itojun Exp $ */ +/* $OpenBSD: if_strip.c,v 1.22 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $ */ /* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */ @@ -482,7 +482,7 @@ stripopen(dev, tp) error = clalloc(&tp->t_outq, 3*SLMTU, 0); if (error) { splx(s); - return(error); + return (error); } } else sc->sc_oldbufsize = sc->sc_oldbufquot = 0; @@ -692,7 +692,7 @@ strip_send(sc, m0) if (time.tv_sec >= sc->sc_statetimo && sc->sc_state == ST_ALIVE) strip_proberadio(sc, tp); - return(m0); + return (m0); } @@ -762,7 +762,7 @@ stripoutput(ifp, m, dst, rt) DPRINTF(("strip: could not arp starmode addr %x\n", ((struct sockaddr_in *)dst)->sin_addr.s_addr)); m_freem(m); - return(EHOSTUNREACH); + return (EHOSTUNREACH); } /*bcopy(LLADDR(SDL(rt->rt_gateway)), dldst, ifp->if_addrlen);*/ dldst = LLADDR(SDL(rt->rt_gateway)); @@ -805,7 +805,7 @@ stripoutput(ifp, m, dst, rt) M_PREPEND(m, sizeof(struct st_header), M_DONTWAIT); if (m == 0) { DPRINTF(("strip: could not prepend starmode header\n")); - return(ENOBUFS); + return (ENOBUFS); } @@ -1672,7 +1672,7 @@ strip_newpacket(sc, ptr, end) /* XXX redundant copy */ bcopy(sc->sc_rxbuf, sc->sc_buf, packetlen ); - return(packetlen); + return (packetlen); } @@ -1724,7 +1724,7 @@ StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr) u_char *code_ptr = *code_ptr_ptr; u_char code = Stuff_NoCode, count = 0; - if (!length) return(dest); + if (!length) return (dest); if (code_ptr) { /* Recover state from last call, if applicable */ code = (*code_ptr ^ Stuff_Magic) & Stuff_CodeMask; @@ -1818,7 +1818,7 @@ StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr) StuffData_FinishBlock(code + count); } - return(dest); + return (dest); } @@ -1852,7 +1852,7 @@ UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) /* Sanity check */ if (!src || !end || !dst || !dst_length) - return(NULL); + return (NULL); while (src < end && dst < dst_end) { @@ -1861,7 +1861,7 @@ UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) { case Stuff_Diff: if (src+1+count >= end) - return(NULL); + return (NULL); do { *dst++ = *++src ^ Stuff_Magic; @@ -1877,7 +1877,7 @@ UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) break; case Stuff_DiffZero: if (src+1+count >= end) - return(NULL); + return (NULL); do { *dst++ = *++src ^ Stuff_Magic; @@ -1890,7 +1890,7 @@ UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) break; case Stuff_Same: if (src+1 >= end) - return(NULL); + return (NULL); do { *dst++ = src[1] ^ Stuff_Magic; @@ -1916,9 +1916,9 @@ UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) } if (dst < dst_end) - return(NULL); + return (NULL); else - return(src); + return (src); } diff --git a/sys/net/pf.c b/sys/net/pf.c index 042a7495b07..91eda53aa1e 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.243 2002/08/28 15:43:02 pefo Exp $ */ +/* $OpenBSD: pf.c,v 1.244 2002/09/11 05:38:47 itojun Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -3150,7 +3150,7 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct ifnet *ifp, sizeof(opt6), NULL, NULL, pd2.af)) { DPFPRINTF(PF_DEBUG_MISC, ("pf: ICMPv6 short opt\n")); - return(PF_DROP); + return (PF_DROP); } if (pd2.proto == IPPROTO_AH) off2 += (opt6.ip6e_len + 2) * 4; diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index a4cc2293e3b..b8a24beb077 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_usrreq.c,v 1.5 2002/03/15 18:19:52 millert Exp $ */ +/* $OpenBSD: raw_usrreq.c,v 1.6 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: raw_usrreq.c,v 1.11 1996/02/13 22:00:43 christos Exp $ */ /* @@ -283,7 +283,7 @@ raw_usrreq(so, req, m, nam, control) */ case PRU_RCVOOB: case PRU_RCVD: - return(EOPNOTSUPP); + return (EOPNOTSUPP); case PRU_LISTEN: case PRU_ACCEPT: diff --git a/sys/net/route.c b/sys/net/route.c index 177967d7ae4..81a4b24eb71 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.33 2002/07/11 12:29:03 art Exp $ */ +/* $OpenBSD: route.c,v 1.34 2002/09/11 05:38:47 itojun Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -789,7 +789,7 @@ rtinit(ifa, cmd, flags) if ((flags & RTF_HOST) == 0 && ifa->ifa_netmask) { m = m_get(M_DONTWAIT, MT_SONAME); if (m == NULL) - return(ENOBUFS); + return (ENOBUFS); deldst = mtod(m, struct sockaddr *); rt_maskedcopy(dst, deldst, ifa->ifa_netmask); dst = deldst; |