Various changes and bigfixes for problems detected by CppCheck

7 files changed, 18 insertions, 14 deletions

diff --git a/nuttx/libc/spawn/lib_psa_init.c b/nuttx/libc/spawn/lib_psa_init.c
index c70421f36..ba1134281 100644
--- a/nuttx/libc/spawn/lib_psa_init.c
+++ b/nuttx/libc/spawn/lib_psa_init.c
@@ -48,10 +48,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef TASK_SPAWN_DEFAULT_STACKSIZE
-#  define TASK_SPAWN_DEFAULT_STACKSIZE 2048
-#endif
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -106,6 +102,6 @@ int posix_spawnattr_init(posix_spawnattr_t *attr)
 
   /* Default stack size */
 
-  attr->stacksize = TASK_SPAWN_DEFAULT_STACKSIZE;
+  attr->stacksize = CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE;
   return OK;
 }
diff --git a/nuttx/libc/stdio/lib_avsprintf.c b/nuttx/libc/stdio/lib_avsprintf.c
index 15ff8c9fb..15a97f188 100644
--- a/nuttx/libc/stdio/lib_avsprintf.c
+++ b/nuttx/libc/stdio/lib_avsprintf.c
@@ -130,7 +130,8 @@ int avsprintf(FAR char **ptr, const char *fmt, va_list ap)
 
   /* Then let lib_vsprintf do it's real thing */
 
-  nbytes = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, fmt, ap);
+  nbytes = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public,
+                        fmt, ap);
 
   /* Return a pointer to the string to the caller.  NOTE: the memstream put()
    * method has already added the NUL terminator to the end of the string (not
diff --git a/nuttx/libc/stdio/lib_libvsprintf.c b/nuttx/libc/stdio/lib_libvsprintf.c
index 9a391610d..325df47b8 100644
--- a/nuttx/libc/stdio/lib_libvsprintf.c
+++ b/nuttx/libc/stdio/lib_libvsprintf.c
@@ -1526,7 +1526,7 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj, FAR const char *src, va_list a
 
               /* Get the width of the output */
 
-              luwidth = getpsize(FMT_CHAR, flags, p);
+              pwidth = getpsize(FMT_CHAR, flags, p);
 
               /* Perform left field justification actions */
 
diff --git a/nuttx/libc/stdio/lib_snprintf.c b/nuttx/libc/stdio/lib_snprintf.c
index a4ba0dbb3..76e9016eb 100644
--- a/nuttx/libc/stdio/lib_snprintf.c
+++ b/nuttx/libc/stdio/lib_snprintf.c
@@ -93,7 +93,8 @@ int snprintf(FAR char *buf, size_t size, const char *format, ...)
   /* Then let lib_vsprintf do the real work */
 
   va_start(ap, format);
-  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, format, ap);
+  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public,
+                   format, ap);
   va_end(ap);
   return n;
 }
diff --git a/nuttx/libc/stdio/lib_sprintf.c b/nuttx/libc/stdio/lib_sprintf.c
index deb0669a3..113531b5d 100644
--- a/nuttx/libc/stdio/lib_sprintf.c
+++ b/nuttx/libc/stdio/lib_sprintf.c
@@ -84,12 +84,14 @@ int sprintf (FAR char *buf, const char *fmt, ...)
 
   /* Initialize a memory stream to write to the buffer */
 
-  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, buf, LIB_BUFLEN_UNKNOWN);
+  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, buf,
+                    LIB_BUFLEN_UNKNOWN);
 
   /* Then let lib_vsprintf do the real work */
 
   va_start(ap, fmt);
-  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, fmt, ap);
+  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public,
+                   fmt, ap);
   va_end(ap);
   return n;
 }
diff --git a/nuttx/libc/stdio/lib_vsnprintf.c b/nuttx/libc/stdio/lib_vsnprintf.c
index f7fd02e42..dca39e61e 100644
--- a/nuttx/libc/stdio/lib_vsnprintf.c
+++ b/nuttx/libc/stdio/lib_vsnprintf.c
@@ -87,10 +87,12 @@ int vsnprintf(FAR char *buf, size_t size, const char *format, va_list ap)
 
   /* Initialize a memory stream to write to the buffer */
 
-  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, buf, size);
+  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream,
+                    buf, size);
 
   /* Then let lib_vsprintf do the real work */
 
-  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, format, ap);
+  n = lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public,
+                   format, ap);
   return n;
 }
diff --git a/nuttx/libc/stdio/lib_vsprintf.c b/nuttx/libc/stdio/lib_vsprintf.c
index b6d80808f..737cfdc5b 100644
--- a/nuttx/libc/stdio/lib_vsprintf.c
+++ b/nuttx/libc/stdio/lib_vsprintf.c
@@ -87,6 +87,8 @@ int vsprintf(FAR char *dest, const char *src, va_list ap)
    * libc/stdio/lib_vsprintf do the work.
    */
 
-  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, dest, LIB_BUFLEN_UNKNOWN);
-  return lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public, src, ap);
+  lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, dest,
+                   LIB_BUFLEN_UNKNOWN);
+  return lib_vsprintf((FAR struct lib_outstream_s *)&memoutstream.public,
+                      src, ap);
 }