mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
make standard syslog and vsyslog POSIX compliant (also modify non-standard syslog functions for compatibility). This will break a lot of things until ALL usage of syslog is updated to use the modified interfaces
This commit is contained in:
+4
-4
@@ -95,7 +95,7 @@ int dbg(const char *format, ...)
|
||||
#endif
|
||||
{
|
||||
va_start(ap, format);
|
||||
ret = vsyslog(format, ap);
|
||||
ret = vsyslog(LOG_DEBUG, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ int lldbg(const char *format, ...)
|
||||
#endif
|
||||
{
|
||||
va_start(ap, format);
|
||||
ret = lowvsyslog(format, ap);
|
||||
ret = lowvsyslog(LOG_DEBUG, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ int vdbg(const char *format, ...)
|
||||
#endif
|
||||
{
|
||||
va_start(ap, format);
|
||||
ret = vsyslog(format, ap);
|
||||
ret = vsyslog(LOG_DEBUG, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ int llvdbg(const char *format, ...)
|
||||
#endif
|
||||
{
|
||||
va_start(ap, format);
|
||||
ret = lowvsyslog(format, ap);
|
||||
ret = lowvsyslog(LOG_DEBUG, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
|
||||
+12
-27
@@ -47,22 +47,6 @@
|
||||
* Pre-processor definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* Select the lowest level debug interface available */
|
||||
|
||||
#ifdef CONFIG_CPP_HAVE_VARARGS
|
||||
# ifdef CONFIG_ARCH_LOWPUTC
|
||||
# define message(format, ...) lowsyslog(format, ##__VA_ARGS__)
|
||||
# else
|
||||
# define message(format, ...) syslog(format, ##__VA_ARGS__)
|
||||
# endif
|
||||
#else
|
||||
# ifdef CONFIG_ARCH_LOWPUTC
|
||||
# define message lowsyslog
|
||||
# else
|
||||
# define message syslog
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
@@ -75,58 +59,59 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, unsigned int buflen)
|
||||
void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
|
||||
unsigned int buflen)
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int j;
|
||||
unsigned int k;
|
||||
|
||||
message("%s (%p):\n", msg, buffer);
|
||||
lowsyslog(LOG_INFO, "%s (%p):\n", msg, buffer);
|
||||
for (i = 0; i < buflen; i += 32)
|
||||
{
|
||||
message("%04x: ", i);
|
||||
lowsyslog(LOG_INFO, "%04x: ", i);
|
||||
for (j = 0; j < 32; j++)
|
||||
{
|
||||
k = i + j;
|
||||
|
||||
if (j == 16)
|
||||
{
|
||||
message(" ");
|
||||
lowsyslog(LOG_INFO, " ");
|
||||
}
|
||||
|
||||
if (k < buflen)
|
||||
{
|
||||
message("%02x", buffer[k]);
|
||||
lowsyslog(LOG_INFO, "%02x", buffer[k]);
|
||||
}
|
||||
else
|
||||
{
|
||||
message(" ");
|
||||
lowsyslog(LOG_INFO, " ");
|
||||
}
|
||||
}
|
||||
|
||||
message(" ");
|
||||
lowsyslog(LOG_INFO, " ");
|
||||
for (j = 0; j < 32; j++)
|
||||
{
|
||||
k = i + j;
|
||||
|
||||
if (j == 16)
|
||||
{
|
||||
message(" ");
|
||||
lowsyslog(LOG_INFO, " ");
|
||||
}
|
||||
|
||||
if (k < buflen)
|
||||
{
|
||||
if (buffer[k] >= 0x20 && buffer[k] < 0x7f)
|
||||
{
|
||||
message("%c", buffer[k]);
|
||||
lowsyslog(LOG_INFO, "%c", buffer[k]);
|
||||
}
|
||||
else
|
||||
{
|
||||
message(".");
|
||||
lowsyslog(LOG_INFO, ".");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
message("\n");
|
||||
lowsyslog(LOG_INFO, "\n");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user