d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbin/ifconfig: Minor housekeeping

Browse Source 
Coalesce adjacent lint ifdefs.
Fix spelling of nitems.

Reviewed by:	kp
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D29022
This commit is contained in:
Ryan Moeller 2021-02-28 02:08:43 +00:00
parent 2803fa471e
commit 88832d59de
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/ifconfig/ifconfig.c
View File

@ -33,9 +33,6 @@
static const char copyright[] =
"@(#) Copyright (c) 1983, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif
@ -215,8 +212,6 @@ ioctl_ifcreate(int s, struct ifreq *ifr)
}
}
#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0])
static int
calcorders(struct ifaddrs *ifa, struct ifa_queue *q)
{
@ -246,7 +241,7 @@ calcorders(struct ifaddrs *ifa, struct ifa_queue *q)
if (ifa->ifa_addr) {
af = ifa->ifa_addr->sa_family;
if (af < ORDERS_SIZE(cur->af_orders) &&
if (af < nitems(cur->af_orders) &&
cur->af_orders[af] == 0)
cur->af_orders[af] = ++ord;
}
@ -297,8 +292,7 @@ cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q)
af1 = a->ifa_addr->sa_family;
af2 = b->ifa_addr->sa_family;
if (af1 < ORDERS_SIZE(e1->af_orders) &&
af2 < ORDERS_SIZE(e1->af_orders))
if (af1 < nitems(e1->af_orders) && af2 < nitems(e1->af_orders))
return (e1->af_orders[af1] - e1->af_orders[af2]);
}
@ -347,8 +341,6 @@ static void setformat(char *input)
free(formatstr);
}
#undef ORDERS_SIZE
static struct ifaddrs *
sortifaddrs(struct ifaddrs *list,
int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *),