From c58dfa2156af736597fc5bc1bb0d1f484f240822 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Fri, 5 Feb 2010 10:08:41 +0000 Subject: [PATCH] Added missing casts to suppress compiler warnings --- src/netif/ppp/auth.c | 2 +- src/netif/ppp/chap.c | 6 +++--- src/netif/ppp/pap.c | 4 ++-- src/netif/ppp/ppp_oe.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/netif/ppp/auth.c b/src/netif/ppp/auth.c index 8e3db104..0d722bf2 100644 --- a/src/netif/ppp/auth.c +++ b/src/netif/ppp/auth.c @@ -1093,7 +1093,7 @@ get_secret(int unit, char *client, char *server, char *secret, int *secret_len, return 0; } - len = strlen(ppp_settings.passwd); + len = (int)strlen(ppp_settings.passwd); if (len > MAXSECRETLEN) { AUTHDEBUG((LOG_ERR, "Secret for %s on %s is too long\n", client, server)); len = MAXSECRETLEN; diff --git a/src/netif/ppp/chap.c b/src/netif/ppp/chap.c index 016b61f9..0003c0cc 100644 --- a/src/netif/ppp/chap.c +++ b/src/netif/ppp/chap.c @@ -714,7 +714,7 @@ ChapSendChallenge(chap_state *cstate) int outlen; chal_len = cstate->chal_len; - name_len = strlen(cstate->chal_name); + name_len = (int)strlen(cstate->chal_name); outlen = CHAP_HEADERLEN + sizeof (u_char) + chal_len + name_len; outp = outpacket_buf[cstate->unit]; @@ -754,7 +754,7 @@ ChapSendStatus(chap_state *cstate, int code) } else { strcpy(msg, "I don't like you. Go 'way."); } - msglen = strlen(msg); + msglen = (int)strlen(msg); outlen = CHAP_HEADERLEN + msglen; outp = outpacket_buf[cstate->unit]; @@ -814,7 +814,7 @@ ChapSendResponse(chap_state *cstate) int outlen, md_len, name_len; md_len = cstate->resp_length; - name_len = strlen(cstate->resp_name); + name_len = (int)strlen(cstate->resp_name); outlen = CHAP_HEADERLEN + sizeof (u_char) + md_len + name_len; outp = outpacket_buf[cstate->unit]; diff --git a/src/netif/ppp/pap.c b/src/netif/ppp/pap.c index bf9b3a5d..c0620cb3 100644 --- a/src/netif/ppp/pap.c +++ b/src/netif/ppp/pap.c @@ -166,9 +166,9 @@ upap_authwithpeer(int unit, char *user, char *password) /* Save the username and password we're given */ u->us_user = user; - u->us_userlen = strlen(user); + u->us_userlen = (int)strlen(user); u->us_passwd = password; - u->us_passwdlen = strlen(password); + u->us_passwdlen = (int)strlen(password); u->us_transmits = 0; diff --git a/src/netif/ppp/ppp_oe.c b/src/netif/ppp/ppp_oe.c index 7cae2dfb..4dedf2e2 100644 --- a/src/netif/ppp/ppp_oe.c +++ b/src/netif/ppp/ppp_oe.c @@ -787,11 +787,11 @@ pppoe_send_padi(struct pppoe_softc *sc) /* calculate length of frame (excluding ethernet header + pppoe header) */ len = 2 + 2 + 2 + 2 + sizeof sc; /* service name tag is required, host unique is send too */ if (sc->sc_service_name != NULL) { - l1 = strlen(sc->sc_service_name); + l1 = (int)strlen(sc->sc_service_name); len += l1; } if (sc->sc_concentrator_name != NULL) { - l2 = strlen(sc->sc_concentrator_name); + l2 = (int)strlen(sc->sc_concentrator_name); len += 2 + 2 + l2; } LWIP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",