More changes to reduce complaints from CppCheck. Some latent bugs fixes, but probably some new typos introduced

24 files changed, 83 insertions, 74 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 5f88f72cc..0056de5f0 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -820,3 +820,6 @@
 	* Several changes to restore Windows native build (2014-2-7)
 	* apps/examples/touchscreen:  Can now be configured to work with a mouse
 	  interface as well (2014-2-10).
+	* Several files changes based on complaints from the tool CppCheck.  Some
+	  latent bugs were fixed (and most likely some new typos were introduced)
+	  (2014-2-10).
diff --git a/apps/examples/can/can_main.c b/apps/examples/can/can_main.c
index 310bea845..ff9e0a6ec 100644
--- a/apps/examples/can/can_main.c
+++ b/apps/examples/can/can_main.c
@@ -217,7 +217,7 @@ int can_main(int argc, char *argv[])
     nbytes = write(fd, &txmsg, msgsize);
     if (nbytes != msgsize)
       {
-        message("ERROR: write(%d) returned %d\n", msgsize, nbytes);
+        message("ERROR: write(%ld) returned %ld\n", (long)msgsize, (long)nbytes);
         errval = 3;
         goto errout_with_dev;
       }
@@ -234,7 +234,7 @@ int can_main(int argc, char *argv[])
     nbytes = read(fd, &rxmsg, msgsize);
     if (nbytes < CAN_MSGLEN(0) || nbytes > msgsize)
       {
-        message("ERROR: read(%d) returned %d\n", msgsize, nbytes);
+        message("ERROR: read(%ld) returned %ld\n", (long)msgsize, (long)nbytes);
         errval = 4;
         goto errout_with_dev;
       }
diff --git a/apps/examples/cc3000/cc3000basic.c b/apps/examples/cc3000/cc3000basic.c
index 7ac4fa139..2e5fcd7cf 100644
--- a/apps/examples/cc3000/cc3000basic.c
+++ b/apps/examples/cc3000/cc3000basic.c
@@ -626,10 +626,10 @@ void ManualConnect(void)
   printf("Starting manual connect...\n");
 
   printf("  Disabling auto-connect policy...\n");
-  rval = wlan_ioctl_set_connection_policy(DISABLE, DISABLE, DISABLE);
+  (void)wlan_ioctl_set_connection_policy(DISABLE, DISABLE, DISABLE);
 
   printf("  Deleting all existing profiles...\n");
-  rval = wlan_ioctl_del_profile(255);
+  (void)wlan_ioctl_del_profile(255);
 
   wait_on(15*MS_PER_SEC, &ulCC3000Connected, 0, "    Waiting until disconnected");
 
@@ -649,7 +649,7 @@ void ManualConnect(void)
         (uint8_t *)AP_KEY,
         strlen(AP_KEY));
 
-  if (rval==0)
+  if (rval == 0)
     {
       printf("  Manual connect success.\n");
     }
diff --git a/apps/examples/configdata/configdata_main.c b/apps/examples/configdata/configdata_main.c
index e9e730889..a2d887a66 100644
--- a/apps/examples/configdata/configdata_main.c
+++ b/apps/examples/configdata/configdata_main.c
@@ -706,9 +706,9 @@ int configdata_main(int argc, char *argv[])
        */
 
 #ifndef CONFIG_EXAMPLES_CONFIGDATA_SILENT
-      message("\n=== FILLING %d =============================\n", i);
+      message("\n=== FILLING %u =============================\n", i);
 #endif
-      ret = configdata_fillconfig();
+      (void)configdata_fillconfig();
 #ifndef CONFIG_EXAMPLES_CONFIGDATA_SILENT
       message("Filled /dev/config\n");
       message("  Number of entries: %d\n", g_nentries);
@@ -735,7 +735,7 @@ int configdata_main(int argc, char *argv[])
       /* Delete some entries */
 
 #ifndef CONFIG_EXAMPLES_CONFIGDATA_SILENT
-      message("\n=== DELETING %d ============================\n", i);
+      message("\n=== DELETING %u ============================\n", i);
 #endif
       ret = configdata_delentries();
       if (ret < 0)
@@ -785,7 +785,7 @@ int configdata_main(int argc, char *argv[])
 #else
       if ((i % EXAMPLES_CONFIGDATA_REPORT) == 0)
         {
-          message("%d\n", i);
+          message("%u\n", i);
           msgflush();
         }
 #endif
