mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-13 06:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start making the source compile correctly with gcc -Wconversion enabled

Browse Source
This commit is contained in:
goldsimon 2017-06-23 21:15:36 +02:00
parent c12aa3fb40
commit af0f4d4020
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/def.c
View File

@ -218,7 +218,7 @@ lwip_itoa(char* result, size_t bufsize, int number)
it will get */ it will get */
tmp = &result[bufsize-2]; tmp = &result[bufsize-2];
while ((n != 0) && (result_len < (bufsize - 1))) { while ((n != 0) && (result_len < (bufsize - 1))) {
char val = '0' + (n % 10); char val = (char)('0' + (n % 10));
*tmp = val; *tmp = val;
tmp--; tmp--;
n = n / 10; n = n / 10;

15
src/core/inet_chksum.c
View File

@ -260,7 +260,7 @@ static u16_t
inet_cksum_pseudo_base(struct pbuf *p, u8_t proto, u16_t proto_len, u32_t acc) inet_cksum_pseudo_base(struct pbuf *p, u8_t proto, u16_t proto_len, u32_t acc)
{ {
struct pbuf *q; struct pbuf *q;
u8_t swapped = 0; int swapped = 0;
/* iterate through all pbuf in chain */ /* iterate through all pbuf in chain */
for (q = p; q != NULL; q = q->next) { for (q = p; q != NULL; q = q->next) {
@ -272,7 +272,7 @@ inet_cksum_pseudo_base(struct pbuf *p, u8_t proto, u16_t proto_len, u32_t acc)
to check whether we really need to execute it, and does no harm */ to check whether we really need to execute it, and does no harm */
acc = FOLD_U32T(acc); acc = FOLD_U32T(acc);
if (q->len % 2 != 0) { if (q->len % 2 != 0) {
swapped = 1 - swapped; swapped = !swapped;
acc = SWAP_BYTES_IN_WORD(acc); acc = SWAP_BYTES_IN_WORD(acc);
} }
/*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/ /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
@ -400,7 +400,7 @@ inet_cksum_pseudo_partial_base(struct pbuf *p, u8_t proto, u16_t proto_len,
u16_t chksum_len, u32_t acc) u16_t chksum_len, u32_t acc)
{ {
struct pbuf *q; struct pbuf *q;
u8_t swapped = 0; int swapped = 0;
u16_t chklen; u16_t chklen;
/* iterate through all pbuf in chain */ /* iterate through all pbuf in chain */
@ -412,13 +412,13 @@ inet_cksum_pseudo_partial_base(struct pbuf *p, u8_t proto, u16_t proto_len,
chklen = chksum_len; chklen = chksum_len;
} }
acc += LWIP_CHKSUM(q->payload, chklen); acc += LWIP_CHKSUM(q->payload, chklen);
chksum_len -= chklen; chksum_len = (u16_t)(chksum_len - chklen);
LWIP_ASSERT("delete me", chksum_len < 0x7fff); LWIP_ASSERT("delete me", chksum_len < 0x7fff);
/*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/ /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/
/* fold the upper bit down */ /* fold the upper bit down */
acc = FOLD_U32T(acc); acc = FOLD_U32T(acc);
if (q->len % 2 != 0) { if (q->len % 2 != 0) {
swapped = 1 - swapped; swapped = !swapped;
acc = SWAP_BYTES_IN_WORD(acc); acc = SWAP_BYTES_IN_WORD(acc);
} }
/*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/ /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
@ -569,15 +569,14 @@ inet_chksum_pbuf(struct pbuf *p)
{ {
u32_t acc; u32_t acc;
struct pbuf *q; struct pbuf *q;
u8_t swapped; int swapped = 0;
acc = 0; acc = 0;
swapped = 0;
for (q = p; q != NULL; q = q->next) { for (q = p; q != NULL; q = q->next) {
acc += LWIP_CHKSUM(q->payload, q->len); acc += LWIP_CHKSUM(q->payload, q->len);
acc = FOLD_U32T(acc); acc = FOLD_U32T(acc);
if (q->len % 2 != 0) { if (q->len % 2 != 0) {
swapped = 1 - swapped; swapped = !swapped;
acc = SWAP_BYTES_IN_WORD(acc); acc = SWAP_BYTES_IN_WORD(acc);
} }
} }