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

fs/vfs: Change the return value of internal function fs_getfilep(). It no longer sets the errno variable but, rather, returns errors in the same manner as other internal OS functions.

Browse Source
This commit is contained in:
Gregory Nutt
2017-10-11 08:39:19 -06:00
parent 2f1894f2b4
commit 536e4d7fa6
20 changed files with 313 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/aio/aio_fsync.c
+2 -4
View File
@@ -99,10 +99,8 @@ static void aio_fsync_worker(FAR void *arg)
ret = file_fsync(aioc->u.aioc_filep);
if (ret < 0)
{
int errcode = get_errno();
ferr("ERROR: fsync failed: %d\n", errcode);
DEBUGASSERT(errcode > 0);
aiocbp->aio_result = -errcode;
ferr("ERROR: file_fsync failed: %d\n", ret);
aiocbp->aio_result = ret;
}
else
{
fs/aio/aioc_contain.c
+17 -10
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* fs/aio/aioc_contain.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -86,6 +86,7 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
#ifdef CONFIG_PRIORITY_INHERITANCE
struct sched_param param;
#endif
int ret;
#if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK)
if (aiocbp->aio_fildes < CONFIG_NFILE_DESCRIPTORS)
@@ -94,13 +95,13 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
{
/* Get the file structure corresponding to the file descriptor. */
u.filep = fs_getfilep(aiocbp->aio_fildes);
if (!u.filep)
ret = fs_getfilep(aiocbp->aio_fildes, &u.filep);
if (ret < 0)
{
/* The errno value has already been set */
return NULL;
goto errout;
}
DEBUGASSERT(u.filep != NULL);
}
#endif
#if defined(AIO_HAVE_FILEP) && defined(AIO_HAVE_PSOCK)
@@ -111,12 +112,14 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
/* Get the socket structure corresponding to the socket descriptor */
u.psock = sockfd_socket(aiocbp->aio_fildes);
if (!u.psock)
if (u.psock == NULL)
{
/* Does not set the errno. EBADF is the most likely explanation. */
/* Does not return error information. EBADF is the most likely
* explanation.
*/
set_errno(EBADF);
return NULL;
ret = -EBADF;
goto errout;
}
}
#endif
@@ -146,6 +149,10 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
dq_addlast(&aioc->aioc_link, &g_aio_pending);
aio_unlock();
return aioc;
errout:
set_errno(-ret);
return NULL;
}
/****************************************************************************