diff --git a/apps/examples/cxxtest/cxxtest_main.cxx b/apps/examples/cxxtest/cxxtest_main.cxx
index 5feeaf5c8..8c75e0fb8 100644
--- a/apps/examples/cxxtest/cxxtest_main.cxx
+++ b/apps/examples/cxxtest/cxxtest_main.cxx
@@ -173,7 +173,7 @@ static void test_stl(void)
   string words[4] = {"Hello", "World", "Good", "Luck"};
   vector<string> v3(words, words + 4);
   vector<string>::iterator it;
-  for (it = v3.begin(); it != v3.end(); it++)
+  for (it = v3.begin(); it != v3.end(); ++it)
     {
       std::cout << *it << ' ';
     }
diff --git a/apps/examples/elf/tests/struct/struct_main.c b/apps/examples/elf/tests/struct/struct_main.c
index 99b1bc622..3c8e86e7a 100644
--- a/apps/examples/elf/tests/struct/struct_main.c
+++ b/apps/examples/elf/tests/struct/struct_main.c
@@ -59,7 +59,7 @@ int dummy_scalar = DUMMY_SCALAR_VALUE2;
 
 int main(int argc, char **argv)
 {
-  const struct struct_s *mystruct = getstruct();
+  const struct struct_s *mystruct;
 
   printf("Calling getstruct()\n");
   mystruct = getstruct();
diff --git a/apps/examples/flash_test/flash_test.c b/apps/examples/flash_test/flash_test.c
index 094ad4e59..7c67580d1 100644
--- a/apps/examples/flash_test/flash_test.c
+++ b/apps/examples/flash_test/flash_test.c
@@ -107,8 +107,8 @@ int flash_test_main(int argc, char *argv[])
     {
       /* Perform a low-level format */
 
-      ret = inode->u.i_bops->ioctl(inode, BIOC_LLFORMAT, 0);
-      ret = inode->u.i_bops->ioctl(inode, BIOC_GETFORMAT, (unsigned long) &fmt);
+      (void)inode->u.i_bops->ioctl(inode, BIOC_LLFORMAT, 0);
+      (void)inode->u.i_bops->ioctl(inode, BIOC_GETFORMAT, (unsigned long) &fmt);
     }
 
   if (!(fmt.flags & SMART_FMT_ISFORMATTED))
@@ -182,7 +182,7 @@ int flash_test_main(int argc, char *argv[])
       readwrite.offset = 0;
       readwrite.count = strlen(buffer) + 1;
       readwrite.buffer = (uint8_t *) buffer;
-      ret = inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
+      (void)inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
                                    &readwrite);
 
       /* Print the logical sector number */
@@ -241,7 +241,7 @@ int flash_test_main(int argc, char *argv[])
       readwrite.offset = 0;
       readwrite.count = strlen(buffer) + 1;
       readwrite.buffer = (uint8_t *) buffer;
-      ret = inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
+      (void)inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
                                    &readwrite);
 
       /* Print the logical sector number */
@@ -266,7 +266,7 @@ int flash_test_main(int argc, char *argv[])
       readwrite.offset = 64;
       readwrite.count = strlen(buffer) + 1;
       readwrite.buffer = (uint8_t *) buffer;
-      ret = inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
+      (void)inode->u.i_bops->ioctl(inode, BIOC_WRITESECT, (unsigned long)
                                    &readwrite);
 
       /* Print the logical sector number */
@@ -284,7 +284,7 @@ int flash_test_main(int argc, char *argv[])
 
       if (sectors[x] != 0xFFFF)
         {
-          ret = inode->u.i_bops->ioctl(inode, BIOC_FREESECT, (unsigned long)
+          (void)inode->u.i_bops->ioctl(inode, BIOC_FREESECT, (unsigned long)
                                        sectors[x]);
         }
     }
diff --git a/apps/examples/ftpc/ftpc_cmds.c b/apps/examples/ftpc/ftpc_cmds.c
index df05f45d2..d5dba926a 100644
--- a/apps/examples/ftpc/ftpc_cmds.c
+++ b/apps/examples/ftpc/ftpc_cmds.c
@@ -116,6 +116,7 @@ int cmd_rpwd(SESSION handle, int argc, char **argv)
       free(pwd);
       return OK;
     }
+
   return ERROR;
 }
 
@@ -275,6 +276,7 @@ int cmd_rls(SESSION handle, int argc, char **argv)
     {
       printf("  %s\n", dirlist->name[i]);
     }
