Add syslog.h; rename lib_rawprintf() to syslog()

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5578 42af7a65-404d-4744-a932-0658087f49c3

8 files changed, 48 insertions, 56 deletions

diff --git a/nuttx/libc/lib.csv b/nuttx/libc/lib.csv
index 171f64e9b..29cdf39a6 100644
--- a/nuttx/libc/lib.csv
+++ b/nuttx/libc/lib.csv
@@ -16,7 +16,6 @@
 "crc32","crc32.h","","uint32_t","FAR const uint8_t *","size_t"
 "crc32part","crc32.h","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
 "dbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG)","int","const char *","..."
-"dbg_enable","debug.h","defined(CONFIG_DEBUG_ENABLE)","void","bool"
 "dirname","libgen.h","","FAR char","FAR char *"
 "dq_addafter","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
 "dq_addbefore","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
@@ -59,11 +58,10 @@
 "inet_pton","arpa/inet.h","","int","int","FAR const char *","FAR void *"
 "labs","stdlib.h","","long int","long int"
 "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int"
-"lib_lowprintf","debug.h","","int","FAR const char *","..."
-"lib_rawprintf","debug.h","","int","FAR const char *","..."
 "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int"
 "lldbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
 "llvdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"lowsyslog","syslog.h","","int","FAR const char *","..."
 "match","","","int","const char *","const char *"
 "memccpy","string.h","","FAR void","FAR void *","FAR const void *","int c","size_t"
 "memchr","string.h","","FAR void","FAR const void *","int c","size_t"
@@ -154,6 +152,8 @@
 "strtoll","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long","const char *nptr","char **endptr","int base"
 "strtoul","stdlib.h","","unsigned long","const char *","char **","int"
 "strtoull","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","unsigned long long","const char *","char **","int"
+"syslog","syslog.h","","int","FAR const char *","..."
+"syslog_enable","syslog.h","defined(CONFIG_SYSLOG_ENABLE)","void","bool"
 "tcflush","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int"
 "tcgetattr","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","FAR struct termios *"
 "tcsetattr","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int","FAR const struct termios *"
diff --git a/nuttx/libc/lib_internal.h b/nuttx/libc/lib_internal.h
index c09c751d4..17adff417 100644
--- a/nuttx/libc/lib_internal.h
+++ b/nuttx/libc/lib_internal.h
@@ -106,8 +106,8 @@
 
 /* Debug output is initially disabled */
 
-#ifdef CONFIG_DEBUG_ENABLE
-extern bool g_dbgenable;
+#ifdef CONFIG_SYSLOG_ENABLE
+extern bool g_syslogenable;
 #endif
 
 /****************************************************************************
@@ -137,14 +137,6 @@ int lib_sprintf(FAR struct lib_outstream_s *obj,
 int lib_vsprintf(FAR struct lib_outstream_s *obj,
                  FAR const char *src, va_list ap);
 
-/* Defined lib_rawprintf.c */
-
-int lib_rawvprintf(const char *src, va_list ap);
-
-/* Defined lib_lowprintf.c */
-
-int lib_lowvprintf(const char *src, va_list ap);
-
 /* Defined in lib_dtoa.c */
 
 #ifdef CONFIG_LIBC_FLOATINGPOINT
diff --git a/nuttx/libc/misc/lib_dbg.c b/nuttx/libc/misc/lib_dbg.c
index 5605ff828..921a4e24d 100644
--- a/nuttx/libc/misc/lib_dbg.c
+++ b/nuttx/libc/misc/lib_dbg.c
@@ -50,8 +50,8 @@
 
 /* Debug output is initially disabled */
 
