sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2014-02-10 19:11:56 -06:00
parent c7fe4a15e9
commit 3669b6799a
21 changed files with 80 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -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).

4
examples/can/can_main.c
View File

@ -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;
}

6
examples/cc3000/cc3000basic.c
View File

@ -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");
}

8
examples/configdata/configdata_main.c
View File

@ -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

2
examples/cxxtest/cxxtest_main.cxx
View File

@ -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 << ' ';
}

2
examples/elf/tests/struct/struct_main.c
View File

@ -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();

12
examples/flash_test/flash_test.c
View File

@ -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]);
}
}

14
examples/ftpc/ftpc_cmds.c
View File

@ -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;
}

32
examples/nxffs/nxffs_main.c
View File

@ -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)
{

2
examples/nxflat/tests/struct/struct_main.c
View File

@ -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();

6
examples/ostest/barrier.c
View File

@ -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 */

3
examples/pipe/interlock_test.c
View File

@ -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;
}

2
examples/poll/net_listener.c
View File

@ -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;
}

4
examples/poll/poll_listener.c
View File

@ -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);
}
}

6
examples/poll/select_listener.c
View File

@ -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);
}
}

2
examples/pwm/pwm_main.c
View File

@ -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)

34
examples/smart/smart_main.c
View File

@ -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)
{

2
examples/usbterm/usbterm_main.c
View File

@ -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 */

2
netutils/codecs/md5.c
View File

@ -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 */
}
/****************************************************************************

2
netutils/webclient/webclient.c
View File

@ -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 */

4
system/nxplayer/nxplayer_main.c
View File

@ -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
{