diff options
author | Dennis van der Schagt <dennisschagt@gmail.com> | 2022-12-25 20:19:38 +0100 |
---|---|---|
committer | Alexander Batischev <eual.jp@gmail.com> | 2022-12-30 20:21:03 +0300 |
commit | c44b7672627f206e4588964b02fc321a5280b5d8 (patch) | |
tree | a6b74c4768fc71632078eeb1cc506730d997abe9 | |
parent | 95e57e840fe15d5b147e754be713e7ce90ed666c (diff) |
Stop using deprecated curl option: CURLOPT_PROGRESSFUNCTION
(cherry picked from commit e435697820e141c46195b939c358203aa5bde7d4)
Fixes #2297.
-rw-r--r-- | src/poddlthread.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/poddlthread.cpp b/src/poddlthread.cpp index 628650d9..04651048 100644 --- a/src/poddlthread.cpp +++ b/src/poddlthread.cpp @@ -22,10 +22,10 @@ namespace podboat { static size_t my_write_data(void* buffer, size_t size, size_t nmemb, void* userp); static int progress_callback(void* clientp, - double dltotal, - double dlnow, - double ultotal, - double ulnow); + curl_off_t dltotal, + curl_off_t dlnow, + curl_off_t ultotal, + curl_off_t ulnow); PodDlThread::PodDlThread(Download* dl_, newsboat::ConfigContainer* c) : dl(dl_) @@ -62,8 +62,8 @@ void PodDlThread::run() // set up progress notification: curl_easy_setopt(handle.ptr(), CURLOPT_NOPROGRESS, 0); curl_easy_setopt( - handle.ptr(), CURLOPT_PROGRESSFUNCTION, progress_callback); - curl_easy_setopt(handle.ptr(), CURLOPT_PROGRESSDATA, this); + handle.ptr(), CURLOPT_XFERINFOFUNCTION, progress_callback); + curl_easy_setopt(handle.ptr(), CURLOPT_XFERINFODATA, this); // set up max download speed int max_dl_speed = cfg->get_configvalue_as_int("max-download-speed"); @@ -149,10 +149,10 @@ static size_t my_write_data(void* buffer, size_t size, size_t nmemb, } static int progress_callback(void* clientp, - double dltotal, - double dlnow, - double /* ultotal */, - double /*ulnow*/) + curl_off_t dltotal, + curl_off_t dlnow, + curl_off_t /* ultotal */, + curl_off_t /*ulnow*/) { PodDlThread* thread = static_cast<PodDlThread*>(clientp); return thread->progress(dlnow, dltotal); |