diff options
| -rw-r--r-- | glcddrivers/common.c | 5 | ||||
| -rw-r--r-- | glcddrivers/g15daemon.c | 6 | ||||
| -rw-r--r-- | glcddrivers/gu256x64-3900.c | 4 | ||||
| -rw-r--r-- | glcddrivers/serdisp.c | 2 | ||||
| -rw-r--r-- | glcdgraphics/common.c | 5 |
5 files changed, 12 insertions, 10 deletions
diff --git a/glcddrivers/common.c b/glcddrivers/common.c index 0d0fad9..40a3048 100644 --- a/glcddrivers/common.c +++ b/glcddrivers/common.c @@ -9,7 +9,8 @@ * This file is released under the GNU General Public License. Refer * to the COPYING file distributed with this package. * - * (c) 2004 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2004 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2010-2012 Wolfgang Astleitner <mrwastl AT users sourceforge net> */ #include <ctype.h> @@ -219,7 +220,7 @@ std::string trim(const std::string & s) start++; } end = s.length() - 1; - while (end >= 0) + while (end > start) { if (!isspace(s[end])) break; diff --git a/glcddrivers/g15daemon.c b/glcddrivers/g15daemon.c index 20049bc..daa0b9b 100644 --- a/glcddrivers/g15daemon.c +++ b/glcddrivers/g15daemon.c @@ -8,7 +8,7 @@ * to the COPYING file distributed with this package. * * (c) 2005-2010 Andreas Regel <andreas.regel AT powarman.de> -* (c) 2011 Wolfgang Astleitner <mrwastl AT users.sourceforge.net> +* (c) 2011-2012 Wolfgang Astleitner <mrwastl AT users.sourceforge.net> */ #include <fcntl.h> @@ -146,8 +146,8 @@ int cDriverG15daemon::Init() int cDriverG15daemon::DeInit() { - if (offbuff); - delete[] offbuff; + if (offbuff) + delete[] offbuff; if (-1 != sockfd) close(sockfd); diff --git a/glcddrivers/gu256x64-3900.c b/glcddrivers/gu256x64-3900.c index d135c88..8a2dafc 100644 --- a/glcddrivers/gu256x64-3900.c +++ b/glcddrivers/gu256x64-3900.c @@ -22,7 +22,7 @@ * * (c) 2004 Ralf Mueller (ralf AT bj-ig.de) * (c) 2005-2010 Andreas Regel <andreas.regel AT powarman.de> - * (c) 2011 Wolfgang Astleitner <mrwastl AT users.sourceforge.net> + * (c) 2011-2012 Wolfgang Astleitner <mrwastl AT users.sourceforge.net> */ #include <errno.h> @@ -257,7 +257,7 @@ int cDriverGU256X64_3900::DeInit() if (portFd >= 0) { close(portFd); - portFd =- 1; + portFd = -1; } } if (port) diff --git a/glcddrivers/serdisp.c b/glcddrivers/serdisp.c index 8b46bcb..a45c1c1 100644 --- a/glcddrivers/serdisp.c +++ b/glcddrivers/serdisp.c @@ -379,7 +379,7 @@ int cDriverSerDisp::DeInit(void) /* use serdisp_close instead of serdisp_quit so that showpic and showtext are usable together with serdisplib */ fp_serdisp_close(dd); - (int) dlclose(sdhnd); + dlclose(sdhnd); sdhnd = NULL; return 0; diff --git a/glcdgraphics/common.c b/glcdgraphics/common.c index 1c78e23..0fd78b8 100644 --- a/glcdgraphics/common.c +++ b/glcdgraphics/common.c @@ -6,7 +6,8 @@ * This file is released under the GNU General Public License. Refer * to the COPYING file distributed with this package. * - * (c) 2004 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2004 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2010-2012 Wolfgang Astleitner <mrwastl AT users sourceforge net> */ #include <ctype.h> @@ -49,7 +50,7 @@ std::string trim(const std::string & s) start++; } end = s.length() - 1; - while (end >= 0) + while (end > start) { if (!isspace(s[end])) break; |