From 328134fdbaaea2ff80193ec0453a12132ef0d2ab Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Sat, 15 Jul 2017 10:25:19 +0200 Subject: [PATCH] Fix two -Wconversion warnings --- src/core/tcp_in.c | 2 +- src/include/lwip/prot/tcp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c index 006ec08b..be6f613c 100644 --- a/src/core/tcp_in.c +++ b/src/core/tcp_in.c @@ -1887,7 +1887,7 @@ tcp_parseopt(struct tcp_pcb *pcb) return; } /* An MSS option with the right option length. */ - mss = (tcp_getoptbyte() << 8); + mss = (u16_t)(tcp_getoptbyte() << 8); mss |= tcp_getoptbyte(); /* Limit the mss to the configured TCP_MSS and prevent division by zero */ pcb->mss = ((mss > TCP_MSS) || (mss == 0)) ? TCP_MSS : mss; diff --git a/src/include/lwip/prot/tcp.h b/src/include/lwip/prot/tcp.h index b251b80a..6e70838d 100644 --- a/src/include/lwip/prot/tcp.h +++ b/src/include/lwip/prot/tcp.h @@ -82,7 +82,7 @@ PACK_STRUCT_END #define TCPH_HDRLEN(phdr) ((u16_t)(lwip_ntohs((phdr)->_hdrlen_rsvd_flags) >> 12)) #define TCPH_HDRLEN_BYTES(phdr) ((u8_t)(TCPH_HDRLEN(phdr) << 2)) -#define TCPH_FLAGS(phdr) ((u16_t)(lwip_ntohs((phdr)->_hdrlen_rsvd_flags) & TCP_FLAGS)) +#define TCPH_FLAGS(phdr) ((u8_t)((lwip_ntohs((phdr)->_hdrlen_rsvd_flags) & TCP_FLAGS))) #define TCPH_HDRLEN_SET(phdr, len) (phdr)->_hdrlen_rsvd_flags = lwip_htons(((len) << 12) | TCPH_FLAGS(phdr)) #define TCPH_FLAGS_SET(phdr, flags) (phdr)->_hdrlen_rsvd_flags = (((phdr)->_hdrlen_rsvd_flags & PP_HTONS(~TCP_FLAGS)) | lwip_htons(flags))