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

Replace N #defines with nitems to simplify ifconfig code slightly

Browse Source 
MFC after: 1 week
This commit is contained in:
Enji Cooper 2015-09-27 07:51:18 +00:00
parent f1bbec5a6f
commit abd7105060
15 changed files with 23 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/ifconfig/af_inet6.c
View File

@ -521,7 +521,6 @@ static struct option in6_Lopt = {
static __constructor void
inet6_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
#ifndef RESCUE
@ -529,9 +528,8 @@ inet6_ctor(void)
return;
#endif
for (i = 0; i < N(inet6_cmds); i++)
for (i = 0; i < nitems(inet6_cmds); i++)
cmd_register(&inet6_cmds[i]);
af_register(&af_inet6);
opt_register(&in6_Lopt);
#undef N
}

4
sbin/ifconfig/carp.c
View File

@ -217,11 +217,9 @@ static struct afswtch af_carp = {
static __constructor void
carp_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(carp_cmds); i++)
for (i = 0; i < nitems(carp_cmds); i++)
cmd_register(&carp_cmds[i]);
af_register(&af_carp);
#undef N
}

4
sbin/ifconfig/ifbridge.c
View File

@ -749,11 +749,9 @@ static struct afswtch af_bridge = {
static __constructor void
bridge_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(bridge_cmds); i++)
for (i = 0; i < nitems(bridge_cmds); i++)
cmd_register(&bridge_cmds[i]);
af_register(&af_bridge);
#undef N
}

8
sbin/ifconfig/ifclone.c
View File

@ -32,9 +32,9 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <net/if.h>
@ -184,11 +184,9 @@ static struct option clone_Copt = { .opt = "C", .opt_usage = "[-C]", .cb = clone
static __constructor void
clone_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(clone_cmds); i++)
for (i = 0; i < nitems(clone_cmds); i++)
cmd_register(&clone_cmds[i]);
opt_register(&clone_Copt);
#undef N
}

10
sbin/ifconfig/ifconfig.c
View File

@ -43,11 +43,11 @@ static const char rcsid[] =
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/module.h>
#include <sys/linker.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <net/ethernet.h>
#include <net/if.h>
@ -604,7 +604,6 @@ cmd_register(struct cmd *p)
static const struct cmd *
cmd_lookup(const char *name, int iscreate)
{
#define N(a) (sizeof(a)/sizeof(a[0]))
const struct cmd *p;
for (p = cmds; p != NULL; p = p->c_next)
@ -618,7 +617,6 @@ cmd_lookup(const char *name, int iscreate)
}
}
return NULL;
#undef N
}
struct callback {
@ -1387,10 +1385,8 @@ static struct cmd basic_cmds[] = {
static __constructor void
ifconfig_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(basic_cmds); i++)
for (i = 0; i < nitems(basic_cmds); i++)
cmd_register(&basic_cmds[i]);
#undef N
}

4
sbin/ifconfig/iffib.c
View File

@ -113,11 +113,9 @@ static struct afswtch af_fib = {
static __constructor void
fib_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(fib_cmds); i++)
for (i = 0; i < nitems(fib_cmds); i++)
cmd_register(&fib_cmds[i]);
af_register(&af_fib);
#undef N
}

4
sbin/ifconfig/ifgre.c
View File

@ -113,11 +113,9 @@ static struct afswtch af_gre = {
static __constructor void
gre_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(gre_cmds); i++)
for (i = 0; i < nitems(gre_cmds); i++)
cmd_register(&gre_cmds[i]);
af_register(&af_gre);
#undef N
}

6
sbin/ifconfig/ifgroup.c
View File

@ -28,7 +28,7 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
@ -174,12 +174,10 @@ static struct option group_gopt = { "g:", "[-g groupname]", printgroup };
static __constructor void
group_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(group_cmds); i++)
for (i = 0; i < nitems(group_cmds); i++)
cmd_register(&group_cmds[i]);
af_register(&af_group);
opt_register(&group_gopt);
#undef N
}

12
sbin/ifconfig/ifieee80211.c
View File

