From c1cd65bae8f239788bdc9970e9d4c4ae4e51868d Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 24 Mar 2002 10:19:10 +0000 Subject: [PATCH] Fixed some style bugs in the removal of __P(()). Continuation lines were not outdented to preserve non-KNF lining up of code with parentheses. Switch to KNF formatting. --- sys/netinet/if_ether.h | 2 +- sys/netinet/in_pcb.h | 5 ++--- sys/netinet/in_var.h | 2 +- sys/netinet/ip_mroute.c | 4 ++-- sys/netinet/tcp_input.c | 2 +- sys/netinet/tcp_reass.c | 2 +- sys/netinet/tcp_usrreq.c | 6 +++--- sys/netinet/udp_usrreq.c | 6 +++--- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index a61bbee7a60..6b31758a1e3 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -115,7 +115,7 @@ extern u_char ether_ipmulticast_max[ETHER_ADDR_LEN]; extern struct ifqueue arpintrq; int arpresolve(struct ifnet *, struct rtentry *, struct mbuf *, - struct sockaddr *, u_char *, struct rtentry *); + struct sockaddr *, u_char *, struct rtentry *); void arp_ifinit(struct ifnet *, struct ifaddr *); #endif diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 36aaa079df9..74f3a948b21 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -321,9 +321,8 @@ struct inpcb * in_pcblookup_local(struct inpcbinfo *, struct in_addr, u_int, int); struct inpcb * - in_pcblookup_hash(struct inpcbinfo *, - struct in_addr, u_int, struct in_addr, u_int, - int, struct ifnet *); + in_pcblookup_hash(struct inpcbinfo *, struct in_addr, u_int, + struct in_addr, u_int, int, struct ifnet *); void in_pcbnotifyall(struct inpcbhead *, struct in_addr, int, void (*)(struct inpcb *, int)); void in_pcbrehash(struct inpcb *); diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 2e17ee3d487..4ccc4cd6c2f 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -226,7 +226,7 @@ struct route; struct in_multi *in_addmulti(struct in_addr *, struct ifnet *); void in_delmulti(struct in_multi *); int in_control(struct socket *, u_long, caddr_t, struct ifnet *, - struct thread *); + struct thread *); void in_rtqdrain(void); void ip_input(struct mbuf *); int in_ifadown(struct ifaddr *ifa, int); diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 4847b6d54c5..f9fa8cd7fa0 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -42,8 +42,8 @@ #ifndef MROUTING extern u_long _ip_mcast_src(int vifi); -extern int _ip_mforward(struct ip *ip, struct ifnet *ifp, - struct mbuf *m, struct ip_moptions *imo); +extern int _ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, + struct ip_moptions *imo); extern int _ip_mrouter_done(void); extern int _ip_mrouter_get(struct socket *so, struct sockopt *sopt); extern int _ip_mrouter_set(struct socket *so, struct sockopt *sopt); diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b1a392f262b..71684d091b3 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -134,7 +134,7 @@ static void tcp_dooptions(struct tcpopt *, u_char *, int, int); static void tcp_pulloutofband(struct socket *, struct tcphdr *, struct mbuf *, int); static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, - struct mbuf *); + struct mbuf *); static void tcp_xmit_timer(struct tcpcb *, int); static int tcp_newreno(struct tcpcb *, struct tcphdr *); diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index b1a392f262b..71684d091b3 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -134,7 +134,7 @@ static void tcp_dooptions(struct tcpopt *, u_char *, int, int); static void tcp_pulloutofband(struct socket *, struct tcphdr *, struct mbuf *, int); static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, - struct mbuf *); + struct mbuf *); static void tcp_xmit_timer(struct tcpcb *, int); static int tcp_newreno(struct tcpcb *, struct tcphdr *); diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index e95ba64f69e..e1f4c1a8a9e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -89,11 +89,11 @@ extern char *tcpstates[]; /* XXX ??? */ static int tcp_attach(struct socket *, struct thread *td); -static int tcp_connect(struct tcpcb *, struct sockaddr *, - struct thread *td); +static int tcp_connect(struct tcpcb *, struct sockaddr *, + struct thread *td); #ifdef INET6 static int tcp6_connect(struct tcpcb *, struct sockaddr *, - struct thread *td); + struct thread *td); #endif /* INET6 */ static struct tcpcb * tcp_disconnect(struct tcpcb *); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 6a09dcd9cba..79ada7ff661 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -126,15 +126,15 @@ struct udp_ip6 { } udp_ip6; #endif /* INET6 */ -static void udp_append(struct inpcb *last, struct ip *ip, - struct mbuf *n, int off); +static void udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, + int off); #ifdef INET6 static void ip_2_ip6_hdr(struct ip6_hdr *ip6, struct ip *ip); #endif static int udp_detach(struct socket *so); static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, - struct mbuf *, struct thread *); + struct mbuf *, struct thread *); void udp_init()