Merge remote-tracking branch 'origin/master' into syslog

include/nuttx/streams.h

@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/streams.h
  *
- *   Copyright (C) 2009, 2011-2012, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011-2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,14 +354,15 @@ void lib_nullinstream(FAR struct lib_instream_s *nullinstream);
 void lib_nulloutstream(FAR struct lib_outstream_s *nulloutstream);
 
 /****************************************************************************
- * Name: lib_sylogstream
+ * Name: syslogstream
  *
  * Description:
  *   Initializes a stream for use with the configured syslog interface.
+ *   Only accessible from with the OS SYSLOG logic.
  *
  * Input parameters:
- *   lowoutstream - User allocated, uninitialized instance of struct
- *                  lib_lowoutstream_s to be initialized.
+ *   stream - User allocated, uninitialized instance of struct
+ *            lib_lowoutstream_s to be initialized.
  *
  * Returned Value:
  *   None (User allocated instance initialized).
@@ -369,7 +370,7 @@ void lib_nulloutstream(FAR struct lib_outstream_s *nulloutstream);
  ****************************************************************************/
 
 #ifdef CONFIG_SYSLOG
-void lib_syslogstream(FAR struct lib_outstream_s *stream);
+void syslogstream(FAR struct lib_outstream_s *stream);
 #endif
 
 /****************************************************************************

include/nuttx/syslog/syslog.h

@@ -210,6 +210,19 @@ int syslog_putc(int ch);
 
 int syslog_flush(void);
 
+/****************************************************************************
+ * Name: _vsyslog and _vlowsyslog
+ *
+ * Description:
+ *   _vsyslog() handles the system logging system calls. It is functionally
+ *   equivalent to vsyslog() except that the pre-process priority filtering
+ *   has already been performed and, hence, there is no priority argument.
+ *
+ ****************************************************************************/
+
+int _vsyslog(FAR const IPTR char *src, va_list ap);
+int _lowvsyslog(FAR const IPTR char *src, va_list ap);
+
 #undef EXTERN
 #ifdef __cplusplus
 }

include/sys/syscall.h

@@ -232,7 +232,7 @@
 
 /* Unconditional system logging */
 
-#define SYS_vsyslog                    (__SYS_syslog+0)
+#define SYS__vsyslog                   (__SYS_syslog+0)
 #define __SYS_descriptors              (__SYS_syslog+1)
 
 /* The following are defined if either file or socket descriptor are