From f178a5be317b02070511f3a345abb8e34e40899d Mon Sep 17 00:00:00 2001 From: rwatson Date: Sun, 2 Jan 2005 15:13:59 +0000 Subject: Trim trailing whitespace. --- sys/netipx/ipx.c | 6 +++--- sys/netipx/ipx_cksum.c | 2 +- sys/netipx/ipx_if.h | 2 +- sys/netipx/ipx_input.c | 6 +++--- sys/netipx/ipx_ip.c | 6 +++--- sys/netipx/ipx_pcb.c | 12 ++++++------ sys/netipx/ipx_proto.c | 2 +- sys/netipx/ipx_usrreq.c | 12 ++++++------ sys/netipx/spx_usrreq.c | 26 +++++++++++++------------- 9 files changed, 37 insertions(+), 37 deletions(-) (limited to 'sys') diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c index 840f802..337ffe3 100644 --- a/sys/netipx/ipx.c +++ b/sys/netipx/ipx.c @@ -30,7 +30,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * @(#)ipx.c */ @@ -204,7 +204,7 @@ ipx_control(so, cmd, data, ifp, td) } IFAFREE((&oia->ia_ifa)); return (0); - + case SIOCAIFADDR: dstIsNew = 0; hostIsNew = 1; @@ -241,7 +241,7 @@ ipx_control(so, cmd, data, ifp, td) static void ipx_ifscrub(ifp, ia) register struct ifnet *ifp; - register struct ipx_ifaddr *ia; + register struct ipx_ifaddr *ia; { if (ia->ia_flags & IFA_ROUTE) { if (ifp->if_flags & IFF_POINTOPOINT) { diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c index b63b807..c6a3e4f 100644 --- a/sys/netipx/ipx_cksum.c +++ b/sys/netipx/ipx_cksum.c @@ -100,7 +100,7 @@ ipx_cksum(struct mbuf *m, int len) { w++; if (--len == 0) break; - } + } } ipx->ipx_tc = oldtc; diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h index 13bc607..8bd5337 100644 --- a/sys/netipx/ipx_if.h +++ b/sys/netipx/ipx_if.h @@ -30,7 +30,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * @(#)ipx_if.h * * $FreeBSD$ diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c index c20d543..f518db3 100644 --- a/sys/netipx/ipx_input.c +++ b/sys/netipx/ipx_input.c @@ -215,7 +215,7 @@ ipxintr(struct mbuf *m) */ for (ia = ipx_ifaddr; ia != NULL; ia = ia->ia_next) if((ia->ia_ifa.ifa_ifp == m->m_pkthdr.rcvif) && - ipx_neteq(ia->ia_addr.sipx_addr, + ipx_neteq(ia->ia_addr.sipx_addr, ipx->ipx_dna)) goto ours; @@ -484,8 +484,8 @@ struct ifnet *ifp; if (ifp == ia->ia_ifp) break; if (ia == NULL) - ipx->ipx_sna.x_host = ipx_zerohost; - else + ipx->ipx_sna.x_host = ipx_zerohost; + else ipx->ipx_sna.x_host = ia->ia_addr.sipx_addr.x_host; diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index c706674..1344e20 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -30,7 +30,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * @(#)ipx_ip.c */ @@ -346,7 +346,7 @@ ipxip_route(so, sopt) register struct in_ifaddr *ia; struct ifnet *ifp = ro.ro_rt->rt_ifp; - for (ia = TAILQ_FIRST(&in_ifaddrhead); ia != NULL; + for (ia = TAILQ_FIRST(&in_ifaddrhead); ia != NULL; ia = TAILQ_NEXT(ia, ia_link)) if (ia->ia_ifp == ifp) break; @@ -385,7 +385,7 @@ ipxip_route(so, sopt) (struct ifnet *)ifn, sopt->sopt_td); /* use any of our addresses */ - satoipx_addr(ifr_ipxip.ifr_addr).x_host = + satoipx_addr(ifr_ipxip.ifr_addr).x_host = ipx_ifaddr->ia_addr.sipx_addr.x_host; return (ipx_control(so, (int)SIOCSIFADDR, (caddr_t)&ifr_ipxip, diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 1457511..b697616 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include static struct ipx_addr zeroipx_addr; -static u_short ipxpcb_lport_cache; +static u_short ipxpcb_lport_cache; int ipx_pcballoc(so, head, td) @@ -73,7 +73,7 @@ ipx_pcballoc(so, head, td) so->so_pcb = (caddr_t)ipxp; return (0); } - + int ipx_pcbbind(ipxp, nam, td) register struct ipxpcb *ipxp; @@ -185,7 +185,7 @@ ipx_pcbconnect(ipxp, nam, td) rtalloc_ign(ro, 0); } if (ipx_neteqnn(ipxp->ipxp_laddr.x_net, ipx_zeronet)) { - /* + /* * If route is known or can be allocated now, * our src addr is taken from the i/f, else punt. */ @@ -214,7 +214,7 @@ ipx_pcbconnect(ipxp, nam, td) ipxp->ipxp_laddr.x_net = satoipx_addr(ia->ia_addr).x_net; } if (ipx_nullhost(ipxp->ipxp_laddr)) { - /* + /* * If route is known or can be allocated now, * our src addr is taken from the i/f, else punt. */ @@ -286,7 +286,7 @@ ipx_setsockaddr(ipxp, nam) struct sockaddr **nam; { struct sockaddr_ipx *sipx, ssipx; - + sipx = &ssipx; bzero((caddr_t)sipx, sizeof(*sipx)); sipx->sipx_len = sizeof(*sipx); @@ -301,7 +301,7 @@ ipx_setpeeraddr(ipxp, nam) struct sockaddr **nam; { struct sockaddr_ipx *sipx, ssipx; - + sipx = &ssipx; bzero((caddr_t)sipx, sizeof(*sipx)); sipx->sipx_len = sizeof(*sipx); diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c index d4998d5..22b8027 100644 --- a/sys/netipx/ipx_proto.c +++ b/sys/netipx/ipx_proto.c @@ -94,7 +94,7 @@ static struct protosw ipxsw[] = { }; static struct domain ipxdomain = - { AF_IPX, "network systems", 0, 0, 0, + { AF_IPX, "network systems", 0, 0, 0, ipxsw, &ipxsw[sizeof(ipxsw)/sizeof(ipxsw[0])], 0, rn_inithead, 16, sizeof(struct sockaddr_ipx)}; diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 6277d78..47acdb1 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -82,7 +82,7 @@ static int ipx_connect(struct socket *so, struct sockaddr *nam, static int ipx_detach(struct socket *so); static int ipx_disconnect(struct socket *so); static int ipx_send(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, + struct sockaddr *addr, struct mbuf *control, struct thread *td); static int ipx_shutdown(struct socket *so); static int ripx_attach(struct socket *so, int proto, struct thread *td); @@ -142,7 +142,7 @@ ipx_input(m, ipxp) if (ipx_neteqnn(ipx->ipx_sna.x_net, ipx_zeronet) && ifp != NULL) { register struct ifaddr *ifa; - for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa != NULL; + for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa != NULL; ifa = TAILQ_NEXT(ifa, ifa_link)) { if (ifa->ifa_addr->sa_family == AF_IPX) { ipx_ipx.sipx_addr.x_net = @@ -225,7 +225,7 @@ ipx_output(ipxp, m0) /* * Make sure packet is actually of even length. */ - + if (len & 1) { m = mprev; if ((m->m_flags & M_EXT) == 0 && @@ -308,7 +308,7 @@ ipx_output(ipxp, m0) &satoipx_addr(ro->ro_dst); dst->x_host = ipx->ipx_dna.x_host; } - /* + /* * Otherwise, we go through the same gateway * and dst is already set up. */ @@ -351,7 +351,7 @@ ipx_ctloutput(so, sopt) case SO_IPX_CHECKSUM: mask = IPXP_CHECKSUM; goto get_flags; - + case SO_HEADERS_ON_OUTPUT: mask = IPXP_RAWOUT; get_flags: @@ -370,7 +370,7 @@ ipx_ctloutput(so, sopt) break; case SO_SEQNO: - error = sooptcopyout(sopt, &ipx_pexseq, + error = sooptcopyout(sopt, &ipx_pexseq, sizeof ipx_pexseq); ipx_pexseq++; break; diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index ee01292..a03541b 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -74,9 +74,9 @@ static struct spx spx_savesi; static struct spx_istat spx_istat; /* Following was struct spxstat spxstat; */ -#ifndef spxstat +#ifndef spxstat #define spxstat spx_istat.newstats -#endif +#endif static const int spx_backoff[SPX_MAXRXTSHIFT+1] = { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 }; @@ -103,7 +103,7 @@ static int spx_listen(struct socket *so, struct thread *td); static int spx_rcvd(struct socket *so, int flags); static int spx_rcvoob(struct socket *so, struct mbuf *m, int flags); static int spx_send(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, + struct sockaddr *addr, struct mbuf *control, struct thread *td); static int spx_shutdown(struct socket *so); static int spx_sp_attach(struct socket *so, int proto, struct thread *td); @@ -924,7 +924,7 @@ again: if (rcv_win > 0) { u_short delta = 1 + cb->s_alo - cb->s_ack; int adv = rcv_win - (delta * cb->s_mtu); - + if ((so->so_rcv.sb_cc == 0 && adv >= (2 * cb->s_mtu)) || (100 * adv / so->so_rcv.sb_hiwat >= 35)) { spxstat.spxs_sndwinup++; @@ -979,7 +979,7 @@ send: if (rcv_win < 0) rcv_win = 0; alo = cb->s_ack - 1 + (rcv_win / ((short)cb->s_mtu)); - if (SSEQ_LT(alo, cb->s_alo)) + if (SSEQ_LT(alo, cb->s_alo)) alo = cb->s_alo; if (si != NULL) { @@ -1033,7 +1033,7 @@ send: if (cb->s_force != (1 + SPXT_PERSIST) || cb->s_timer[SPXT_PERSIST] == 0) { /* - * If this is a new packet and we are not currently + * If this is a new packet and we are not currently * timing anything, time this one. */ if (SSEQ_LT(cb->s_smax, si->si_seq)) { @@ -1177,12 +1177,12 @@ spx_ctloutput(so, sopt) break; case SO_LAST_HEADER: - error = sooptcopyout(sopt, &cb->s_rhdr, + error = sooptcopyout(sopt, &cb->s_rhdr, sizeof cb->s_rhdr); break; case SO_DEFAULT_HEADERS: - error = sooptcopyout(sopt, &cb->s_shdr, + error = sooptcopyout(sopt, &cb->s_shdr, sizeof cb->s_shdr); break; @@ -1360,7 +1360,7 @@ spx_attach(so, proto, td) SPXT_RANGESET(cb->s_rxtcur, ((SPXTV_SRTTBASE >> 2) + (SPXTV_SRTTDFLT << 2)) >> 1, SPXTV_MIN, SPXTV_REXMTMAX); - ipxp->ipxp_pcb = (caddr_t)cb; + ipxp->ipxp_pcb = (caddr_t)cb; spx_attach_end: splx(s); return (error); @@ -1371,14 +1371,14 @@ spx_bind(so, nam, td) struct socket *so; struct sockaddr *nam; struct thread *td; -{ +{ struct ipxpcb *ipxp; ipxp = sotoipxpcb(so); return (ipx_pcbbind(ipxp, nam, td)); -} - +} + /* * Initiate connection to peer. * Enter SYN_SENT state, and mark socket as connecting. @@ -1588,7 +1588,7 @@ spx_send_end: static int spx_shutdown(so) - struct socket *so; + struct socket *so; { int error; int s; -- cgit v1.1