@ -2856,7 +2856,6 @@ printrsnie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
static void
printwpsie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
u_int8_t len = ie[1];
printf("%s", tag);
@ -2897,7 +2896,7 @@ printwpsie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
break;
case IEEE80211_WPS_DEV_PASS_ID:
n = LE_READ_2(ie);
if (n < N(dev_pass_id))
if (n < nitems(dev_pass_id))
printf(" dpi:%s", dev_pass_id[n]);
break;
case IEEE80211_WPS_UUID_E:
@ -2911,7 +2910,6 @@ printwpsie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen)
}
printf(">");
}
#undef N
}
static void
@ -3418,7 +3416,6 @@ list_stations(int s)
static const char *
mesh_linkstate_string(uint8_t state)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
static const char *state_names[] = {
[0] = "IDLE",
[1] = "OPEN-TX",
@ -3428,13 +3425,12 @@ mesh_linkstate_string(uint8_t state)
[5] = "HOLDING",
};
if (state >= N(state_names)) {
if (state >= nitems(state_names)) {
static char buf[10];
snprintf(buf, sizeof(buf), "#%u", state);
return buf;
} else
return state_names[state];
#undef N
}
static const char *
@ -5320,12 +5316,10 @@ static struct afswtch af_ieee80211 = {
static __constructor void
ieee80211_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(ieee80211_cmds); i++)
for (i = 0; i < nitems(ieee80211_cmds); i++)
cmd_register(&ieee80211_cmds[i]);
af_register(&af_ieee80211);
clone_setdefcallback("wlan", wlan_create);
#undef N
}

4
sbin/ifconfig/iflagg.c
View File

@ -308,11 +308,9 @@ static struct afswtch af_lagg = {
static __constructor void
lagg_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(lagg_cmds); i++)
for (i = 0; i < nitems(lagg_cmds); i++)
cmd_register(&lagg_cmds[i]);
af_register(&af_lagg);
#undef N
}

4
sbin/ifconfig/ifmac.c
View File

@ -111,11 +111,9 @@ static struct afswtch af_mac = {
static __constructor void
mac_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(mac_cmds); i++)
for (i = 0; i < nitems(mac_cmds); i++)
cmd_register(&mac_cmds[i]);
af_register(&af_mac);
#undef N
}

4
sbin/ifconfig/ifmedia.c
View File

@ -845,11 +845,9 @@ static struct afswtch af_media = {
static __constructor void
ifmedia_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(media_cmds); i++)
for (i = 0; i < nitems(media_cmds); i++)
cmd_register(&media_cmds[i]);
af_register(&af_media);
#undef N
}

6
sbin/ifconfig/ifpfsync.c
View File

@ -26,7 +26,7 @@
* $FreeBSD$
*/
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@ -227,11 +227,9 @@ static struct afswtch af_pfsync = {
static __constructor void
pfsync_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
int i;
for (i = 0; i < N(pfsync_cmds); i++)
for (i = 0; i < nitems(pfsync_cmds); i++)
cmd_register(&pfsync_cmds[i]);
af_register(&af_pfsync);
#undef N
}

4
sbin/ifconfig/ifvlan.c
View File

@ -194,13 +194,11 @@ static struct afswtch af_vlan = {
static __constructor void
vlan_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(vlan_cmds); i++)
for (i = 0; i < nitems(vlan_cmds); i++)
cmd_register(&vlan_cmds[i]);
af_register(&af_vlan);
callback_register(vlan_cb, NULL);
clone_setdefcallback("vlan", vlan_create);
#undef N
}

4
sbin/ifconfig/ifvxlan.c
View File

@ -635,13 +635,11 @@ static struct afswtch af_vxlan = {
static __constructor void
vxlan_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
for (i = 0; i < N(vxlan_cmds); i++)
for (i = 0; i < nitems(vxlan_cmds); i++)
cmd_register(&vxlan_cmds[i]);
af_register(&af_vxlan);
callback_register(vxlan_cb, NULL);
clone_setdefcallback("vxlan", vxlan_create);
#undef N
}