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 | 95 |
2 files changed, 49 insertions, 50 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 @@ -241,3 +241,3 @@ void Score::keyPressEvent(QKeyEvent *k) 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); @@ -245,3 +245,3 @@ void Score::keyPressEvent(QKeyEvent *k) repaint(rect(x, y*1.25, cursor.chr), FALSE); - } else + } else if (lastScore >= 0) hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr; 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 @@ -86,10 +86,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) - } else - { - + } + else + { #ifdef DEBUG - printf(" gethostbyname : NOK\n"); + printf(" gethostbyname : NOK\n"); #endif - return ERRHOST; - } + return ERRHOST; + } @@ -98,3 +98,2 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) { - #ifdef DEBUG @@ -126,3 +125,3 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) sprintf(header,"GET http://%.128s:80%.256s HTTP/1.0\015\012\015\012", - http_server, http_file); + http_server, http_file); } @@ -143,3 +142,3 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) #ifdef DEBUG - printf(" send header : NOK\n"); + printf(" send header : NOK\n"); #endif @@ -161,33 +160,33 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) - if (r) - { - if(!data_lgr) - { - if((data = malloc(r+1))==NULL) - { - fprintf(stderr,"Memory allocating error (%s line %d)\n" - ,__FILE__, __LINE__); - exit(1); - } + if (r > 0) + { + if(!data_lgr) + { + if((data = malloc(r+1))==NULL) + { + 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__); - exit(1); - } - memcpy(temp, data, data_lgr); - memcpy(temp+data_lgr, buf, r); - temp[r+data_lgr]=0; - data_lgr += r; - free(data); - data = temp; - } - } + 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__); + exit(1); + } + memcpy(temp, data, data_lgr); + memcpy(temp+data_lgr, buf, r); + temp[r+data_lgr]=0; + data_lgr += r; + free(data); + data = temp; + } + } } @@ -215,10 +214,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) if( *temp==0x0A ) - { - /* test if it is the header end */ - temp ++; - if (*temp == 0x0D) temp++; - if (*temp == 0x0A) header_founded = 1; - } + { + /* test if it is the header end */ + temp ++; + if (*temp == 0x0D) temp++; + if (*temp == 0x0A) header_founded = 1; + } else - temp++; + temp++; } @@ -242,4 +241,4 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata) 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); |