sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tcp: fixed warning: ISO C90 forbids mixed declarations and code

Browse Source
This commit is contained in:
Alexander Lunev 2022-01-20 22:47:23 +03:00 committed by Xiang Xiao
parent 2a22c0e32d
commit c9e32dd4a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/tcp/tcp_send_unbuffered.c
View File

@ -260,7 +260,7 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
ackno = tcp_getsequence(tcp->ackno); ackno = tcp_getsequence(tcp->ackno);
pstate->snd_acked = TCP_SEQ_SUB(ackno, pstate->snd_acked = TCP_SEQ_SUB(ackno,
pstate->snd_isn); pstate->snd_isn);
ninfo("ACK: acked=%" PRId32 " sent=%zd buflen=%zd\n", ninfo("ACK: acked=%" PRId32 " sent=%zd buflen=%zu\n",
pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen); pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen);
/* Have all of the bytes in the buffer been sent and acknowledged? */ /* Have all of the bytes in the buffer been sent and acknowledged? */
@ -311,6 +311,8 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
if ((flags & TCP_REXMIT) != 0) if ((flags & TCP_REXMIT) != 0)
{ {
uint32_t sndlen;
nwarn("WARNING: TCP_REXMIT\n"); nwarn("WARNING: TCP_REXMIT\n");
/* According to RFC 6298 (5.4), retransmit the earliest segment /* According to RFC 6298 (5.4), retransmit the earliest segment
@ -319,7 +321,7 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
/* Reconstruct the length of the earliest segment to be retransmitted */ /* Reconstruct the length of the earliest segment to be retransmitted */
uint32_t sndlen = pstate->snd_buflen - pstate->snd_acked; sndlen = pstate->snd_buflen - pstate->snd_acked;
if (sndlen > conn->mss) if (sndlen > conn->mss)
{ {
@ -429,7 +431,7 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
/* Update the amount of data sent (but not necessarily ACKed) */ /* Update the amount of data sent (but not necessarily ACKed) */
pstate->snd_sent += sndlen; pstate->snd_sent += sndlen;
ninfo("SEND: acked=%" PRId32 " sent=%zd buflen=%zd\n", ninfo("SEND: acked=%" PRId32 " sent=%zd buflen=%zu\n",
pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen); pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen);
} }
else else

4
net/tcp/tcp_sendfile.c
View File

@ -274,6 +274,8 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
else if ((flags & TCP_REXMIT) != 0) else if ((flags & TCP_REXMIT) != 0)
{ {
uint32_t sndlen;
nwarn("WARNING: TCP_REXMIT\n"); nwarn("WARNING: TCP_REXMIT\n");
/* According to RFC 6298 (5.4), retransmit the earliest segment /* According to RFC 6298 (5.4), retransmit the earliest segment
@ -282,7 +284,7 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
/* Reconstruct the length of the earliest segment to be retransmitted */ /* Reconstruct the length of the earliest segment to be retransmitted */
uint32_t sndlen = pstate->snd_flen - pstate->snd_acked; sndlen = pstate->snd_flen - pstate->snd_acked;
if (sndlen > conn->mss) if (sndlen > conn->mss)
{ {