+
   FFLUSH();
 
   /* We are responsible for freeing the directory structure allocated by
@@ -308,7 +310,7 @@ int cmd_rget(SESSION handle, int argc, char **argv)
         }
       else
         {
-          printf("%s: Unrecognized option: '%c'\n", "put", option);
+          printf("%s: Unrecognized option: '%c'\n", "rget", option);
           return ERROR;
         }
     }
@@ -317,7 +319,7 @@ int cmd_rget(SESSION handle, int argc, char **argv)
 
   if (optind >= argc)
     {
-      printf("%s: Missing required arguments\n", "get");
+      printf("%s: Missing required arguments\n", "rget");
       return ERROR;
     }
 
@@ -332,7 +334,7 @@ int cmd_rget(SESSION handle, int argc, char **argv)
 
   if (optind != argc)
     {
-      printf("%s: Too many arguments\n", "get");
+      printf("%s: Too many arguments\n", "rget");
       return ERROR;
     }
 
@@ -364,7 +366,7 @@ int cmd_rput(SESSION handle, int argc, char **argv)
         }
       else
         {
-          printf("%s: Unrecognized option: '%c'\n", "put", option);
+          printf("%s: Unrecognized option: '%c'\n", "rput", option);
           return ERROR;
         }
     }
@@ -373,7 +375,7 @@ int cmd_rput(SESSION handle, int argc, char **argv)
 
   if (optind >= argc)
     {
-      printf("%s: Missing required arguments\n", "get");
+      printf("%s: Missing required arguments\n", "rput");
       return ERROR;
     }
 
@@ -388,7 +390,7 @@ int cmd_rput(SESSION handle, int argc, char **argv)
 
   if (optind != argc)
     {
-      printf("%s: Too many arguments\n ");
+      printf("%s: Too many arguments\n", "rput");
       return ERROR;
     }
 
diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c
index a52afea39..154714246 100644
--- a/apps/examples/nxffs/nxffs_main.c
+++ b/apps/examples/nxffs/nxffs_main.c
@@ -370,10 +370,11 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file)
               message("ERROR: Failed to write file: %d\n", err);
               message("  File name:    %s\n", file->name);
               message("  File size:    %d\n", file->len);
-              message("  Write offset: %d\n", offset);
-              message("  Write size:   %d\n", nbytestowrite);
+              message("  Write offset: %ld\n", (long)offset);
+              message("  Write size:   %ld\n", (long)nbytestowrite);
               ret = ERROR;
             }
+
           close(fd);
 
           /* Remove any garbage file that might have been left behind */
@@ -398,10 +399,11 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file)
           message("ERROR: Partial write:\n");
           message("  File name:    %s\n", file->name);
           message("  File size:    %d\n", file->len);
-          message("  Write offset: %d\n", offset);
-          message("  Write size:   %d\n", nbytestowrite);
-          message("  Written:      %d\n", nbyteswritten);
+          message("  Write offset: %ld\n", (long)offset);
+          message("  Write size:   %ld\n", (long)nbytestowrite);
+          message("  Written:      %ld\n", (long)nbyteswritten);
         }
+
       offset += nbyteswritten;
     }
 
@@ -466,8 +468,8 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
       message("ERROR: Failed to read file: %d\n", errno);
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
       return ERROR;
     }
   else if (nbytesread == 0)
@@ -476,8 +478,8 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
       message("ERROR: Unexpected end-of-file:\n");
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
 #endif
       return ERROR;
     }
@@ -486,9 +488,9 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
       message("ERROR: Partial read:\n");
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
-      message("  Bytes read:   %d\n", nbytesread);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
+      message("  Bytes read:   %ld\n", (long)nbytesread);
     }
   return nbytesread;
 }
@@ -857,8 +859,8 @@ int nxffs_main(int argc, char *argv[])
        * (hopefully that the file system is full)
        */
 
-      message("\n=== FILLING %d =============================\n", i);
-      ret = nxffs_fillfs();
+      message("\n=== FILLING %u =============================\n", i);
+      (void)nxffs_fillfs();
       message("Filled file system\n");
       message("  Number of files: %d\n", g_nfiles);
       message("  Number deleted:  %d\n", g_ndeleted);
@@ -888,7 +890,7 @@ int nxffs_main(int argc, char *argv[])
 
       /* Delete some files */
 
