diff options
author | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:51:26 +0100 |
---|---|---|
committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:51:26 +0100 |
commit | 1d0ff54794b5edea7cdf1d2d66710a0fa885bcc5 (patch) | |
tree | 8ece5f9ef437fbb151f2b22ed0c6e1a714879c7c /src/mgr/ftplibftpt.cpp | |
parent | c7dbdc9161a7c460526b80fe01af49d714856126 (diff) |
New upstream version 1.8.1
Diffstat (limited to 'src/mgr/ftplibftpt.cpp')
-rw-r--r-- | src/mgr/ftplibftpt.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mgr/ftplibftpt.cpp b/src/mgr/ftplibftpt.cpp index f1d1655..fae5964 100644 --- a/src/mgr/ftplibftpt.cpp +++ b/src/mgr/ftplibftpt.cpp @@ -2,7 +2,7 @@ * * ftplibftpt.cpp - FTPLibFTPTransport * - * $Id: ftplibftpt.cpp 2983 2013-09-15 16:22:32Z scribe $ + * $Id: ftplibftpt.cpp 3439 2016-10-23 08:32:02Z scribe $ * * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -42,10 +42,10 @@ namespace { static int my_swbufwriter(netbuf *nControl, void *buffer, size_t size, void *swbuf) { SWBuf &output = *(SWBuf *)swbuf; - int s = output.size(); + int s = (int)output.size(); output.size(s+size); memcpy(output.getRawData()+s, buffer, size); - return size; + return (int)size; } #if defined(__GNUC__) @@ -56,9 +56,9 @@ namespace { static int my_fprogress(netbuf *nControl, int xfered, void *arg) { if (arg) { MyProgressData *pd = (MyProgressData *)arg; - SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); +//SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); if (pd->sr) { - pd->sr->statusUpdate(pd->totalSize, xfered); + pd->sr->update(pd->totalSize, xfered); } if (*(pd->term)) return 0; } |