-#ifdef CONFIG_DEBUG_ENABLE
-bool g_dbgenable;
+#ifdef CONFIG_SYSLOG_ENABLE
+bool g_syslogenable;
 #endif
 
 /****************************************************************************
@@ -59,17 +59,17 @@ bool g_dbgenable;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: dbg_enable
+ * Name: syslog_enable
  *
  * Description:
  *  Enable or disable debug output.
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_ENABLE
-void dbg_enable(bool enable)
+#ifdef CONFIG_SYSLOG_ENABLE
+void syslog_enable(bool enable)
 {
-  g_dbgenable = enable;
+  g_syslogenable = enable;
 }
 #endif
 
@@ -89,13 +89,13 @@ int dbg(const char *format, ...)
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, format);
-      ret = lib_rawvprintf(format, ap);
+      ret = vsyslog(format, ap);
       va_end(ap);
     }
 
@@ -108,13 +108,13 @@ int lldbg(const char *format, ...)
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, format);
-      ret = lib_lowvprintf(format, ap);
+      ret = lowvsyslog(format, ap);
       va_end(ap);
     }
 
@@ -128,13 +128,13 @@ int vdbg(const char *format, ...)
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, format);
-      ret = lib_rawvprintf(format, ap);
+      ret = vsyslog(format, ap);
       va_end(ap);
     }
 
@@ -147,13 +147,13 @@ int llvdbg(const char *format, ...)
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, format);
-      ret = lib_lowvprintf(format, ap);
+      ret = lowvsyslog(format, ap);
       va_end(ap);
     }
 
diff --git a/nuttx/libc/misc/lib_dumpbuffer.c b/nuttx/libc/misc/lib_dumpbuffer.c
index 52158b220..5194560fd 100644
--- a/nuttx/libc/misc/lib_dumpbuffer.c
+++ b/nuttx/libc/misc/lib_dumpbuffer.c
@@ -51,15 +51,15 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_ARCH_LOWPUTC
-#    define message(format, arg...) lib_lowprintf(format, ##arg)
+#    define message(format, arg...) lowsyslog(format, ##arg)
 #  else
-#    define message(format, arg...) lib_rawprintf(format, ##arg)
+#    define message(format, arg...) syslog(format, ##arg)
 #  endif
 #else
 #  ifdef CONFIG_ARCH_LOWPUTC
-#    define message lib_lowprintf
+#    define message lowsyslog
 #  else
-#    define message lib_rawprintf
+#    define message syslog
 #  endif
 #endif
 
diff --git a/nuttx/libc/stdio/Make.defs b/nuttx/libc/stdio/Make.defs
index e18ab0220..ffc9b1a75 100644
--- a/nuttx/libc/stdio/Make.defs
+++ b/nuttx/libc/stdio/Make.defs
@@ -37,7 +37,7 @@
 # This first group of C files do not depend on having file descriptors or
 # C streams.
 
-CSRCS += lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
+CSRCS += lib_fileno.c lib_printf.c lib_syslog.c lib_lowsyslog.c\
 		 lib_sprintf.c lib_asprintf.c lib_snprintf.c lib_libsprintf.c \
 		 lib_vsprintf.c lib_avsprintf.c lib_vsnprintf.c lib_libvsprintf.c \
 		 lib_meminstream.c lib_memoutstream.c lib_lowinstream.c \
diff --git a/nuttx/libc/stdio/lib_lowprintf.c b/nuttx/libc/stdio/lib_lowsyslog.c
index 667fad7be..bfe6a2cce 100644
--- a/nuttx/libc/stdio/lib_lowprintf.c
+++ b/nuttx/libc/stdio/lib_lowsyslog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/stdio/lib_lowprintf.c
+ * libc/stdio/lib_lowsyslog.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -85,12 +85,12 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: lib_lowvprintf
+ * Name: lowvsyslog
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_LOWPUTC) || defined(CONFIG_SYSLOG)
 
-int lib_lowvprintf(const char *fmt, va_list ap)
+int lowvsyslog(const char *fmt, va_list ap)
 {
   struct lib_outstream_s stream;
 
@@ -105,21 +105,21 @@ int lib_lowvprintf(const char *fmt, va_list ap)
 }
 
 /****************************************************************************
- * Name: lib_lowprintf
+ * Name: lowsyslog
  ****************************************************************************/
 
-int lib_lowprintf(const char *fmt, ...)
+int lowsyslog(const char *fmt, ...)
 {
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, fmt);
-      ret = lib_lowvprintf(fmt, ap);
+      ret = lowvsyslog(fmt, ap);
       va_end(ap);
     }
 
diff --git a/nuttx/libc/stdio/lib_printf.c b/nuttx/libc/stdio/lib_printf.c
index 0e90c7ca5..b035aa14f 100644
--- a/nuttx/libc/stdio/lib_printf.c
+++ b/nuttx/libc/stdio/lib_printf.c
@@ -93,9 +93,9 @@ int printf(const char *fmt, ...)
 #if CONFIG_NFILE_STREAMS > 0
   ret = vfprintf(stdout, fmt, ap);
 #elif CONFIG_NFILE_DESCRIPTORS > 0
-  ret = lib_rawvprintf(fmt, ap);
+  ret = vsyslog(fmt, ap);
 #elif defined(CONFIG_ARCH_LOWPUTC)
-  ret = lib_lowvprintf(fmt, ap);
+  ret = lowvsyslog(fmt, ap);
 #else
 # ifdef CONFIG_CPP_HAVE_WARNING
 #   warning "printf has no data sink"
diff --git a/nuttx/libc/stdio/lib_rawprintf.c b/nuttx/libc/stdio/lib_syslog.c
index d8deba12d..bbf7860d2 100644
--- a/nuttx/libc/stdio/lib_rawprintf.c
+++ b/nuttx/libc/stdio/lib_syslog.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * libc/stdio/lib_rawprintf.c
+ * libc/stdio/lib_syslog.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
-#include <debug.h>
+#include <syslog.h>
 
 #include "lib_internal.h"
 
@@ -88,10 +88,10 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: lib_rawvprintf
+ * Name: vsyslog
  ****************************************************************************/
 
-int lib_rawvprintf(const char *fmt, va_list ap)
+int vsyslog(const char *fmt, va_list ap)
 {
 #if defined(CONFIG_SYSLOG)
 
@@ -132,21 +132,21 @@ int lib_rawvprintf(const char *fmt, va_list ap)
 }
 
 /****************************************************************************
- * Name: lib_rawprintf
+ * Name: syslog
  ****************************************************************************/
 
-int lib_rawprintf(const char *fmt, ...)
+int syslog(const char *fmt, ...)
 {
   va_list ap;
   int     ret;
 
-#ifdef CONFIG_DEBUG_ENABLE
+#ifdef CONFIG_SYSLOG_ENABLE
   ret = 0;
-  if (g_dbgenable)
+  if (g_syslogenable)
 #endif
     {
       va_start(ap, fmt);
-      ret = lib_rawvprintf(fmt, ap);
+      ret = vsyslog(fmt, ap);
       va_end(ap);
     }