-      message("\n=== DELETING %d ============================\n", i);
+      message("\n=== DELETING %u ============================\n", i);
       ret = nxffs_delfiles();
       if (ret < 0)
         {
diff --git a/apps/examples/nxflat/tests/struct/struct_main.c b/apps/examples/nxflat/tests/struct/struct_main.c
index 2d8b51a2c..f454b8ae7 100644
--- a/apps/examples/nxflat/tests/struct/struct_main.c
+++ b/apps/examples/nxflat/tests/struct/struct_main.c
@@ -59,7 +59,7 @@ int dummy_scalar = DUMMY_SCALAR_VALUE2;
 
 int main(int argc, char **argv)
 {
-  const struct struct_s *mystruct = getstruct();
+  const struct struct_s *mystruct;
 
   printf("Calling getstruct()\n");
   mystruct = getstruct();
diff --git a/apps/examples/ostest/barrier.c b/apps/examples/ostest/barrier.c
index e66496f7b..9de96ceaf 100644
--- a/apps/examples/ostest/barrier.c
+++ b/apps/examples/ostest/barrier.c
@@ -83,13 +83,13 @@ static void *barrier_func(void *parameter)
     {
       printf("barrier_func: Thread %d, back with "
              "status=0 (I am not special)\n",
-             id, status);
+             id);
     }
   else if (status == PTHREAD_BARRIER_SERIAL_THREAD)
     {
       printf("barrier_func: Thread %d, back with "
              "status=PTHREAD_BARRIER_SERIAL_THREAD (I AM SPECIAL)\n",
-             id, status);
+             id);
     }
   else
     {
@@ -142,7 +142,7 @@ void barrier_test(void)
 
   /* Create the barrier */
 
-  status = pthread_barrierattr_init(&barrierattr);
+  (void)pthread_barrierattr_init(&barrierattr);
 
   /* Start CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS thread instances */
 
diff --git a/apps/examples/pipe/interlock_test.c b/apps/examples/pipe/interlock_test.c
index 20d4113eb..9cdfaec5c 100644
--- a/apps/examples/pipe/interlock_test.c
+++ b/apps/examples/pipe/interlock_test.c
@@ -172,7 +172,8 @@ int interlock_test(void)
     }
   else if (ret != 0)
     {
-      fprintf(stderr, "interlock_test: Read %d bytes of data -- aborting: %d\n", nbytes);
+      fprintf(stderr, "interlock_test: Read %d bytes of data -- aborting: %d\n",
+              nbytes, errno);
       ret = 5;
       goto errout_with_file;
     }
diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c
index 2be98673c..3ec02704f 100644
--- a/apps/examples/poll/net_listener.c
+++ b/apps/examples/poll/net_listener.c
@@ -155,7 +155,7 @@ static inline bool net_incomingdata(struct net_listener_s *nls, int sd)
                 {
                   if (errno != EINTR)
                     {
-                       message("net_listener: Send failed sd=%d: \n", sd, errno);
+                       message("net_listener: Send failed sd=%d: %d\n", sd, errno);
                        net_closeclient(nls, sd);
                        return false;
                     }
diff --git a/apps/examples/poll/poll_listener.c b/apps/examples/poll/poll_listener.c
index fe1c95089..4c5e602c3 100644
--- a/apps/examples/poll/poll_listener.c
+++ b/apps/examples/poll/poll_listener.c
@@ -145,7 +145,7 @@ void *poll_listener(pthread_addr_t pvarg)
         }
       else if (ret > NPOLLFDS)
         {
-          message("poll_listener: ERROR poll reported: %d\n");
+          message("poll_listener: ERROR poll reported: %d\n", errno);
         }
       else
         {
@@ -172,7 +172,7 @@ void *poll_listener(pthread_addr_t pvarg)
                  }
                else if (fds[i].revents != 0)
                 {
-                   message("poll_listener: ERROR unexpected revents[i]=%02x\n",
+                   message("poll_listener: ERROR unexpected revents[%d]=%02x\n",
                            i, fds[i].revents);
                  }
             }
