[incubator-nuttx-apps] branch master updated: Remove "| O_BINARY" or " |= O_BINARY" since O_BINARY is 0 now

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new a12707177 Remove "| O_BINARY" or " |= O_BINARY" since O_BINARY is 0 now
a12707177 is described below

commit a12707177b7e3d7a04cc93fbde1ae16879739e03
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Jun 3 01:03:32 2022 +0800

    Remove "| O_BINARY" or " |= O_BINARY" since O_BINARY is 0 now
    
    follow nuttx kernel side change
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 canutils/slcan/slcan.c | 17 ++++++++++++-----
 netutils/ftpd/ftpd.c   |  3 ---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/canutils/slcan/slcan.c b/canutils/slcan/slcan.c
index 4ebff9335..2bf1ef133 100644
--- a/canutils/slcan/slcan.c
+++ b/canutils/slcan/slcan.c
@@ -189,7 +189,11 @@ int main(int argc, char *argv[])
 
   /* CAN */
 
-  int s, nbytes, i, ret, reccount;
+  int s;
+  int nbytes;
+  int i;
+  int ret;
+  int reccount;
   struct sockaddr_can addr;
   struct canfd_frame frame;
   struct msghdr msg;
@@ -197,7 +201,8 @@ int main(int argc, char *argv[])
   fd_set rdfs;
   char ctrlmsg[CMSG_SPACE(sizeof(struct timeval) +
                           3 * sizeof(struct timespec) + sizeof(int))];
-  char sbuf[40], *sbp;
+  char sbuf[40];
+  char *sbp;
 
   if (argc != 3)
     {
@@ -210,7 +215,7 @@ int main(int argc, char *argv[])
   char *candev = argv[1];
 
   debug_print("Starting slcan on NuttX\n");
-  fd = open(chrdev, O_RDWR | O_BINARY);
+  fd = open(chrdev, O_RDWR);
   if (fd < 0)
     {
       syslog(LOG_ERR, "Failed to open serial channel %s\n", chrdev);
@@ -396,7 +401,8 @@ int main(int argc, char *argv[])
                           /* Transmit an extended 29 bit CAN frame */
 
                           char tbuf[9];
-                          int idval, val;
+                          int idval;
+                          int val;
 
                           /* get 29bit CAN ID */
 
@@ -441,7 +447,8 @@ int main(int argc, char *argv[])
                           /* Transmit an 11 bit CAN frame */
 
                           char tbuf[9];
-                          int idval, val;
+                          int idval;
+                          int val;
 
                           /* get 11bit CAN ID */
 
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index fafe56145..4ffc70688 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -1809,9 +1809,6 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype)
 #if defined(O_LARGEFILE)
   oflags |= O_LARGEFILE;
 #endif
-#if defined(O_BINARY)
-  oflags |= O_BINARY;
-#endif
 
   /* Are we creating the file? */