author | erik <erik> | 2007-01-24 19:57:51 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-24 19:57:51 (UTC) |
commit | 48d9219a96096cf44df8ac24413b36d1b718b1d5 (patch) (side-by-side diff) | |
tree | ef49f0d2b778283221ebbb8634f1a59710ddd108 | |
parent | 89e81059e832ff77c2f0ac8b9db12f80eafa03fc (diff) | |
download | opie-48d9219a96096cf44df8ac24413b36d1b718b1d5.zip opie-48d9219a96096cf44df8ac24413b36d1b718b1d5.tar.gz opie-48d9219a96096cf44df8ac24413b36d1b718b1d5.tar.bz2 |
Each file in this commit has the issue where a function can return a
negative result but the result is used in a context that can only be
positive.
-rw-r--r-- | noncore/games/kpacman/score.cpp | 4 | ||||
-rw-r--r-- | noncore/todayplugins/stockticker/libstocks/http.c | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp index 6878b81..737f03b 100644 --- a/noncore/games/kpacman/score.cpp +++ b/noncore/games/kpacman/score.cpp @@ -236,17 +236,17 @@ void Score::keyPressEvent(QKeyEvent *k) // killTimers(); emit toggleNew(); end(); } if (x != cursor.x || y != cursor.y) { - if (cursor.x != -1) + if (cursor.x != -1 && lastScore >= 0) cursor.chr = hallOfFame[lastScore].name.at(cursor.x-14); scrollRepeat = FALSE; repaint(rect(x, y*1.25, cursor.chr), FALSE); - } else + } else if (lastScore >= 0) hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr; if (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down) scrollRepeat = TRUE; else repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE); diff --git a/noncore/todayplugins/stockticker/libstocks/http.c b/noncore/todayplugins/stockticker/libstocks/http.c index cc78ab7..155ce4b 100644 --- a/noncore/todayplugins/stockticker/libstocks/http.c +++ b/noncore/todayplugins/stockticker/libstocks/http.c @@ -81,25 +81,24 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) { memset((char *) &server,0, sizeof(server)); memmove((char *) &server.sin_addr, host->h_addr, host->h_length); server.sin_family = host->h_addrtype; server.sin_port = (unsigned short) htons( http_proxy_server ? http_proxy_port : 80 ); - } else + } + else { - #ifdef DEBUG printf(" gethostbyname : NOK\n"); #endif return ERRHOST; } /* create socket */ if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - #ifdef DEBUG printf(" create socket : NOK\n"); #endif return ERRSOCK; } @@ -156,33 +155,33 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) #ifdef __UNIX__ r=read(s,buf,BUF_SIZE); #elif __WINDOWS__ r=recv(s,buf,BUF_SIZE,0); #endif - if (r) + if (r > 0) { if(!data_lgr) { if((data = malloc(r+1))==NULL) { - fprintf(stderr,"Memory allocating error (%s line %d)\n" - ,__FILE__, __LINE__); + fprintf(stderr,"Memory allocating error (%s line %d)\n", + __FILE__, __LINE__); exit(1); } memcpy(data,buf,r); data_lgr = r; data[r]=0; } else { if((temp = malloc(r+data_lgr+1))==NULL) { - fprintf(stderr,"Memory allocating error (%s line %d)\n" - ,__FILE__, __LINE__); + fprintf(stderr,"Memory allocating error (%s line %d)\n", + __FILE__, __LINE__); exit(1); } memcpy(temp, data, data_lgr); memcpy(temp+data_lgr, buf, r); temp[r+data_lgr]=0; data_lgr += r; @@ -237,14 +236,14 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) return ERRPAHD; } if ((csv_ptr = malloc(strlen(temp)+1))==NULL) { free(data); - fprintf(stderr,"Memory allocating error (%s line %d)\n" - ,__FILE__, __LINE__); + fprintf(stderr,"Memory allocating error (%s line %d)\n", + __FILE__, __LINE__); exit(1); } memcpy(csv_ptr, temp, strlen(temp)+1); free(data); |