diff --git a/apps/examples/poll/select_listener.c b/apps/examples/poll/select_listener.c
index 5cb7e7805..12c4e4453 100644
--- a/apps/examples/poll/select_listener.c
+++ b/apps/examples/poll/select_listener.c
@@ -120,7 +120,7 @@ void *select_listener(pthread_addr_t pvarg)
 
       if (ret < 0)
         {
-          message("select_listener: ERROR select failed: %d\n");
+          message("select_listener: ERROR select failed: %d\n", errno);
         }
       else if (ret == 0)
         {
@@ -131,7 +131,7 @@ void *select_listener(pthread_addr_t pvarg)
         {
           if (ret != 1)
             {
-              message("select_listener: ERROR poll reported: %d\n");
+              message("select_listener: ERROR poll reported: %d\n", ret);
             }
           else
             {
@@ -140,7 +140,7 @@ void *select_listener(pthread_addr_t pvarg)
 
           if (!FD_ISSET(fd, rfds))
             {
-              message("select_listener: ERROR fd=%d not in fd_set\n");
+              message("select_listener: ERROR fd=%d not in fd_set\n", fd);
             }
         }
 
diff --git a/apps/examples/pwm/pwm_main.c b/apps/examples/pwm/pwm_main.c
index 447daf7d9..c524479b7 100644
--- a/apps/examples/pwm/pwm_main.c
+++ b/apps/examples/pwm/pwm_main.c
@@ -373,7 +373,7 @@ int pwm_main(int argc, char *argv[])
 
       /* Then stop the  pulse train */
 
-      message("pwm_main: stopping output\n", info.frequency, info.duty);
+      message("pwm_main: stopping output\n");
 
       ret = ioctl(fd, PWMIOC_STOP, 0);
       if (ret < 0)
diff --git a/apps/examples/smart/smart_main.c b/apps/examples/smart/smart_main.c
index cf57c842a..b373d78cd 100644
--- a/apps/examples/smart/smart_main.c
+++ b/apps/examples/smart/smart_main.c
@@ -375,8 +375,8 @@ static inline int smart_wrfile(FAR struct smart_filedesc_s *file)
               message("ERROR: Failed to write file: %d\n", err);
               message("  File name:    %s\n", file->name);
               message("  File size:    %d\n", file->len);
-              message("  Write offset: %d\n", offset);
-              message("  Write size:   %d\n", nbytestowrite);
+              message("  Write offset: %ld\n", (long)offset);
+              message("  Write size:   %ld\n", (long)nbytestowrite);
               ret = ERROR;
             }
           close(fd);
@@ -403,9 +403,9 @@ static inline int smart_wrfile(FAR struct smart_filedesc_s *file)
           message("ERROR: Partial write:\n");
           message("  File name:    %s\n", file->name);
           message("  File size:    %d\n", file->len);
-          message("  Write offset: %d\n", offset);
-          message("  Write size:   %d\n", nbytestowrite);
-          message("  Written:      %d\n", nbyteswritten);
+          message("  Write offset: %ld\n", (long)offset);
+          message("  Write size:   %ld\n", (long)nbytestowrite);
+          message("  Written:      %ld\n", (long)nbyteswritten);
         }
 
       offset += nbyteswritten;
@@ -472,8 +472,8 @@ static ssize_t smart_rdblock(int fd, FAR struct smart_filedesc_s *file,
       message("ERROR: Failed to read file: %d\n", errno);
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
       return ERROR;
     }
   else if (nbytesread == 0)
@@ -482,8 +482,8 @@ static ssize_t smart_rdblock(int fd, FAR struct smart_filedesc_s *file,
       message("ERROR: Unexpected end-of-file:\n");
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
 #endif
       return ERROR;
     }
@@ -492,9 +492,9 @@ static ssize_t smart_rdblock(int fd, FAR struct smart_filedesc_s *file,
       message("ERROR: Partial read:\n");
       message("  File name:    %s\n", file->name);
       message("  File size:    %d\n", file->len);
-      message("  Read offset:  %d\n", offset);
-      message("  Read size:    %d\n", len);
-      message("  Bytes read:   %d\n", nbytesread);
+      message("  Read offset:  %ld\n", (long)offset);
+      message("  Read size:    %ld\n", (long)len);
+      message("  Bytes read:   %ld\n", (long)nbytesread);
     }
 
   return nbytesread;
@@ -831,9 +831,9 @@ int smart_main(int argc, char *argv[])
       exit(2);
     }
 
-  /* Creaet a SMARTFS filesystem */
+  /* Create a SMARTFS filesystem */
 
-  ret = mksmartfs("/dev/smart1");
+  (void)mksmartfs("/dev/smart1");
 
   /* Mount the file system */
 
@@ -871,8 +871,8 @@ int smart_main(int argc, char *argv[])
        * (hopefully that the file system is full)
        */
 
-      message("\n=== FILLING %d =============================\n", i);
-      ret = smart_fillfs();
+      message("\n=== FILLING %u =============================\n", i);
+      (void)smart_fillfs();
       message("Filled file system\n");
       message("  Number of files: %d\n", g_nfiles);
       message("  Number deleted:  %d\n", g_ndeleted);
