Passing va_list in syscall does not work. Temporarily moved syslog and lowsyslog into kernel code and access via a system call. Need to revisit. Will probably need to move all of syslog back from fs/syslog to libc/syslog

3 files changed, 9 insertions, 9 deletions

diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv
index 58c3320fc..dd002aa99 100644
--- a/nuttx/syscall/syscall.csv
+++ b/nuttx/syscall/syscall.csv
@@ -29,7 +29,7 @@
 "ioctl","sys/ioctl.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int","int","unsigned long"
 "kill","signal.h","!defined(CONFIG_DISABLE_SIGNALS)","int","pid_t","int"
 "listen","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int"
-"lowvsyslog","syslog.h","","int","int","FAR const char *","va_list"
+"lowsyslog","syslog.h","","int","int","FAR const char *","..."
 "lseek","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","off_t","int","off_t","int"
 "mkdir","sys/stat.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT)","int","FAR const char*","mode_t"
 "mkfifo","sys/stat.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR const char*","mode_t"
@@ -136,6 +136,7 @@
 "stat","sys/stat.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","FAR struct stat*"
 #"statfs","stdio.h","","int","FAR const char*","FAR struct statfs*"
 "statfs","sys/statfs.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","struct statfs*"
+"syslog","syslog.h","","int","int","FAR const char *","..."
 "task_create","sched.h","!defined(CONFIG_BUILD_KERNEL)", "int","FAR const char*","int","int","main_t","FAR char * const []|FAR char * const *"
 #"task_create","sched.h","","int","const char*","int","main_t","FAR char * const []|FAR char * const *"
 "task_delete","sched.h","","int","pid_t"
@@ -152,7 +153,6 @@
 "up_assert","assert.h","","void","FAR const uint8_t*","int"
 #"up_assert","assert.h","","void"
 "vfork","unistd.h","defined(CONFIG_ARCH_HAVE_VFORK)","pid_t"
-"vsyslog","syslog.h","","int","int","FAR const char *","va_list"
 "wait","sys/wait.h","defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)","pid_t","int*"
 "waitid","sys/wait.h","defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)","int","idtype_t","id_t"," FAR siginfo_t *","int"
 "waitpid","sys/wait.h","defined(CONFIG_SCHED_WAITPID)","pid_t","pid_t","int*","int"
diff --git a/nuttx/syscall/syscall_lookup.h b/nuttx/syscall/syscall_lookup.h
index c8735f14b..5a5e1a95b 100644
--- a/nuttx/syscall/syscall_lookup.h
+++ b/nuttx/syscall/syscall_lookup.h
@@ -60,8 +60,8 @@ SYSCALL_LOOKUP(set_errno,                 1, STUB_set_errno)
 
 /* SYSLOG */
 
-SYSCALL_LOOKUP(vsyslog,                   3, SYS_vsyslog)
-SYSCALL_LOOKUP(lowvsyslog,                3, SYS_lowvsyslog)
+SYSCALL_LOOKUP(syslog,                    6, SYS_syslog)
+SYSCALL_LOOKUP(lowsyslog,                 6, SYS_lowsyslog)
 SYSCALL_LOOKUP(setlogmask,                1, SYS_setlogmask)
 
 /* Semaphores */
diff --git a/nuttx/syscall/syscall_stublookup.c b/nuttx/syscall/syscall_stublookup.c
index 5e289e5e7..24471c4e8 100644
--- a/nuttx/syscall/syscall_stublookup.c
+++ b/nuttx/syscall/syscall_stublookup.c
@@ -78,11 +78,11 @@ uintptr_t STUB_sched_yield(int nbr);
 
 /* SYSLOG */
 
-uintptr_t STUB_vsyslog(int nbr, uintptr_t parm1, uintptr_t parm2,
-            uintptr_t parm2);
-uintptr_t STUB_lowvsyslog(int nbr, uintptr_t parm1, uintptr_t parm2,
-            uintptr_t parm2);
-uintptr_t STUB_setlogmask(iint nbr, uintptr_t parm1);
+uintptr_t STUB_syslog(int nbr, uintptr_t parm1, uintptr_t parm2,
+            uintptr_t parm3, uintptr_t parm4, uintptr_t parm5, uintptr_t parm6);
+uintptr_t STUB_lowsyslog(int nbr, uintptr_t parm1, uintptr_t parm2,
+            uintptr_t parm3, uintptr_t parm4, uintptr_t parm5, uintptr_t parm6);
+uintptr_t STUB_setlogmask(int nbr, uintptr_t parm1);
 
 /* Semaphores */