Page MenuHomeFreeBSD
Files F107788994

D19004.diff
No OneTemporary
Actions

D19004.diff
View Options

Index: head/sbin/ifconfig/af_inet.c
===================================================================
--- head/sbin/ifconfig/af_inet.c
+++ head/sbin/ifconfig/af_inet.c
@@ -107,16 +107,16 @@
if (cidr == 0)
break;
}
- printf("/%d ", cidr);
+ printf("/%d", cidr);
} 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
- 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) {
sin = (struct sockaddr_in *)ifa->ifa_broadaddr;
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, " ");
Index: head/sbin/ifconfig/af_inet6.c
===================================================================
--- head/sbin/ifconfig/af_inet6.c
+++ head/sbin/ifconfig/af_inet6.c
@@ -247,49 +247,49 @@
if (sin == NULL)
sin = &null_sin;
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)));
else
- printf(" prefixlen %d ", prefix(&sin->sin6_addr,
+ printf(" prefixlen %d", prefix(&sin->sin6_addr,
sizeof(struct in6_addr)));
if ((flags6 & IN6_IFF_ANYCAST) != 0)
- printf("anycast ");
+ printf(" anycast");
if ((flags6 & IN6_IFF_TENTATIVE) != 0)
- printf("tentative ");
+ printf(" tentative");
if ((flags6 & IN6_IFF_DUPLICATED) != 0)
- printf("duplicated ");
+ printf(" duplicated");
if ((flags6 & IN6_IFF_DETACHED) != 0)
- printf("detached ");
+ printf(" detached");
if ((flags6 & IN6_IFF_DEPRECATED) != 0)
- printf("deprecated ");
+ printf(" deprecated");
if ((flags6 & IN6_IFF_AUTOCONF) != 0)
- printf("autoconf ");
+ printf(" autoconf");
if ((flags6 & IN6_IFF_TEMPORARY) != 0)
- printf("temporary ");
+ printf(" temporary");
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
- printf("prefer_source ");
+ printf(" prefer_source");
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);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
- printf("pltime ");
+ printf(" pltime");
if (lifetime.ia6t_preferred) {
- printf("%s ", lifetime.ia6t_preferred < now.tv_sec
+ printf(" %s", lifetime.ia6t_preferred < now.tv_sec
? "0" :
sec2str(lifetime.ia6t_preferred - now.tv_sec));
} else
- printf("infty ");
+ printf(" infty");
- printf("vltime ");
+ printf(" vltime");
if (lifetime.ia6t_expire) {
- printf("%s ", lifetime.ia6t_expire < now.tv_sec
+ printf(" %s", lifetime.ia6t_expire < now.tv_sec
? "0" :
sec2str(lifetime.ia6t_expire - now.tv_sec));
} else
- printf("infty ");
+ printf(" infty");
}
print_vhid(ifa, " ");
Index: head/sbin/ifconfig/ifconfig.c
===================================================================
--- head/sbin/ifconfig/ifconfig.c
+++ head/sbin/ifconfig/ifconfig.c
@@ -1405,7 +1405,7 @@
if (ifd->ifi_vhid == 0)
return;
- printf("vhid %d ", ifd->ifi_vhid);
+ printf(" vhid %d", ifd->ifi_vhid);
}
void
Index: head/sbin/ifconfig/ifgroup.c
===================================================================
--- head/sbin/ifconfig/ifgroup.c
+++ head/sbin/ifconfig/ifgroup.c
@@ -113,9 +113,9 @@
len -= sizeof(struct ifg_req);
if (strcmp(ifg->ifgrq_group, "all")) {
if (cnt == 0)
- printf("\tgroups: ");
+ printf("\tgroups:");
cnt++;
- printf("%s ", ifg->ifgrq_group);
+ printf(" %s", ifg->ifgrq_group);
}
}
if (cnt)

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 19, 5:17 AM (21 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15925976
Default Alt Text
D19004.diff (3 KB)

Event Timeline