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 2020/06/24 12:48:49 UTC
[incubator-nuttx] branch master updated (ef5d204 -> d6a0da4)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from ef5d204 rewind: clear the error indicator
new f56e0e0 fs/setfd: correct the return value
new d6a0da4 net/vfcntl: fix nxstyle warning
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fs/vfs/fs_fcntl.c | 2 ++
net/socket/net_vfcntl.c | 25 +++++++++++++++----------
2 files changed, 17 insertions(+), 10 deletions(-)
[incubator-nuttx] 01/02: fs/setfd: correct the return value
Posted by ag...@apache.org.
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 f56e0e004bd807d98be4aee153aacb0af5a86788
Author: chao.an <an...@xiaomi.com>
AuthorDate: Mon Jun 8 12:18:09 2020 +0800
fs/setfd: correct the return value
Change-Id: I766f3760e7167a579b73673c44b70847ee06850b
Signed-off-by: chao.an <an...@xiaomi.com>
---
fs/vfs/fs_fcntl.c | 2 ++
net/socket/net_vfcntl.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/fs/vfs/fs_fcntl.c b/fs/vfs/fs_fcntl.c
index eafc0fe..91387c0 100644
--- a/fs/vfs/fs_fcntl.c
+++ b/fs/vfs/fs_fcntl.c
@@ -143,6 +143,8 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
{
filep->f_oflags &= ~O_CLOEXEC;
}
+
+ ret = OK;
}
break;
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index 7b44ca3..f9cd2e4 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -146,6 +146,8 @@ int psock_vfcntl(FAR struct socket *psock, int cmd, va_list ap)
{
psock->s_flags &= ~_SF_CLOEXEC;
}
+
+ ret = OK;
}
break;
[incubator-nuttx] 02/02: net/vfcntl: fix nxstyle warning
Posted by ag...@apache.org.
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 d6a0da41d55d342aa5b434b98282c76cd996f1d3
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jun 24 17:54:18 2020 +0800
net/vfcntl: fix nxstyle warning
Signed-off-by: chao.an <an...@xiaomi.com>
---
net/socket/net_vfcntl.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index f9cd2e4..a065e4f 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -86,7 +86,9 @@ int psock_vfcntl(FAR struct socket *psock, int cmd, va_list ap)
return -EBADF;
}
- /* Interrupts must be disabled in order to perform operations on socket structures */
+ /* Interrupts must be disabled in order to perform operations on socket
+ * structures
+ */
net_lock();
switch (cmd)
@@ -97,9 +99,9 @@ int psock_vfcntl(FAR struct socket *psock, int cmd, va_list ap)
* or equal to the third argument, arg, taken as an integer of type
* int. The new file descriptor shall refer to the same open file
* description as the original file descriptor, and shall share any
- * locks. The FD_CLOEXEC flag associated with the new file descriptor
- * shall be cleared to keep the file open across calls to one of the
- * exec functions.
+ * locks. The FD_CLOEXEC flag associated with the new file
+ * descriptor shall be cleared to keep the file open across calls
+ * to one of the exec functions.
*/
{
@@ -185,12 +187,13 @@ int psock_vfcntl(FAR struct socket *psock, int cmd, va_list ap)
break;
case F_SETFL:
- /* Set the file status flags, defined in <fcntl.h>, for the file description
- * associated with fd from the corresponding bits in the third argument,
- * arg, taken as type int. Bits corresponding to the file access mode and
- * the file creation flags, as defined in <fcntl.h>, that are set in arg
- * will be ignored. If any bits in arg other than those mentioned here are
- * changed by the application, the result is unspecified.
+ /* Set the file status flags, defined in <fcntl.h>, for the file
+ * description associated with fd from the corresponding bits in
+ * the third argument, arg, taken as type int. Bits corresponding
+ * to the file access mode and the file creation flags, as defined
+ * in <fcntl.h>, that are set in arg will be ignored. If any bits
+ * in arg other than those mentioned here are changed by the
+ * application, the result is unspecified.
*/
{