This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit ebf37162ed9c0691de6ce39a28b42c00f28bb200
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Mon Aug 10 02:50:43 2020 +0800
Fix nxstyle warning
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
netutils/ftpc/ftpc_getreply.c | 20 +++++++++++---------
netutils/ftpc/ftpc_internal.h | 15 +++++++++------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/netutils/ftpc/ftpc_getreply.c b/netutils/ftpc/ftpc_getreply.c
index e54b84a..04b79ac 100644
--- a/netutils/ftpc/ftpc_getreply.c
+++ b/netutils/ftpc/ftpc_getreply.c
@@ -88,7 +88,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
/* Loop until the full line is obtained */
- for (;;)
+ for (; ; )
{
/* Get the next character from incoming command stream */
@@ -109,19 +109,21 @@ static int ftpc_gets(struct ftpc_session_s *session)
{
/* Handle TELNET commands */
- switch(ch = ftpc_sockgetc(&session->cmd))
+ switch (ch = ftpc_sockgetc(&session->cmd))
{
case TELNET_WILL:
case TELNET_WONT:
ch = ftpc_sockgetc(&session->cmd);
- ftpc_sockprintf(&session->cmd, "%c%c%c", TELNET_IAC,
TELNET_DONT, ch);
+ ftpc_sockprintf(&session->cmd, "%c%c%c",
+ TELNET_IAC, TELNET_DONT, ch);
ftpc_sockflush(&session->cmd);
break;
case TELNET_DO:
case TELNET_DONT:
ch = ftpc_sockgetc(&session->cmd);
- ftpc_sockprintf(&session->cmd, "%c%c%c", TELNET_IAC,
TELNET_WONT, ch);
+ ftpc_sockprintf(&session->cmd, "%c%c%c",
+ TELNET_IAC, TELNET_WONT, ch);
ftpc_sockflush(&session->cmd);
break;
@@ -134,7 +136,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
/* Deal with carriage returns */
- else if (ch == ISO_cr)
+ else if (ch == ISO_CR)
{
/* What follows the carriage return? */
@@ -143,12 +145,12 @@ static int ftpc_gets(struct ftpc_session_s *session)
{
/* If it is followed by a NUL then keep it */
- ch = ISO_cr;
+ ch = ISO_CR;
}
/* If it is followed by a newline then break out of the loop. */
- else if (ch == ISO_nl)
+ else if (ch == ISO_NL)
{
/* Newline terminates the reply */
@@ -168,7 +170,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
}
}
- else if (ch == ISO_nl)
+ else if (ch == ISO_NL)
{
/* The ISO newline character terminates the string. Just break
* out of the loop.
@@ -208,7 +210,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
int fptc_getreply(struct ftpc_session_s *session)
{
- char tmp[5]="xxx ";
+ char tmp[5] = "xxx ";
int ret;
/* Set up a timeout */
diff --git a/netutils/ftpc/ftpc_internal.h b/netutils/ftpc/ftpc_internal.h
index 68e90cc..3934a89 100644
--- a/netutils/ftpc/ftpc_internal.h
+++ b/netutils/ftpc/ftpc_internal.h
@@ -59,10 +59,11 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* MISC definitions *********************************************************/
-#define ISO_nl 0x0a
-#define ISO_cr 0x0d
+#define ISO_NL 0x0a
+#define ISO_CR 0x0d
/* Telnet-related definitions */
@@ -181,8 +182,8 @@ struct ftpc_session_s
off_t offset; /* Transfer file offset */
off_t size; /* Number of bytes transferred */
- char reply[CONFIG_FTP_MAXREPLY+1]; /* Last reply string from server */
- char buffer[CONFIG_FTP_BUFSIZE]; /* Used to buffer file data during
transfers */
+ char reply[CONFIG_FTP_MAXREPLY + 1]; /* Last reply string from server */
+ char buffer[CONFIG_FTP_BUFSIZE]; /* Used to buffer file data during
transfers */
};
/* There is not yet any want to change the local working directly (an lcd
@@ -223,8 +224,9 @@ extern "C"
vfprintf((s)->outstream,f,ap)
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
+
/* Low-level string management */
EXTERN void ftpc_stripcrlf(FAR char *str);
@@ -264,7 +266,8 @@ EXTERN void ftpc_sockcopy(FAR struct ftpc_socket_s *dest,
/* Socket I/O helpers */
-EXTERN int ftpc_sockprintf(FAR struct ftpc_socket_s *sock, const char *fmt,
...);
+EXTERN int ftpc_sockprintf(FAR struct ftpc_socket_s *sock,
+ const char *fmt, ...);
EXTERN void ftpc_timeout(int argc, wdparm_t arg1, ...);
/* Transfer helpers */
