mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-01 12:19:28 +00:00
Code Issues Releases Activity

ifconfig: eliminate trailing whitespace

Browse Source 
Eliminate trailing whitespace on inet, inet6, and groups lines. I think the
"list txpower" command will still show some, but I'm not able to test that.

PR: 153731
Reported-by: Nikolay Denev <ndenev@gmail.com>
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D19004
This commit is contained in:
Alan Somers 2019-02-26 03:34:47 +00:00
parent 47a7da7612
commit d309dcbcd3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=344559
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/ifconfig/af_inet.c
View File

@ -107,16 +107,16 @@ in_status(int s __unused, const struct ifaddrs *ifa)
if (cidr == 0) if (cidr == 0)
break; break;
} }
printf("/%d ", cidr); printf("/%d", cidr);
} else if (f_inet != NULL && strcmp(f_inet, "dotted") == 0) } else if (f_inet != NULL && strcmp(f_inet, "dotted") == 0)
printf(" netmask %s ", inet_ntoa(sin->sin_addr)); printf(" netmask %s", inet_ntoa(sin->sin_addr));
else else
printf(" netmask 0x%lx ", (unsigned long)ntohl(sin->sin_addr.s_addr)); printf(" netmask 0x%lx", (unsigned long)ntohl(sin->sin_addr.s_addr));
if (ifa->ifa_flags & IFF_BROADCAST) { if (ifa->ifa_flags & IFF_BROADCAST) {
sin = (struct sockaddr_in *)ifa->ifa_broadaddr; sin = (struct sockaddr_in *)ifa->ifa_broadaddr;
if (sin != NULL && sin->sin_addr.s_addr != 0) if (sin != NULL && sin->sin_addr.s_addr != 0)
printf("broadcast %s ", inet_ntoa(sin->sin_addr)); printf(" broadcast %s", inet_ntoa(sin->sin_addr));
} }
print_vhid(ifa, " "); print_vhid(ifa, " ");

34
sbin/ifconfig/af_inet6.c
View File

@ -247,49 +247,49 @@ in6_status(int s __unused, const struct ifaddrs *ifa)
if (sin == NULL) if (sin == NULL)
sin = &null_sin; sin = &null_sin;
if (f_inet6 != NULL && strcmp(f_inet6, "cidr") == 0) if (f_inet6 != NULL && strcmp(f_inet6, "cidr") == 0)
printf("/%d ", prefix(&sin->sin6_addr, printf("/%d", prefix(&sin->sin6_addr,
sizeof(struct in6_addr))); sizeof(struct in6_addr)));
else else
printf(" prefixlen %d ", prefix(&sin->sin6_addr, printf(" prefixlen %d", prefix(&sin->sin6_addr,
sizeof(struct in6_addr))); sizeof(struct in6_addr)));
if ((flags6 & IN6_IFF_ANYCAST) != 0) if ((flags6 & IN6_IFF_ANYCAST) != 0)
printf("anycast "); printf(" anycast");
if ((flags6 & IN6_IFF_TENTATIVE) != 0) if ((flags6 & IN6_IFF_TENTATIVE) != 0)
printf("tentative "); printf(" tentative");
if ((flags6 & IN6_IFF_DUPLICATED) != 0) if ((flags6 & IN6_IFF_DUPLICATED) != 0)
printf("duplicated "); printf(" duplicated");
if ((flags6 & IN6_IFF_DETACHED) != 0) if ((flags6 & IN6_IFF_DETACHED) != 0)
printf("detached "); printf(" detached");
if ((flags6 & IN6_IFF_DEPRECATED) != 0) if ((flags6 & IN6_IFF_DEPRECATED) != 0)
printf("deprecated "); printf(" deprecated");
if ((flags6 & IN6_IFF_AUTOCONF) != 0) if ((flags6 & IN6_IFF_AUTOCONF) != 0)
printf("autoconf "); printf(" autoconf");
if ((flags6 & IN6_IFF_TEMPORARY) != 0) if ((flags6 & IN6_IFF_TEMPORARY) != 0)
printf("temporary "); printf(" temporary");
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
printf("prefer_source "); printf(" prefer_source");
if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id) if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id)
printf("scopeid 0x%x ", printf(" scopeid 0x%x",
((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id); ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
printf("pltime "); printf(" pltime");
if (lifetime.ia6t_preferred) { if (lifetime.ia6t_preferred) {
printf("%s ", lifetime.ia6t_preferred < now.tv_sec printf(" %s", lifetime.ia6t_preferred < now.tv_sec
? "0" : ? "0" :
sec2str(lifetime.ia6t_preferred - now.tv_sec)); sec2str(lifetime.ia6t_preferred - now.tv_sec));
} else } else
printf("infty "); printf(" infty");
printf("vltime "); printf(" vltime");
if (lifetime.ia6t_expire) { if (lifetime.ia6t_expire) {
printf("%s ", lifetime.ia6t_expire < now.tv_sec printf(" %s", lifetime.ia6t_expire < now.tv_sec
? "0" : ? "0" :
sec2str(lifetime.ia6t_expire - now.tv_sec)); sec2str(lifetime.ia6t_expire - now.tv_sec));
} else } else
printf("infty "); printf(" infty");
} }
print_vhid(ifa, " "); print_vhid(ifa, " ");

2
sbin/ifconfig/ifconfig.c
View File

@ -1405,7 +1405,7 @@ print_vhid(const struct ifaddrs *ifa, const char *s)
if (ifd->ifi_vhid == 0) if (ifd->ifi_vhid == 0)
return; return;
printf("vhid %d ", ifd->ifi_vhid); printf(" vhid %d", ifd->ifi_vhid);
} }
void void

4
sbin/ifconfig/ifgroup.c
View File

@ -113,9 +113,9 @@ getifgroups(int s)
len -= sizeof(struct ifg_req); len -= sizeof(struct ifg_req);
if (strcmp(ifg->ifgrq_group, "all")) { if (strcmp(ifg->ifgrq_group, "all")) {
if (cnt == 0) if (cnt == 0)
printf("\tgroups: "); printf("\tgroups:");
cnt++; cnt++;
printf("%s ", ifg->ifgrq_group); printf(" %s", ifg->ifgrq_group);
} }
} }
if (cnt) if (cnt)