ll_type_n2a: use ARRAY_SIZE

Replace open coded version of array size computation.
And fix whitespace.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

1 files changed, 69 insertions, 70 deletions

diff --git a/lib/ll_types.c b/lib/ll_types.c
index fa57ceb5c..20183ad60 100644
--- a/lib/ll_types.c
+++ b/lib/ll_types.c
@@ -22,78 +22,78 @@
 #include "rt_names.h"
 #include "utils.h"
 
-const char * ll_type_n2a(int type, char *buf, int len)
+const char *ll_type_n2a(int type, char *buf, int len)
 {
 #define __PF(f,n) { ARPHRD_##f, #n },
 static const struct {
 	int type;
 	const char *name;
 } arphrd_names[] = {
-__PF(NETROM,netrom)
-__PF(ETHER,ether)
-__PF(EETHER,eether)
-__PF(AX25,ax25)
-__PF(PRONET,pronet)
-__PF(CHAOS,chaos)
-__PF(IEEE802,ieee802)
-__PF(ARCNET,arcnet)
-__PF(APPLETLK,atalk)
-__PF(DLCI,dlci)
-__PF(ATM,atm)
-__PF(METRICOM,metricom)
-__PF(IEEE1394,ieee1394)
-__PF(INFINIBAND,infiniband)
-__PF(SLIP,slip)
-__PF(CSLIP,cslip)
-__PF(SLIP6,slip6)
-__PF(CSLIP6,cslip6)
-__PF(RSRVD,rsrvd)
-__PF(ADAPT,adapt)
-__PF(ROSE,rose)
-__PF(X25,x25)
-__PF(HWX25,hwx25)
-__PF(CAN,can)
-__PF(PPP,ppp)
-__PF(HDLC,hdlc)
-__PF(LAPB,lapb)
-__PF(DDCMP,ddcmp)
-__PF(RAWHDLC,rawhdlc)
-__PF(TUNNEL,ipip)
-__PF(TUNNEL6,tunnel6)
-__PF(FRAD,frad)
-__PF(SKIP,skip)
-__PF(LOOPBACK,loopback)
-__PF(LOCALTLK,ltalk)
-__PF(FDDI,fddi)
-__PF(BIF,bif)
-__PF(SIT,sit)
-__PF(IPDDP,ip/ddp)
-__PF(IPGRE,gre)
-__PF(PIMREG,pimreg)
-__PF(HIPPI,hippi)
-__PF(ASH,ash)
-__PF(ECONET,econet)
-__PF(IRDA,irda)
-__PF(FCPP,fcpp)
-__PF(FCAL,fcal)
-__PF(FCPL,fcpl)
-__PF(FCFABRIC,fcfb0)
-__PF(FCFABRIC+1,fcfb1)
-__PF(FCFABRIC+2,fcfb2)
-__PF(FCFABRIC+3,fcfb3)
-__PF(FCFABRIC+4,fcfb4)
-__PF(FCFABRIC+5,fcfb5)
-__PF(FCFABRIC+6,fcfb6)
-__PF(FCFABRIC+7,fcfb7)
-__PF(FCFABRIC+8,fcfb8)
-__PF(FCFABRIC+9,fcfb9)
-__PF(FCFABRIC+10,fcfb10)
-__PF(FCFABRIC+11,fcfb11)
-__PF(FCFABRIC+12,fcfb12)
-__PF(IEEE802_TR,tr)
-__PF(IEEE80211,ieee802.11)
-__PF(IEEE80211_PRISM,ieee802.11/prism)
-__PF(IEEE80211_RADIOTAP,ieee802.11/radiotap)
+__PF(NETROM, netrom)
+__PF(ETHER, ether)
+__PF(EETHER, eether)
+__PF(AX25, ax25)
+__PF(PRONET, pronet)
+__PF(CHAOS, chaos)
+__PF(IEEE802, ieee802)
+__PF(ARCNET, arcnet)
+__PF(APPLETLK, atalk)
+__PF(DLCI, dlci)
+__PF(ATM, atm)
+__PF(METRICOM, metricom)
+__PF(IEEE1394, ieee1394)
+__PF(INFINIBAND, infiniband)
+__PF(SLIP, slip)
+__PF(CSLIP, cslip)
+__PF(SLIP6, slip6)
+__PF(CSLIP6, cslip6)
+__PF(RSRVD, rsrvd)
+__PF(ADAPT, adapt)
+__PF(ROSE, rose)
+__PF(X25, x25)
+__PF(HWX25, hwx25)
+__PF(CAN, can)
+__PF(PPP, ppp)
+__PF(HDLC, hdlc)
+__PF(LAPB, lapb)
+__PF(DDCMP, ddcmp)
+__PF(RAWHDLC, rawhdlc)
+__PF(TUNNEL, ipip)
+__PF(TUNNEL6, tunnel6)
+__PF(FRAD, frad)
+__PF(SKIP, skip)
+__PF(LOOPBACK, loopback)
+__PF(LOCALTLK, ltalk)
+__PF(FDDI, fddi)
+__PF(BIF, bif)
+__PF(SIT, sit)
+__PF(IPDDP, ip/ddp)
+__PF(IPGRE, gre)
+__PF(PIMREG, pimreg)
+__PF(HIPPI, hippi)
+__PF(ASH, ash)
+__PF(ECONET, econet)
+__PF(IRDA, irda)
+__PF(FCPP, fcpp)
+__PF(FCAL, fcal)
+__PF(FCPL, fcpl)
+__PF(FCFABRIC, fcfb0)
+__PF(FCFABRIC+1, fcfb1)
+__PF(FCFABRIC+2, fcfb2)
+__PF(FCFABRIC+3, fcfb3)
+__PF(FCFABRIC+4, fcfb4)
+__PF(FCFABRIC+5, fcfb5)
+__PF(FCFABRIC+6, fcfb6)
+__PF(FCFABRIC+7, fcfb7)
+__PF(FCFABRIC+8, fcfb8)
+__PF(FCFABRIC+9, fcfb9)
+__PF(FCFABRIC+10, fcfb10)
+__PF(FCFABRIC+11, fcfb11)
+__PF(FCFABRIC+12, fcfb12)
+__PF(IEEE802_TR, tr)
+__PF(IEEE80211, ieee802.11)
+__PF(IEEE80211_PRISM, ieee802.11/prism)
+__PF(IEEE80211_RADIOTAP, ieee802.11/radiotap)
 __PF(IEEE802154, ieee802.15.4)
 __PF(IEEE802154_MONITOR, ieee802.15.4/monitor)
 __PF(PHONET, phonet)
@@ -102,14 +102,13 @@ __PF(CAIF, caif)
 __PF(IP6GRE, gre6)
 __PF(NETLINK, netlink)
 __PF(6LOWPAN, 6lowpan)
-
 __PF(NONE, none)
-__PF(VOID,void)
+__PF(VOID, void)
 };
 #undef __PF
 
-        int i;
-        for (i=0; !numeric && i<sizeof(arphrd_names)/sizeof(arphrd_names[0]); i++) {
+	unsigned int i;
+        for (i = 0; !numeric && i < ARRAY_SIZE(arphrd_names); i++) {
                  if (arphrd_names[i].type == type)
 			return arphrd_names[i].name;
 	}