You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/28 06:03:59 UTC
[incubator-nuttx] 02/02: net/tcp: fix nxstyle warnings
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4305718691439786d4bf8e6f00efa195cf7ed8be
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Nov 27 10:15:25 2020 +0800
net/tcp: fix nxstyle warnings
Change-Id: Id885fefc80caa12806c73778e632c8b0c5888be0
Signed-off-by: chao.an <an...@xiaomi.com>
---
net/tcp/tcp_callback.c | 19 ++++++++++---------
net/tcp/tcp_recvwindow.c | 4 ++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index 2cd21aa..e063eb8 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -146,16 +146,16 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
#endif
/* Preserve the TCP_ACKDATA, TCP_CLOSE, and TCP_ABORT in the response.
- * These is needed by the network to handle responses and buffer state. The
- * TCP_NEWDATA indication will trigger the ACK response, but must be
+ * These is needed by the network to handle responses and buffer state.
+ * The TCP_NEWDATA indication will trigger the ACK response, but must be
* explicitly set in the callback.
*/
ninfo("flags: %04x\n", flags);
- /* Perform the data callback. When a data callback is executed from 'list',
- * the input flags are normally returned, however, the implementation
- * may set one of the following:
+ /* Perform the data callback. When a data callback is executed from
+ * 'list', the input flags are normally returned, however, the
+ * implementation may set one of the following:
*
* TCP_CLOSE - Gracefully close the current connection
* TCP_ABORT - Abort (reset) the current connection on an error that
@@ -175,10 +175,10 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
flags = devif_conn_event(dev, conn, flags, conn->list);
/* There may be no new data handler in place at them moment that the new
- * incoming data is received. If the new incoming data was not handled, then
- * either (1) put the unhandled incoming data in the read-ahead buffer (if
- * enabled) or (2) suppress the ACK to the data in the hope that it will
- * be re-transmitted at a better time.
+ * incoming data is received. If the new incoming data was not handled,
+ * then either (1) put the unhandled incoming data in the read-ahead
+ * buffer (if enabled) or (2) suppress the ACK to the data in the hope
+ * that it will be re-transmitted at a better time.
*/
if ((flags & TCP_NEWDATA) != 0)
@@ -261,6 +261,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
iob = iob_tryalloc(throttled, IOBUSER_NET_TCP_READAHEAD);
}
#endif
+
if (iob == NULL)
{
nerr("ERROR: Failed to create new I/O buffer chain\n");
diff --git a/net/tcp/tcp_recvwindow.c b/net/tcp/tcp_recvwindow.c
index 9ab270d..708843d 100644
--- a/net/tcp/tcp_recvwindow.c
+++ b/net/tcp/tcp_recvwindow.c
@@ -145,8 +145,8 @@ uint16_t tcp_get_recvwindow(FAR struct net_driver_s *dev,
* TCP buffering.
*
* Assume that all of the available IOBs are can be used for buffering
- * on this connection. Also assume that at least one chain is available
- * concatenate the IOBs.
+ * on this connection. Also assume that at least one chain is
+ * available concatenate the IOBs.
*
* REVISIT: In an environment with multiple, active read-ahead TCP
* sockets (and perhaps multiple network devices) or if there are