From bbf80b05c8f7463b99d99a537c5c3131ce5022eb Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Wed, 12 Sep 2018 22:22:10 +0200 Subject: [PATCH] ppp: fix implicit conversion from size_t to u8_t Found when compiling with VS2017 --- src/netif/ppp/fsm.c | 2 +- src/netif/ppp/upap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c index 81eba116..b1f08aff 100644 --- a/src/netif/ppp/fsm.c +++ b/src/netif/ppp/fsm.c @@ -236,7 +236,7 @@ static void terminate_layer(fsm *f, int nextstate) { */ void fsm_close(fsm *f, const char *reason) { f->term_reason = reason; - f->term_reason_len = (reason == NULL? 0: LWIP_MIN(strlen(reason), 0xFF) ); + f->term_reason_len = (reason == NULL? 0: (u8_t)LWIP_MIN(strlen(reason), 0xFF) ); switch( f->state ){ case PPP_FSM_STARTING: f->state = PPP_FSM_INITIAL; diff --git a/src/netif/ppp/upap.c b/src/netif/ppp/upap.c index d00c2d76..3b2399dc 100644 --- a/src/netif/ppp/upap.c +++ b/src/netif/ppp/upap.c @@ -159,9 +159,9 @@ void upap_authwithpeer(ppp_pcb *pcb, const char *user, const char *password) { /* Save the username and password we're given */ pcb->upap.us_user = user; - pcb->upap.us_userlen = LWIP_MIN(strlen(user), 0xff); + pcb->upap.us_userlen = (u8_t)LWIP_MIN(strlen(user), 0xff); pcb->upap.us_passwd = password; - pcb->upap.us_passwdlen = LWIP_MIN(strlen(password), 0xff); + pcb->upap.us_passwdlen = (u8_t)LWIP_MIN(strlen(password), 0xff); pcb->upap.us_transmits = 0; /* Lower layer up yet? */