summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/games/kpacman/score.cpp4
-rw-r--r--noncore/todayplugins/stockticker/libstocks/http.c19
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
@@ -238,13 +238,13 @@ void Score::keyPressEvent(QKeyEvent *k)
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;
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
@@ -83,11 +83,11 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
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;
@@ -95,9 +95,8 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
/* create socket */
if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
-
#ifdef DEBUG
printf(" create socket : NOK\n");
#endif
return ERRSOCK;
@@ -158,16 +157,16 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
#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);
@@ -177,10 +176,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
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);
@@ -239,10 +238,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
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);