From 634713cec4d170ffe7dd49fdd386f1d6e1096126 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Wed, 25 Nov 2020 07:40:46 +0900
Subject: [PATCH] net/tcp/tcp_sendfile.c: Fix syslog formats
---
net/tcp/tcp_sendfile.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c
index a1676caa4b..78c61a193a 100644
--- a/net/tcp/tcp_sendfile.c
+++ b/net/tcp/tcp_sendfile.c
@@ -46,6 +46,7 @@
#include <sys/socket.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -151,7 +152,7 @@ static uint16_t ack_eventhandler(FAR struct net_driver_s *dev,
*/
pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn;
- ninfo("ACK: acked=%d sent=%d flen=%d\n",
+ ninfo("ACK: acked=%d sent=%zd flen=%zu\n",
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
dev->d_sndlen = 0;
@@ -274,7 +275,7 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
return flags;
}
- ninfo("flags: %04x acked: %d sent: %d\n",
+ ninfo("flags: %04x acked: %d sent: %zd\n",
flags, pstate->snd_acked, pstate->snd_sent);
/* We get here if (1) not all of the data has been ACKed, (2) we have been
@@ -334,15 +335,15 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
*/
seqno = pstate->snd_sent + pstate->snd_isn;
- ninfo("SEND: sndseq %08x->%08x len: %d\n",
- conn->sndseq, seqno, ret);
+ ninfo("SEND: sndseq %08" PRIx32 "->%08" PRIx32 " len: %d\n",
+ tcp_getsequence(conn->sndseq), seqno, ret);
tcp_setsequence(conn->sndseq, seqno);
/* Update the amount of data sent (but not necessarily ACKed) */
pstate->snd_sent += sndlen;
- ninfo("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(),
+ ninfo("pid: %d SEND: acked=%d sent=%zd flen=%zu\n", getpid(),
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
}
else