You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/05/07 16:31:15 UTC

[incubator-nuttx] 01/04: syscall: Apply the new vararg syntax to fcntl

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

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

commit 2c0381da87c10a9f9806cbe6dc0acb0302f484a1
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed May 6 23:36:16 2020 +0800

    syscall: Apply the new vararg syntax to fcntl
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 syscall/syscall.csv          | 2 +-
 syscall/syscall_lookup.h     | 2 +-
 syscall/syscall_stublookup.c | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/syscall/syscall.csv b/syscall/syscall.csv
index 3889afd..1ae6e20 100644
--- a/syscall/syscall.csv
+++ b/syscall/syscall.csv
@@ -22,7 +22,7 @@
 "exec","nuttx/binfmt/binfmt.h","!defined(CONFIG_BINFMT_DISABLE) && !defined(CONFIG_BUILD_KERNEL)","int","FAR const char *","FAR char * const *","FAR const struct symtab_s *","int"
 "execv","unistd.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS)","int","FAR const char *","FAR char *const []|FAR char *const *"
 "exit","stdlib.h","","void","int"
-"fcntl","fcntl.h","","int","int","int","..."
+"fcntl","fcntl.h","","int","int","int","...","int"
 "fs_fdopen","nuttx/fs/fs.h","CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR struct tcb_s*"
 "fstat","sys/stat.h","","int","int","FAR struct stat*"
 "fstatfs","sys/statfs.h","","int","int","FAR struct statfs*"
diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h
index 9fd1c2d..e9eb8ce 100644
--- a/syscall/syscall_lookup.h
+++ b/syscall/syscall_lookup.h
@@ -231,7 +231,7 @@ SYSCALL_LOOKUP(up_assert,                  2, STUB_up_assert)
   SYSCALL_LOOKUP(closedir,                 1, STUB_closedir)
   SYSCALL_LOOKUP(dup,                      1, STUB_dup)
   SYSCALL_LOOKUP(dup2,                     2, STUB_dup2)
-  SYSCALL_LOOKUP(fcntl,                    6, STUB_fcntl)
+  SYSCALL_LOOKUP(fcntl,                    3, STUB_fcntl)
   SYSCALL_LOOKUP(lseek,                    3, STUB_lseek)
   SYSCALL_LOOKUP(mmap,                     6, STUB_mmap)
   SYSCALL_LOOKUP(open,                     3, STUB_open)
diff --git a/syscall/syscall_stublookup.c b/syscall/syscall_stublookup.c
index 2dcfcde..7083ce7 100644
--- a/syscall/syscall_stublookup.c
+++ b/syscall/syscall_stublookup.c
@@ -234,8 +234,7 @@ uintptr_t STUB_closedir(int nbr, uintptr_t parm1);
 uintptr_t STUB_dup(int nbr, uintptr_t parm1);
 uintptr_t STUB_dup2(int nbr, uintptr_t parm1, uintptr_t parm2);
 uintptr_t STUB_fcntl(int nbr, uintptr_t parm1, uintptr_t parm2,
-            uintptr_t parm3, uintptr_t parm4, uintptr_t parm5,
-            uintptr_t parm6);
+            uintptr_t parm3);
 uintptr_t STUB_lseek(int nbr, uintptr_t parm1, uintptr_t parm2,
             uintptr_t parm3);
 uintptr_t STUB_mmap(int nbr, uintptr_t parm1, uintptr_t parm2,