From 03a5241ea0a9d2648fc3b74a2062c7c06a155381 Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 20 Aug 2008 01:24:55 +0000 Subject: [PATCH] Fix some of the formatting fixes.. It's amazing how some thing stand out in a commit message. --- sys/netinet/ip_input.c | 2 +- sys/netinet/tcp_hostcache.c | 7 +++---- sys/netinet/tcp_subr.c | 2 +- sys/netinet6/in6.c | 2 +- sys/netinet6/in6_ifattach.c | 2 +- sys/netinet6/nd6.c | 2 +- sys/netinet6/nd6_rtr.c | 2 +- sys/sys/sysctl.h | 3 +-- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 72304083dfc..c852b8d8e4b 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -799,7 +799,7 @@ ip_reass(struct mbuf *m) struct ipq *r = TAILQ_LAST(&V_ipq[i], ipqhead); if (r) { V_ipstat.ips_fragtimeout += - r->ipq_nfrags; + r->ipq_nfrags; ip_freef(&V_ipq[i], r); break; } diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index 3a7e9e129c9..1211838dd0a 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -249,8 +249,8 @@ tcp_hc_init(void) * Allocate the hostcache entries. */ V_tcp_hostcache.zone = - uma_zcreate("hostcache", sizeof(struct hc_metrics), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + uma_zcreate("hostcache", sizeof(struct hc_metrics), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(V_tcp_hostcache.zone, V_tcp_hostcache.cache_limit); /* @@ -670,8 +670,7 @@ tcp_hc_purge(void *arg) for (i = 0; i < V_tcp_hostcache.hashsize; i++) { THC_LOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); TAILQ_FOREACH_SAFE(hc_entry, - &V_tcp_hostcache.hashbase[i].hch_bucket, - rmx_q, hc_next) { + &V_tcp_hostcache.hashbase[i].hch_bucket, rmx_q, hc_next) { if (all || hc_entry->rmx_expire <= 0) { TAILQ_REMOVE(&V_tcp_hostcache.hashbase[i].hch_bucket, hc_entry, rmx_q); diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 5f980784f93..cf7565a60ed 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -942,7 +942,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS) INP_INFO_RLOCK(&V_tcbinfo); for (inp = LIST_FIRST(V_tcbinfo.ipi_listhead), i = 0; - inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) { + inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) { INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt) { /* diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 1b0350e17ba..a6cac29e6ca 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2153,7 +2153,7 @@ in6_setmaxmtu(void) IFNET_RLOCK(); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { /* this function can be called during ifnet initialization */ if (!ifp->if_afdata[AF_INET6]) continue; diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index beadb7594d2..4f40a7a4961 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -875,7 +875,7 @@ in6_tmpaddrtimer(void *ignored_arg) bzero(nullbuf, sizeof(nullbuf)); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { ndi = ND_IFINFO(ifp); if (bcmp(ndi->randomid, nullbuf, sizeof(nullbuf)) != 0) { /* diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 88fae3e3532..94c4401b6a3 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1892,7 +1892,7 @@ nd6_slowtimo(void *ignored_arg) nd6_slowtimo, NULL); IFNET_RLOCK(); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { nd6if = ND_IFINFO(ifp); if (nd6if->basereachable && /* already initialized */ (nd6if->recalctm -= ND6_SLOWTIMER_INTERVAL) <= 0) { diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 73ce04e52dc..3eb49bd60a8 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -847,7 +847,7 @@ nd6_prefix_lookup(struct nd_prefixctl *key) struct nd_prefix *search; for (search = V_nd_prefix.lh_first; - search; search = search->ndpr_next) { + search; search = search->ndpr_next) { if (key->ndpr_ifp == search->ndpr_ifp && key->ndpr_plen == search->ndpr_plen && in6_are_prefix_equal(&key->ndpr_prefix.sin6_addr, diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index e556098f9b3..6c396bb82b4 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -226,8 +226,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #define SYSCTL_NODE(parent, nbr, name, access, handler, descr) \ struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name); \ SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access), \ - (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, \ - "N", descr) + (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, "N", descr) #define SYSCTL_ADD_NODE(ctx, parent, nbr, name, access, handler, descr) \ sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_NODE|(access), \ -- 2.45.0