diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-09 14:23:34 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-09 14:23:34 -0600 |
commit | 17cfb7007f3f4e253d3533ee87349ce1b8e4885e (patch) | |
tree | fb175af19fa6835f8929ee075ff16acfeb49f904 /nuttx/tools | |
parent | 4495dfb36135744a6f903e32ac2215b1f3ab0452 (diff) | |
download | px4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.tar.gz px4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.tar.bz2 px4-nuttx-17cfb7007f3f4e253d3533ee87349ce1b8e4885e.zip |
Various changes and bigfixes for problems detected by CppCheck
Diffstat (limited to 'nuttx/tools')
-rw-r--r-- | nuttx/tools/cfgparser.c | 34 | ||||
-rw-r--r-- | nuttx/tools/mkconfig.c | 3 | ||||
-rw-r--r-- | nuttx/tools/mkdeps.c | 24 | ||||
-rw-r--r-- | nuttx/tools/mkversion.c | 3 | ||||
-rw-r--r-- | nuttx/tools/pic32mx/mkpichex.c | 2 |
5 files changed, 37 insertions, 29 deletions
diff --git a/nuttx/tools/cfgparser.c b/nuttx/tools/cfgparser.c index 439dcb9d5..7c1c44ca0 100644 --- a/nuttx/tools/cfgparser.c +++ b/nuttx/tools/cfgparser.c @@ -253,26 +253,26 @@ void parse_file(FILE *stream, struct variable_s **list) curr->val = &curr->storage[varlen]; strcpy(curr->val, varval); } - } - prev = 0; - next = *list; - while (next && strcmp(next->var, curr->var) <= 0) - { - prev = next; - next = next->flink; - } + prev = 0; + next = *list; + while (next && strcmp(next->var, curr->var) <= 0) + { + prev = next; + next = next->flink; + } - if (prev) - { - prev->flink = curr; - } - else - { - *list = curr; - } + if (prev) + { + prev->flink = curr; + } + else + { + *list = curr; + } - curr->flink = next; + curr->flink = next; + } } } } diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c index 06682ca8c..c9410a01e 100644 --- a/nuttx/tools/mkconfig.c +++ b/nuttx/tools/mkconfig.c @@ -270,5 +270,8 @@ int main(int argc, char **argv, char **envp) printf("#endif\n\n"); printf("#endif /* __INCLUDE_NUTTX_CONFIG_H */\n"); fclose(stream); + + /* Exit (without bothering to clean up allocations) */ + return 0; } diff --git a/nuttx/tools/mkdeps.c b/nuttx/tools/mkdeps.c index 64d81cbd7..b8dfbeb8f 100644 --- a/nuttx/tools/mkdeps.c +++ b/nuttx/tools/mkdeps.c @@ -532,7 +532,6 @@ static void do_dependency(const char *file, char separator) static char *cywin2windows(const char *str, const char *append, enum slashmode_e mode) { static const char cygdrive[] = "/cydrive"; - const char *src = src; char *dest; char *newpath; char *allocpath = NULL; @@ -560,18 +559,19 @@ static char *cywin2windows(const char *str, const char *append, enum slashmode_e } snprintf(allocpath, alloclen, "%s/%s", str, append); + str = allocpath; } /* Looking for path of the form /cygdrive/c/bla/bla/bla */ - if (strcasecmp(src, cygdrive) == 0) + if (strcasecmp(str, cygdrive) == 0) { int cygsize = sizeof(cygdrive); - if (src[cygsize] == '/') + if (str[cygsize] == '/') { cygsize++; srclen -= cygsize; - src += cygsize; + str += cygsize; if (srclen <= 0) { @@ -579,7 +579,7 @@ static char *cywin2windows(const char *str, const char *append, enum slashmode_e exit(EXIT_FAILURE); } - drive = toupper(*src); + drive = toupper(*str); if (drive < 'A' || drive > 'Z') { fprintf(stderr, "ERROR: Drive charager: \"%s\"\n", str); @@ -587,18 +587,18 @@ static char *cywin2windows(const char *str, const char *append, enum slashmode_e } srclen--; - src++; + str++; alloclen = 2; } } /* Determine the size of the new path */ - alloclen += sizeof(src) + 1; + alloclen += sizeof(str) + 1; if (mode == MODE_DBLBACK) { const char *tmpptr; - for (tmpptr = src; *tmpptr; tmpptr++) + for (tmpptr = str; *tmpptr; tmpptr++) { if (*tmpptr == '/') alloclen++; } @@ -628,9 +628,9 @@ static char *cywin2windows(const char *str, const char *append, enum slashmode_e */ lastchar = '\0'; - for (; *src; src++) + for (; *str; str++) { - if (mode != MODE_FSLASH && *src == '/') + if (mode != MODE_FSLASH && *str == '/') { if (lastchar != '/') { @@ -643,10 +643,10 @@ static char *cywin2windows(const char *str, const char *append, enum slashmode_e } else { - *dest++ = *src; + *dest++ = *str; } - lastchar = *src; + lastchar = *str; } *dest++ = '\0'; diff --git a/nuttx/tools/mkversion.c b/nuttx/tools/mkversion.c index c6b00c5e5..3c0e6ab6f 100644 --- a/nuttx/tools/mkversion.c +++ b/nuttx/tools/mkversion.c @@ -102,5 +102,8 @@ int main(int argc, char **argv, char **envp) printf("\n#define CONFIG_VERSION ((CONFIG_VERSION_MAJOR << 8) | (CONFIG_VERSION_MINOR))\n\n"); printf("#endif /* __INCLUDE_NUTTX_VERSION_H */\n"); fclose(stream); + + /* Exit (without bothering to clean up allocations) */ + return 0; } diff --git a/nuttx/tools/pic32mx/mkpichex.c b/nuttx/tools/pic32mx/mkpichex.c index 14fefdb8c..889dc2a0c 100644 --- a/nuttx/tools/pic32mx/mkpichex.c +++ b/nuttx/tools/pic32mx/mkpichex.c @@ -311,5 +311,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "Failed to rename '%s' to '%s'\n", destfile, srcfile); } + /* Exit (without bothering to clean up allocations) */ + return 0; } |