Skip to content

Commit 04a3b05

Browse files
liweitianuxliweitianux
committed
netstat(1): Whitespace cleanups
1 parent c92088d commit 04a3b05

File tree

2 files changed

+56
-59
lines changed

2 files changed

+56
-59
lines changed

‎usr.bin/netstat/main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ main(int argc, char **argv)
299299
break;
300300
case 'p':
301301
if ((tp = name2protox(optarg)) == NULL) {
302-
errx(1,
302+
errx(1,
303303
"%s: unknown or uninstrumented protocol",
304304
optarg);
305305
}
@@ -479,7 +479,7 @@ printproto(struct protox *tp, const char *name, u_long ncpusaddr)
479479
tp->pr_name);
480480
return;
481481
}
482-
off = tp->pr_usesysctl ? tp->pr_usesysctl
482+
off = tp->pr_usesysctl ? tp->pr_usesysctl
483483
: nl[tp->pr_sindex].n_value;
484484
}
485485
} else {
@@ -509,22 +509,22 @@ kread(u_long addr, char *buf, int size)
509509
kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf);
510510
if (kvmd != NULL) {
511511
if (kvm_nlist(kvmd, nl) < 0) {
512-
if(nlistf)
512+
if (nlistf)
513513
errx(1, "%s: kvm_nlist: %s", nlistf,
514514
kvm_geterr(kvmd));
515515
else
516516
errx(1, "kvm_nlist: %s", kvm_geterr(kvmd));
517517
}
518518

519519
if (nl[0].n_type == 0) {
520-
if(nlistf)
520+
if (nlistf)
521521
errx(1, "%s: no namelist", nlistf);
522522
else
523523
errx(1, "no namelist");
524524
}
525525
} else {
526526
warnx("kvm not available");
527-
return(-1);
527+
return (-1);
528528
}
529529
}
530530
if (!buf)

‎usr.bin/netstat/route.c

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ p_tree(struct radix_node *rn)
450450
if (rnode.rn_flags & RNF_ROOT) {
451451
if (Aflag)
452452
printf("(root node)%s",
453-
rnode.rn_dupedkey ? " =>\n" : "\n");
453+
rnode.rn_dupedkey ? " =>\n" : "\n");
454454
} else if (do_rtent) {
455455
if (kget(rn, rtentry) == 0) {
456456
p_rtentry(&rtentry);
@@ -490,14 +490,15 @@ p_rtnode(void)
490490
return;
491491
} else {
492492
sprintf(nbuf, "(%d)", rnode.rn_bit);
493-
printf("%6.6s %8.8lx : %8.8lx", nbuf, (u_long)rnode.rn_left, (u_long)rnode.rn_right);
493+
printf("%6.6s %8.8lx : %8.8lx", nbuf,
494+
(u_long)rnode.rn_left, (u_long)rnode.rn_right);
494495
}
495496
while (rm) {
496497
if (kget(rm, rmask) != 0)
497498
break;
498499
sprintf(nbuf, " %d refs, ", rmask.rm_refs);
499-
printf(" mk = %8.8lx {(%d),%s",
500-
(u_long)rm, -1 - rmask.rm_bit, rmask.rm_refs ? nbuf : " ");
500+
printf(" mk = %8.8lx {(%d),%s", (u_long)rm,
501+
-1 - rmask.rm_bit, rmask.rm_refs ? nbuf : " ");
501502
if (rmask.rm_flags & RNF_NORMAL) {
502503
struct radix_node rnode_aux;
503504
printf(" <normal>, ");
@@ -625,11 +626,9 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags)
625626
{
626627
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
627628

628-
if ((sin->sin_addr.s_addr == INADDR_ANY) &&
629-
mask &&
630-
ntohl(((struct sockaddr_in *)mask)->sin_addr.s_addr)
631-
==0L)
632-
cp = "default" ;
629+
if ((sin->sin_addr.s_addr == INADDR_ANY) && mask &&
630+
ntohl(((struct sockaddr_in *)mask)->sin_addr.s_addr) ==0L)
631+
cp = "default" ;
633632
else if (flags & RTF_HOST)
634633
cp = routename(sin->sin_addr.s_addr);
635634
else if (mask)
@@ -653,19 +652,19 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags)
653652
*/
654653
if (IN6_IS_ADDR_LINKLOCAL(in6) ||
655654
IN6_IS_ADDR_MC_LINKLOCAL(in6)) {
656-
/* XXX: override is ok? */
657-
sa6->sin6_scope_id = (u_int32_t)ntohs(*(u_short *)&in6->s6_addr[2]);
658-
*(u_short *)&in6->s6_addr[2] = 0;
655+
/* XXX: override is ok? */
656+
sa6->sin6_scope_id =
657+
(u_int32_t)ntohs(*(u_short *)&in6->s6_addr[2]);
658+
*(u_short *)&in6->s6_addr[2] = 0;
659659
}
660660

661661
if (flags & RTF_HOST)
662-
cp = routename6(sa6);
662+
cp = routename6(sa6);
663663
else if (mask)
664-
cp = netname6(sa6,
665-
&((struct sockaddr_in6 *)mask)->sin6_addr);
666-
else {
667-
cp = netname6(sa6, NULL);
668-
}
664+
cp = netname6(sa6,
665+
&((struct sockaddr_in6 *)mask)->sin6_addr);
666+
else
667+
cp = netname6(sa6, NULL);
669668
break;
670669
}
671670
#endif /*INET6*/
@@ -681,7 +680,7 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags)
681680