@@ -901,7 +901,7 @@ int smart_main(int argc, char *argv[])
 
       /* Delete some files */
 
-      message("\n=== DELETING %d ============================\n", i);
+      message("\n=== DELETING %u ============================\n", i);
       ret = smart_delfiles();
       if (ret < 0)
         {
diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c
index 4bf4a3888..a3f6f03e0 100644
--- a/apps/examples/usbterm/usbterm_main.c
+++ b/apps/examples/usbterm/usbterm_main.c
@@ -350,7 +350,7 @@ int usbterm_main(int argc, char *argv[])
         }
       else
         {
-          printf("Still waiting for remote peer.  Please try again later.\n", ret);
+          printf("Still waiting for remote peer.  Please try again later.\n");
         }
 
       /* If USB tracing is enabled, then dump all collected trace data to stdout */
diff --git a/apps/netutils/codecs/md5.c b/apps/netutils/codecs/md5.c
index 0441f4147..a6731135f 100644
--- a/apps/netutils/codecs/md5.c
+++ b/apps/netutils/codecs/md5.c
@@ -263,7 +263,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
   MD5Transform(ctx->buf, (uint32_t *) ctx->in);
   byteReverse((unsigned char *)ctx->buf, 4);
   memcpy(digest, ctx->buf, 16);
-  memset(ctx, 0, sizeof(ctx));  /* In case it's sensitive */
+  memset(ctx, 0, sizeof(struct MD5Contex));  /* In case it's sensitive */
 }
 
 /****************************************************************************
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index 927993179..d233c3441 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -412,7 +412,7 @@ static int wget_base(FAR const char *url, FAR char *buffer, int buflen,
   char *dest,post_size[8];
   int sockfd;
   int len,post_len;
-  int ret = OK;
+  int ret;
 
   /* Initialize the state structure */
 
diff --git a/apps/system/nxplayer/nxplayer_main.c b/apps/system/nxplayer/nxplayer_main.c
index b4c7930d2..dab48544f 100644
--- a/apps/system/nxplayer/nxplayer_main.c
+++ b/apps/system/nxplayer/nxplayer_main.c
@@ -237,7 +237,7 @@ static int nxplayer_cmd_volume(FAR struct nxplayer_s *pPlayer, char* parg)
 
   if (parg == NULL || *parg == '\0')
     {
-      printf("volume: %d%\n", pPlayer->volume / 10);
+      printf("volume: %d\n", pPlayer->volume / 10);
     }
   else
     {
@@ -328,7 +328,7 @@ static int nxplayer_cmd_balance(FAR struct nxplayer_s *pPlayer, char* parg)
 
   if (parg == NULL || *parg == '\0')
     {
-      printf("balance: %d%\n", pPlayer->volume / 10);
+      printf("balance: %d\n", pPlayer->volume / 10);
     }
   else
     {
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index bdb4fb733..70fa40aab 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6571,5 +6571,5 @@
 	* configs/mikroe-stm32f4/src/up_mio283qt9a.c: The Mikroe STM32F4 can
 	  now support the newer MIO283QT9A LCD. From Toby Duckworth (2014-2-10).
 	* MANY files changes based on complaints from the tool CppCheck.  Several
-	  latent bugs were fixed (and most likely some new typos were introducted)
+	  latent bugs were fixed (and most likely some new typos were introduced)
 	  (2014-2-10).
diff --git a/nuttx/arch/arm/src/sama5/sam_nand.c b/nuttx/arch/arm/src/sama5/sam_nand.c
index a0d449a5e..3f1a041ef 100644
--- a/nuttx/arch/arm/src/sama5/sam_nand.c
+++ b/nuttx/arch/arm/src/sama5/sam_nand.c
@@ -2518,7 +2518,7 @@ errout:
 static inline int nand_tryeraseblock(struct sam_nandcs_s *priv, off_t block)
 {
   uint32_t rowaddr;
-  int ret = OK;
+  int ret;
 
   /* Calculate address used for erase */
 
diff --git a/nuttx/audio/audio.c b/nuttx/audio/audio.c
index 351ed8ad9..32e067bb6 100644
--- a/nuttx/audio/audio.c
+++ b/nuttx/audio/audio.c
@@ -958,6 +958,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev)
     {
       strcat(path, "/");
     }
+
   strcat(path, name);
 
 #endif /* CONFIG_AUDIO_DEV_PATH=="/dev" */