You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2021/02/26 10:45:08 UTC

[incubator-nuttx] 02/02: fs/lfs: Remove semret temporary variable

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

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

commit 2c7faade4965670b407f095b42baf781d248caf6
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Feb 24 12:35:20 2021 +0800

    fs/lfs: Remove semret temporary variable
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: I2df74c7d42fac25c4b010e6b10c2af36f555c480
---
 fs/littlefs/lfs_vfs.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/fs/littlefs/lfs_vfs.c b/fs/littlefs/lfs_vfs.c
index 4cc41c4..19e5792 100644
--- a/fs/littlefs/lfs_vfs.c
+++ b/fs/littlefs/lfs_vfs.c
@@ -347,7 +347,6 @@ static ssize_t littlefs_read(FAR struct file *filep, FAR char *buffer,
   FAR struct lfs_file *priv;
   FAR struct inode *inode;
   ssize_t ret;
-  int semret;
 
   /* Recover our private data from the struct file instance */
 
@@ -357,10 +356,10 @@ static ssize_t littlefs_read(FAR struct file *filep, FAR char *buffer,
 
   /* Call LFS to perform the read */
 
-  semret = littlefs_semtake(fs);
-  if (semret < 0)
+  ret = littlefs_semtake(fs);
+  if (ret < 0)
     {
-      return (ssize_t)semret;
+      return ret;
     }
 
   ret = lfs_file_read(&fs->lfs, priv, buffer, buflen);
@@ -385,7 +384,6 @@ static ssize_t littlefs_write(FAR struct file *filep, const char *buffer,
   FAR struct lfs_file *priv;
   FAR struct inode *inode;
   ssize_t ret;
-  int semret;
 
   /* Recover our private data from the struct file instance */
 
@@ -395,10 +393,10 @@ static ssize_t littlefs_write(FAR struct file *filep, const char *buffer,
 
   /* Call LFS to perform the write */
 
-  semret = littlefs_semtake(fs);
-  if (semret < 0)
+  ret = littlefs_semtake(fs);
+  if (ret < 0)
     {
-      return semret;
+      return ret;
     }
 
   ret = lfs_file_write(&fs->lfs, priv, buffer, buflen);
@@ -422,7 +420,6 @@ static off_t littlefs_seek(FAR struct file *filep, off_t offset, int whence)
   FAR struct lfs_file *priv;
   FAR struct inode *inode;
   off_t ret;
-  int semret;
 
   /* Recover our private data from the struct file instance */
 
@@ -432,10 +429,10 @@ static off_t littlefs_seek(FAR struct file *filep, off_t offset, int whence)
 
   /* Call LFS to perform the seek */
 
-  semret = littlefs_semtake(fs);
-  if (semret < 0)
+  ret = littlefs_semtake(fs);
+  if (ret < 0)
     {
-      return (off_t)semret;
+      return ret;
     }
 
   ret = lfs_file_seek(&fs->lfs, priv, offset, whence);