682681
if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 &&
683682
sdl->sdl_slen == 0)
684-
(void) sprintf(workbuf, "link#%d", sdl->sdl_index);
683+
sprintf(workbuf, "link#%d", sdl->sdl_index);
685684
else
686685
switch (sdl->sdl_type) {
687686

@@ -721,7 +720,7 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags)
721720
while (s < slim && cq < cqlim) {
722721
cq += sprintf(cq, " %02x", *s++);
723722
if (s < slim)
724-
cq += sprintf(cq, "%02x", *s++);
723+
cq += sprintf(cq, "%02x", *s++);
725724
}
726725
cp = workbuf;
727726
}
@@ -794,7 +793,7 @@ p_rtentry(struct rtentry *rt)
794793
if (rt->rt_ifp != lastif) {
795794
if (kget(rt->rt_ifp, ifnet) == 0)
796795
strlcpy(prettyname, ifnet.if_xname,
797-
sizeof(prettyname));
796+
sizeof(prettyname));
798797
else
799798
strlcpy(prettyname, "---", sizeof(prettyname));
800799
lastif = rt->rt_ifp;
@@ -860,7 +859,7 @@ routename(u_long in)
860859
#define C(x) ((x) & 0xff)
861860
in = ntohl(in);
862861
sprintf(line, "%lu.%lu.%lu.%lu",
863-
C(in >> 24), C(in >> 16), C(in >> 8), C(in));
862+
C(in >> 24), C(in >> 16), C(in >> 8), C(in));
864863
}
865864
return (line);
866865
}
@@ -882,7 +881,7 @@ forgemask(u_long a)
882881
static void
883882
domask(char *dst, u_long addr, u_long mask)
884883
{
885-
int b, i;
884+
int b, bb, i;
886885

887886
if (!mask || (forgemask(addr) == mask)) {
888887
*dst = '\0';
@@ -891,8 +890,6 @@ domask(char *dst, u_long addr, u_long mask)
891890
i = 0;
892891
for (b = 0; b < 32; b++)
893892
if (mask & (1 << b)) {
894-
int bb;
895-
896893
i = b;
897894
for (bb = b+1; bb < 32; bb++)
898895
if (!(mask & (1 << bb))) {
@@ -974,35 +971,35 @@ netname6(struct sockaddr_in6 *sa6, struct in6_addr *mask)
974971
if (mask) {
975972
for (masklen = 0, lim = p + 16; p < lim; p++) {
976973
switch (*p) {
977-
case 0xff:
978-
masklen += 8;
979-
break;
980-
case 0xfe:
981-
masklen += 7;
982-
break;
983-
case 0xfc:
984-
masklen += 6;
985-
break;
986-
case 0xf8:
987-
masklen += 5;
988-
break;
989-
case 0xf0:
990-
masklen += 4;
991-
break;
992-
case 0xe0:
993-
masklen += 3;
994-
break;
995-
case 0xc0:
996-
masklen += 2;
997-
break;
998-
case 0x80:
999-
masklen += 1;
1000-
break;
1001-
case 0x00:
1002-
break;
1003-
default:
1004-
illegal ++;
1005-
break;
974+
case 0xff:
975+
masklen += 8;
976+
break;
977+
case 0xfe:
978+
masklen += 7;
979+
break;
980+
case 0xfc:
981+
masklen += 6;
982+
break;
983+
case 0xf8:
984+
masklen += 5;
985+
break;
986+
case 0xf0:
987+
masklen += 4;
988+
break;
989+
case 0xe0:
990+
masklen += 3;
991+
break;
992+
case 0xc0:
993+
masklen += 2;
994+
break;
995+
case 0x80:
996+
masklen += 1;
997+
break;
998+
case 0x00:
999+
break;
1000+
default:
1001+
illegal ++;
1002+
break;
10061003
}
10071004
}
10081005
if (illegal)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy