aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-01-19 13:04:59 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-01-19 13:10:45 +0000
commit2cac75c4e400b1a80708b1a4ef9b6561755fdb72 (patch)
treeeb1d7322302943a5aeb02fb4a00650cbc94bbcce
parentaba98991a50d7a4f2deb8fc3f9ddc5628a207da5 (diff)
http_chunks.c: Fixed compilation warnings under some 32-bit systems
conversion from 'curl_off_t' to 'size_t', possible loss of data Where curl_off_t is a 64-bit word and size_t is 32-bit - for example with 32-bit Windows builds.
-rw-r--r--lib/http_chunks.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index eaefa05d1..47de95845 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -32,6 +32,7 @@
#include "curl_memory.h"
#include "non-ascii.h" /* for Curl_convert_to_network prototype */
#include "strtoofft.h"
+#include "warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -188,7 +189,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
/* We expect 'datasize' of data. We have 'length' right now, it can be
more or less than 'datasize'. Get the smallest piece.
*/
- piece = (ch->datasize >= length)?length:ch->datasize;
+ piece = curlx_sotouz((ch->datasize >= length)?length:ch->datasize);
/* Write the data portion available */
#ifdef HAVE_LIBZ
@@ -350,8 +351,8 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
/* Record the length of any data left in the end of the buffer
even if there's no more chunks to read */
+ ch->dataleft = curlx_sotouz(length);
- ch->dataleft = length;
return CHUNKE_STOP; /* return stop */
}
else