[nuttx-apps] 02/02: bas_fs.c: Fix nxstyle: Multiple data definitions

[xiaoxiang]

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/nuttx-apps.git

commit 7f67ee8c88d5ebab8fd1b724a081740e5666de00
Author: Huang Qi <huang...@xiaomi.com>
AuthorDate: Thu Feb 23 14:30:17 2023 +0800

    bas_fs.c: Fix nxstyle: Multiple data definitions
    
    Signed-off-by: Huang Qi <huang...@xiaomi.com>
---
 interpreters/bas/bas_fs.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/interpreters/bas/bas_fs.c b/interpreters/bas/bas_fs.c
index a34d2ac05..534047c55 100644
--- a/interpreters/bas/bas_fs.c
+++ b/interpreters/bas/bas_fs.c
@@ -435,9 +435,12 @@ int FS_opendev(int chn, int infd, int outfd)
 
 int FS_openin(const char *name)
 {
-  int chn, fd;
+  int chn;
+  int fd;
+
+  fd = open(name, O_RDONLY);
 
-  if ((fd = open(name, O_RDONLY)) == -1)
+  if (fd < 0)
     {
       FS_errmsg = strerror(errno);
       return -1;
@@ -526,9 +529,12 @@ int FS_openinChn(int chn, const char *name, int mode)
 
 int FS_openout(const char *name)
 {
-  int chn, fd;
+  int chn;
+  int fd;
+
+  fd = open(name, O_WRONLY | O_TRUNC | O_CREAT, 0666);
 
-  if ((fd = open(name, O_WRONLY | O_TRUNC | O_CREAT, 0666)) == -1)
+  if (fd < 0)
     {
       FS_errmsg = strerror(errno);
       return -1;
@@ -911,7 +917,8 @@ void FS_xonxoff(int chn, int on)
 
 int FS_put(int chn)
 {
-  ssize_t offset, written;
+  ssize_t offset;
+  size_t written;
 
   if (opened(chn, 2) == -1)
     {
@@ -1397,7 +1404,8 @@ int FS_getChar(int dev)
 
 int FS_get(int chn)
 {
-  ssize_t offset, rd;
+  ssize_t offset;
+  size_t rd;
 
   if (opened(chn, 2) == -1)
     {
@@ -1523,7 +1531,8 @@ int FS_eof(int chn)
 long int FS_loc(int chn)
 {
   int fd;
-  off_t cur, offset = 0;
+  off_t cur;
+  off_t offset = 0;
 
   if (opened(chn, -1) == -1)
     {
@@ -1773,9 +1782,11 @@ int FS_charpos(int chn)
 
 int FS_copy(const char *from, const char *to)
 {
-  int infd, outfd;
+  int infd;
+  int outfd;
   char buf[4096];
-  ssize_t inlen, outlen = -1;
+  ssize_t inlen;
+  ssize_t outlen = -1;
 
   if ((infd = open(from, O_RDONLY)) == -1)
     {