From 999189ba4ced57191426de757f7153ec69f24154 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Thu, 12 Jul 2018 17:33:14 +0300 Subject: libcurl: update to 7.61 --- libs/libcurl/src/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/libcurl/src/file.c') diff --git a/libs/libcurl/src/file.c b/libs/libcurl/src/file.c index db04cc2daf..77fcf25361 100644 --- a/libs/libcurl/src/file.c +++ b/libs/libcurl/src/file.c @@ -256,8 +256,6 @@ static CURLcode file_upload(struct connectdata *conn) CURLcode result = CURLE_OK; struct Curl_easy *data = conn->data; char *buf = data->state.buffer; - size_t nread; - size_t nwrite; curl_off_t bytecount = 0; struct_stat file_stat; const char *buf2; @@ -306,6 +304,8 @@ static CURLcode file_upload(struct connectdata *conn) } while(!result) { + size_t nread; + size_t nwrite; int readcount; result = Curl_fillreadbuffer(conn, (int)data->set.buffer_size, &readcount); if(result) @@ -378,7 +378,6 @@ static CURLcode file_do(struct connectdata *conn, bool *done) curl_off_t expected_size = 0; bool size_known; bool fstated = FALSE; - ssize_t nread; struct Curl_easy *data = conn->data; char *buf = data->state.buffer; curl_off_t bytecount = 0; @@ -461,7 +460,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) return result; /* Adjust the start offset in case we want to get the N last bytes - * of the stream iff the filesize could be determined */ + * of the stream if the filesize could be determined */ if(data->state.resume_from < 0) { if(!fstated) { failf(data, "Can't get the size of file."); @@ -502,6 +501,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) Curl_pgrsTime(data, TIMER_STARTTRANSFER); while(!result) { + ssize_t nread; /* Don't fill a whole buffer if we want less than all data */ size_t bytestoread; -- cgit v1.2.3