From: Yang Tse <yangsita@gmail.com>
Date: Fri, 14 Oct 2011 16:23:16 +0000 (+0200)
Subject: file.c: fix compiler warning
X-Git-Tag: upstream/7.37.1~3589
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8af94de50ad7ae043dafd298d5458d5a424527a8;p=platform%2Fupstream%2Fcurl.git

file.c: fix compiler warning
---

diff --git a/lib/file.c b/lib/file.c
index 610a349..9475d0c 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -67,6 +67,7 @@
 #include "url.h"
 #include "curl_memory.h"
 #include "parsedate.h" /* for the week day and month names */
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -422,7 +423,6 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
   curl_off_t expected_size=0;
   bool fstated=FALSE;
   ssize_t nread;
-  size_t bytestoread;
   struct SessionHandle *data = conn->data;
   char *buf = data->state.buffer;
   curl_off_t bytecount = 0;
@@ -544,7 +544,10 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
 
   while(res == CURLE_OK) {
     /* Don't fill a whole buffer if we want less than all data */
-    bytestoread = (expected_size < BUFSIZE-1)?(size_t)expected_size:BUFSIZE-1;
+    size_t bytestoread =
+      (expected_size < CURL_OFF_T_C(BUFSIZE) - CURL_OFF_T_C(1)) ?
+      curlx_sotouz(expected_size) : BUFSIZE - 1;
+
     nread = read(fd, buf, bytestoread);
 
     if(nread > 0)