From ab989c3551ccf8bae5af0bc1ec3136fda599ff8d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 12 May 2016 23:07:59 +0200 Subject: [PATCH] PPP: Use LWIP_ARRAYSIZE at appropriate places Use LWIP_ARRAYSIZE to simplify the code. Signed-off-by: Axel Lin Reviewed-by: Sylvain Rochet [Sylvain Rochet : added missing casts] Signed-off-by: Sylvain Rochet --- src/netif/ppp/ccp.c | 3 +-- src/netif/ppp/chap-new.c | 2 +- src/netif/ppp/eap.c | 11 ++++------- src/netif/ppp/ipcp.c | 2 +- src/netif/ppp/ipv6cp.c | 2 +- src/netif/ppp/lcp.c | 2 +- src/netif/ppp/upap.c | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/netif/ppp/ccp.c b/src/netif/ppp/ccp.c index 66b97de5..69b69592 100644 --- a/src/netif/ppp/ccp.c +++ b/src/netif/ppp/ccp.c @@ -1533,8 +1533,7 @@ static int ccp_printpkt(const u_char *p, int plen, void (*printer) (void *, cons if (len < HEADERLEN || len > plen) return 0; - if (code >= 1 && code <= (int)(sizeof(ccp_codenames) / sizeof(char *)) - && ccp_codenames[code-1] != NULL) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(ccp_codenames) && ccp_codenames[code-1] != NULL) printer(arg, " %s", ccp_codenames[code-1]); else printer(arg, " code=0x%x", code); diff --git a/src/netif/ppp/chap-new.c b/src/netif/ppp/chap-new.c index 475f22c5..9e7e66c5 100644 --- a/src/netif/ppp/chap-new.c +++ b/src/netif/ppp/chap-new.c @@ -604,7 +604,7 @@ static int chap_print_pkt(const unsigned char *p, int plen, if (len < CHAP_HDRLEN || len > plen) return 0; - if (code >= 1 && code <= (int)sizeof(chap_code_names) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(chap_code_names)) printer(arg, " %s", chap_code_names[code-1]); else printer(arg, " code=0x%x", code); diff --git a/src/netif/ppp/eap.c b/src/netif/ppp/eap.c index 5e044786..8fb56368 100644 --- a/src/netif/ppp/eap.c +++ b/src/netif/ppp/eap.c @@ -2146,7 +2146,7 @@ static int eap_printpkt(const u_char *inp, int inlen, void (*printer) (void *, c if (len < EAP_HEADERLEN || len > inlen) return (0); - if (code >= 1 && code <= (int)sizeof(eap_codenames) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(eap_codenames)) printer(arg, " %s", eap_codenames[code-1]); else printer(arg, " code=0x%x", code); @@ -2160,8 +2160,7 @@ static int eap_printpkt(const u_char *inp, int inlen, void (*printer) (void *, c } GETCHAR(rtype, inp); len--; - if (rtype >= 1 && - rtype <= (int)sizeof (eap_typenames) / (int)sizeof (char *)) + if (rtype >= 1 && rtype <= (int)LWIP_ARRAYSIZE(eap_typenames)) printer(arg, " %s", eap_typenames[rtype-1]); else printer(arg, " type=0x%x", rtype); @@ -2299,8 +2298,7 @@ static int eap_printpkt(const u_char *inp, int inlen, void (*printer) (void *, c break; GETCHAR(rtype, inp); len--; - if (rtype >= 1 && - rtype <= (int)sizeof (eap_typenames) / (int)sizeof (char *)) + if (rtype >= 1 && rtype <= (int)LWIP_ARRAYSIZE(eap_typenames)) printer(arg, " %s", eap_typenames[rtype-1]); else printer(arg, " type=0x%x", rtype); @@ -2323,8 +2321,7 @@ static int eap_printpkt(const u_char *inp, int inlen, void (*printer) (void *, c GETCHAR(rtype, inp); len--; printer(arg, " = 1 && - rtype < (int)sizeof (eap_typenames) / (int)sizeof (char *)) + if (rtype >= 1 && rtype < (int)LWIP_ARRAYSIZE(eap_typenames)) printer(arg, " (%s)", eap_typenames[rtype-1]); printer(arg, ">"); break; diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c index 4b91424d..c42fdf76 100644 --- a/src/netif/ppp/ipcp.c +++ b/src/netif/ppp/ipcp.c @@ -2244,7 +2244,7 @@ static int ipcp_printpkt(const u_char *p, int plen, if (len < HEADERLEN || len > plen) return 0; - if (code >= 1 && code <= (int)sizeof(ipcp_codenames) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(ipcp_codenames)) printer(arg, " %s", ipcp_codenames[code-1]); else printer(arg, " code=0x%x", code); diff --git a/src/netif/ppp/ipv6cp.c b/src/netif/ppp/ipv6cp.c index 61a26709..f02558e0 100644 --- a/src/netif/ppp/ipv6cp.c +++ b/src/netif/ppp/ipv6cp.c @@ -1416,7 +1416,7 @@ static int ipv6cp_printpkt(const u_char *p, int plen, if (len < HEADERLEN || len > plen) return 0; - if (code >= 1 && code <= (int)sizeof(ipv6cp_codenames) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(ipv6cp_codenames)) printer(arg, " %s", ipv6cp_codenames[code-1]); else printer(arg, " code=0x%x", code); diff --git a/src/netif/ppp/lcp.c b/src/netif/ppp/lcp.c index d3df1ba5..233b68c9 100644 --- a/src/netif/ppp/lcp.c +++ b/src/netif/ppp/lcp.c @@ -2393,7 +2393,7 @@ static int lcp_printpkt(const u_char *p, int plen, if (len < HEADERLEN || len > plen) return 0; - if (code >= 1 && code <= (int)sizeof(lcp_codenames) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(lcp_codenames)) printer(arg, " %s", lcp_codenames[code-1]); else printer(arg, " code=0x%x", code); diff --git a/src/netif/ppp/upap.c b/src/netif/ppp/upap.c index 524c996b..fd391af6 100644 --- a/src/netif/ppp/upap.c +++ b/src/netif/ppp/upap.c @@ -614,7 +614,7 @@ static int upap_printpkt(const u_char *p, int plen, void (*printer) (void *, con if (len < UPAP_HEADERLEN || len > plen) return 0; - if (code >= 1 && code <= (int)sizeof(upap_codenames) / (int)sizeof(char *)) + if (code >= 1 && code <= (int)LWIP_ARRAYSIZE(upap_codenames)) printer(arg, " %s", upap_codenames[code-1]); else printer(arg, " code=0x%x", code);