diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-08-10 06:41:13 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-08-10 06:41:13 +0000 |
commit | 9dbd6659dc9611110bc48614ee22e40b3935576f (patch) | |
tree | 68a870520026afee8ab153b24e34a00fe1e59d12 | |
parent | 5ddad4cdb3f66a12c65845c3b1812406a59dd9ed (diff) |
more typecasts to please picky compilers
-rw-r--r-- | lib/ftp.c | 2 | ||||
-rw-r--r-- | lib/progress.c | 2 | ||||
-rw-r--r-- | lib/transfer.c | 6 | ||||
-rw-r--r-- | src/main.c | 8 |
4 files changed, 12 insertions, 6 deletions
@@ -1690,7 +1690,7 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn) if(readthisamountnow > BUFSIZE) readthisamountnow = BUFSIZE; - actuallyread = + actuallyread = (curl_off_t) conn->fread(data->state.buffer, 1, (size_t)readthisamountnow, conn->fread_in); diff --git a/lib/progress.c b/lib/progress.c index c6517ad0a..7294894a7 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -332,7 +332,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) /* the 'amount' value is bigger than would fit in 32 bits if multiplied with 1000, so we use the double math for this */ data->progress.current_speed = (curl_off_t) - ((double)amount/(span_ms/1000.0)); + ((double)amount/((double)span_ms/1000.0)); else /* the 'amount' value is small enough to fit within 32 bits even when multiplied with 1000 */ diff --git a/lib/transfer.c b/lib/transfer.c index 5fab2ffbe..93df4c589 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -137,8 +137,10 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) conn->upload_fromhere += 10; /* 32bit hex + CRLF */ } - nread = conn->fread(conn->upload_fromhere, 1, - buffersize, conn->fread_in); + /* this function returns a size_t, so we typecast to int to prevent warnings + with picky compilers */ + nread = (int)conn->fread(conn->upload_fromhere, 1, + buffersize, conn->fread_in); if(nread == CURL_READFUNC_ABORT) { failf(data, "operation aborted by callback\n"); diff --git a/src/main.c b/src/main.c index a0c04dc68..03c854d1a 100644 --- a/src/main.c +++ b/src/main.c @@ -2279,7 +2279,9 @@ static int my_fwrite(void *buffer, size_t sz, size_t nmemb, void *stream) int rc; struct OutStruct *out=(struct OutStruct *)stream; struct Configurable *config = out->config; - curl_off_t size = sz * nmemb; + curl_off_t size = (curl_off_t)(sz * nmemb); /* typecast to prevent + warnings when converting from + unsigned to signed */ if(out && !out->stream) { /* open file for writing */ out->stream=fopen(out->filename, "wb"); @@ -2354,7 +2356,9 @@ static int my_fread(void *buffer, size_t sz, size_t nmemb, void *userp) { struct InStruct *in=(struct InStruct *)userp; struct Configurable *config = in->config; - curl_off_t size = sz * nmemb; + curl_off_t size = (curl_off_t)(sz * nmemb); /* typecast to prevent warnings + when converting from + unsigned to signed */ if(config->sendpersecond) { /* |