Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES

libc/libc.csv

@@ -18,7 +18,6 @@
 "chdir","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *"
 "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 *","..."
 "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 *"
@@ -27,6 +26,7 @@
 "dq_rem","queue.h","","void","FAR dq_entry_t *","dq_queue_t *"
 "dq_remfirst","queue.h","","FAR dq_entry_t","dq_queue_t *"
 "dq_remlast","queue.h","","FAR dq_entry_t","dq_queue_t *"
+"err","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR)","int","const char *","..."
 "ether_ntoa","netinet/ether.h","","FAR char","FAR const struct ether_addr *"
 "fclose","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
 "fdopen","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","int","FAR const char *"
@@ -64,8 +64,9 @@
 "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int"
 "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *"
 "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 *","..."
-"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"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 *"
@@ -168,10 +169,11 @@
 "ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t"
 "ungetc","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *"
 "usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR FILE *"
-"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
+"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
 "vfprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list"
 "vprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list"
 "vsnprintf","stdio.h","","int","FAR char *","size_t","const char *","va_list"
 "vsprintf","stdio.h","","int","FAR char *","const char *","va_list"
 "vsscanf","stdio.h","","int","char *","const char *","va_list"
 "vsyslog","syslog.h","","int","int","FAR const char *","va_list"
+"warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN)","int","const char *","..."

libc/misc/Make.defs

@@ -78,7 +78,7 @@ endif
 CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc8.c
 CSRCS += lib_dumpbuffer.c lib_match.c
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_dbg.c
 endif
 

libc/misc/lib_dbg.c

@@ -59,7 +59,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int dbg(const char *format, ...)
 {
   va_list ap;
@@ -85,7 +85,7 @@ int lldbg(const char *format, ...)
   return ret;
 }
 #endif /* CONFIG_ARCH_LOWPUTC */
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
 #ifdef CONFIG_DEBUG_WARN
 int warn(const char *format, ...)

libc/misc/lib_slcddecode.c

@@ -57,7 +57,7 @@
  * debug must also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_LCD
 #endif

libc/spawn/Make.defs

@@ -38,7 +38,7 @@
 CSRCS += lib_psfa_addaction.c lib_psfa_addclose.c lib_psfa_adddup2.c
 CSRCS += lib_psfa_addopen.c lib_psfa_destroy.c lib_psfa_init.c
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_psfa_dump.c
 endif
 
@@ -54,7 +54,7 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += lib_psa_getstacksize.c lib_psa_setstacksize.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_psa_dump.c
 endif
 

libc/spawn/lib_psa_dump.c

@@ -42,7 +42,7 @@
 #include <spawn.h>
 #include <debug.h>
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Public Functions
@@ -124,4 +124,4 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr)
 #endif
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */

libc/spawn/lib_psfa_dump.c

@@ -45,7 +45,7 @@
 
 #include <nuttx/spawn.h>
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Public Functions
@@ -126,5 +126,5 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
     }
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 

libc/stdio/lib_fgetpos.c

@@ -104,7 +104,7 @@ int fgetpos(FAR FILE *stream, FAR fpos_t *pos)
 {
   long position;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream || !pos)
     {
       set_errno(EINVAL);

libc/stdio/lib_fputs.c

@@ -104,7 +104,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);
@@ -149,7 +149,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);
@@ -192,7 +192,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);

libc/stdio/lib_fsetpos.c

@@ -104,7 +104,7 @@
 
 int fsetpos(FAR FILE *stream, FAR fpos_t *pos)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream || !pos)
     {
       set_errno(EINVAL);

libc/stdio/lib_wrflush.c

@@ -91,7 +91,7 @@ int lib_wrflush(FAR FILE *stream)
 #if CONFIG_STDIO_BUFFER_SIZE > 0
   /* Verify that we were passed a valid (i.e., non-NULL) stream */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream)
     {
       return -EINVAL;
@@ -122,7 +122,7 @@ int lib_wrflush(FAR FILE *stream)
 #else
   /* Verify that we were passed a valid (i.e., non-NULL) stream */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream)
     {
       return -EINVAL;

libc/string/lib_strpbrk.c

@@ -49,7 +49,7 @@ FAR char *strpbrk(FAR const char *str, FAR const char *charset)
 {
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!str || !charset)
     {
       return NULL;

libc/time/lib_gettimeofday.c

@@ -75,7 +75,7 @@ int gettimeofday(FAR struct timeval *tv, FAR struct timezone *tz)
   struct timespec ts;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!tv)
     {
       set_errno(EINVAL);

libc/time/lib_settimeofday.c

@@ -73,7 +73,7 @@ int settimeofday(FAR const struct timeval *tv, FAR struct timezone *tz)
 {
   struct timespec ts;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!tv || tv->tv_usec >= USEC_PER_SEC)
     {
       set_errno(EINVAL);

libc/unistd/lib_getcwd.c

@@ -99,7 +99,7 @@ FAR char *getcwd(FAR char *buf, size_t size)
 
   /* Verify input parameters */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!buf || !size)
     {
       set_errno(EINVAL);