Remove lowsyslog(). The new syslog() includes all of the functionality of lowsyslog(). No longer any need for two interfaces.

This commit is contained in:
Gregory Nutt
2016-06-20 08:57:08 -06:00
parent 5002e27e84
commit 2b445ddccc
43 changed files with 243 additions and 575 deletions
-2
View File
@@ -67,8 +67,6 @@
"_llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
"_llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
"_llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
"lowsyslog","syslog.h","","int","int","FAR const char *","..."
"lowvsyslog","syslog.h","","int","int","FAR const char *","va_list"
"match","nuttx/regex.h","","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"
1 _inet_ntoa arpa/inet.h defined(CONFIG_NET_IPv4) && !defined(CONFIG_CAN_PASS_STRUCTS) FAR char in_addr_t
67 _llerr debug.h !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC) int const char *
68 _llinfo debug.h !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC) int const char *
69 _llwarn debug.h !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC) int const char *
lowsyslog syslog.h int int
lowvsyslog syslog.h int int
70 match nuttx/regex.h int const char *
71 memccpy string.h FAR void FAR void *
72 memchr string.h FAR void FAR const void *
+10 -10
View File
@@ -66,52 +66,52 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
unsigned int j;
unsigned int k;
lowsyslog(LOG_INFO, "%s (%p):\n", msg, buffer);
syslog(LOG_INFO, "%s (%p):\n", msg, buffer);
for (i = 0; i < buflen; i += 32)
{
lowsyslog(LOG_INFO, "%04x: ", i);
syslog(LOG_INFO, "%04x: ", i);
for (j = 0; j < 32; j++)
{
k = i + j;
if (j == 16)
{
lowsyslog(LOG_INFO, " ");
syslog(LOG_INFO, " ");
}
if (k < buflen)
{
lowsyslog(LOG_INFO, "%02x", buffer[k]);
syslog(LOG_INFO, "%02x", buffer[k]);
}
else
{
lowsyslog(LOG_INFO, " ");
syslog(LOG_INFO, " ");
}
}
lowsyslog(LOG_INFO, " ");
syslog(LOG_INFO, " ");
for (j = 0; j < 32; j++)
{
k = i + j;
if (j == 16)
{
lowsyslog(LOG_INFO, " ");
syslog(LOG_INFO, " ");
}
if (k < buflen)
{
if (buffer[k] >= 0x20 && buffer[k] < 0x7f)
{
lowsyslog(LOG_INFO, "%c", buffer[k]);
syslog(LOG_INFO, "%c", buffer[k]);
}
else
{
lowsyslog(LOG_INFO, ".");
syslog(LOG_INFO, ".");
}
}
}
lowsyslog(LOG_INFO, "\n");
syslog(LOG_INFO, "\n");
}
}
+1 -1
View File
@@ -35,7 +35,7 @@
# Add the internal C files to the build
CSRCS += lib_syslog.c lib_lowsyslog.c lib_setlogmask.c
CSRCS += lib_syslog.c lib_setlogmask.c
# Add the syslog directory to the build
-126
View File
@@ -1,126 +0,0 @@
/****************************************************************************
* lib/syslog/lib_lowsyslog.c
*
* Copyright (C) 2007-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <syslog.h>
#include <nuttx/syslog/syslog.h>
#include "syslog/syslog.h"
#ifdef CONFIG_ARCH_LOWPUTC
/* The low-level SYSLOG functions can be used only if we have access to
* either the low-level serial interface, up_putc().
*/
#if defined(CONFIG_BUILD_FLAT) || defined (__KERNEL__)
/* The low-level serial interface, up_putc(), is only available in the FLAT
* build or during the kernel pass of the protected or kernel two pass
* builds.
*/
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: lowvsyslog
*
* Description:
* The function lowvsyslog() performs the same task as lowsyslog() with
* the difference that it takes a set of arguments which have been
* obtained using the stdarg variable argument list macros.
*
****************************************************************************/
int lowvsyslog(int priority, FAR const IPTR char *fmt, va_list ap)
{
int ret = 0;
/* Check if this priority is enabled */
if ((g_syslog_mask & LOG_MASK(priority)) != 0)
{
/* Perform the _lowvsyslog system call.
*
* NOTE: The va_list parameter is passed by reference. That is
* because the va_list is a structure in some compilers and passing
* of structures in the NuttX sycalls does not work.
*/
ret = _lowvsyslog(fmt, &ap);
}
return ret;
}
/****************************************************************************
* Name: lowsyslog
*
* Description:
* syslog() generates a log message. The priority argument is formed by
* ORing the facility and the level values (see include/syslog.h). The
* remaining arguments are a format, as in printf and any arguments to the
* format.
*
* This is a non-standard, low-level system logging interface. The
* difference between syslog() and lowsyslog() is that the syslog()
* interface writes to the syslog device (usually fd=1, stdout) whereas
* lowsyslog() uses a lower level interface that works even from interrupt
* handlers.
*
****************************************************************************/
int lowsyslog(int priority, FAR const IPTR char *fmt, ...)
{
va_list ap;
int ret;
/* Let lowvsyslog do the work */
va_start(ap, fmt);
ret = lowvsyslog(priority, fmt, ap);
va_end(ap);
return ret;
}
#endif /* CONFIG_BUILD_FLAT) || __KERNEL__ */
#endif /* CONFIG_ARCH_LOWPUTC */