summaryrefslogtreecommitdiff
path: root/noncore/todayplugins/stockticker/libstocks/http.c
authorerik <erik>2007-01-24 19:57:51 (UTC)
committer erik <erik>2007-01-24 19:57:51 (UTC)
commit48d9219a96096cf44df8ac24413b36d1b718b1d5 (patch) (side-by-side diff)
treeef49f0d2b778283221ebbb8634f1a59710ddd108 /noncore/todayplugins/stockticker/libstocks/http.c
parent89e81059e832ff77c2f0ac8b9db12f80eafa03fc (diff)
downloadopie-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.
Diffstat (limited to 'noncore/todayplugins/stockticker/libstocks/http.c') (more/less context) (show whitespace changes)
-rw-r--r--noncore/todayplugins/stockticker/libstocks/http.c19
1 files changed, 9 insertions, 10 deletions
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);