Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fs/vfs: file_read() is an internal OS interface and should not errors via the errno

Browse Source
This commit is contained in:
Gregory Nutt
2017-09-28 14:14:32 -06:00
parent 9043b9cb6a
commit e761b80ea7
6 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/vfs/fs_pread.c
+1 -1
View File
@@ -95,7 +95,7 @@ ssize_t file_pread(FAR struct file *filep, FAR void *buf, size_t nbytes,
ret = file_read(filep, buf, nbytes);
if (ret < 0)
{
errcode = get_errno();
errcode = -ret;
ret = ERROR;
}
fs/vfs/fs_read.c
+8 -13
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* fs/vfs/fs_read.c
*
* Copyright (C) 2007-2009, 2012-2014, 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2012-2014, 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -102,15 +102,7 @@ ssize_t file_read(FAR struct file *filep, FAR void *buf, size_t nbytes)
ret = (int)inode->u.i_ops->read(filep, (FAR char *)buf, (size_t)nbytes);
}
/* If an error occurred, set errno and return -1 (ERROR) */
if (ret < 0)
{
set_errno(-ret);
return ERROR;
}
/* Otherwise, return the number of bytes read */
/* Return the number of bytes read (or possibly an error code) */
return ret;
}
@@ -180,11 +172,14 @@ ssize_t read(int fd, FAR void *buf, size_t nbytes)
}
else
{
/* Then let file_read do all of the work. Note that file_read()
* sets the errno variable.
*/
/* Then let file_read do all of the work. */
ret = file_read(filep, buf, nbytes);
if (ret < 0)
{
set_errno((int)-ret);
ret = ERROR;
}
}
}
#endif